Doing git pull and git push... As it stands, git push would be easy: my idea would be to add a button to the repository browser to do a push... Or add a setting(*) to do a push after each commit, or both.
git pull, however... a git pull can create conflicts, and it would be a bit messy to try a pull, fail with conflicts (a pull does a merge) and let the Pharo user drop to the command line to try to clean up the mess :( git fetch is a bit safer, but may require some command line work to merge the fetched changes to the current branch. Git is complex. The git clone could also be done in Pharo. Thierry (*) Settings don't play well with absent classes on first load :( ________________________________ De : Pharo-dev [[email protected]] de la part de kilon alios [[email protected]] Date d'envoi : lundi 4 novembre 2013 23:19 À : Pharo Development List Objet : Re: [Pharo-dev] Github and Pharo It does work indeed, commit wise. But can I git pull and git push with it ? On Mon, Nov 4, 2013 at 10:50 PM, GOUBIER Thierry <[email protected]<mailto:[email protected]>> wrote: Alexandre, using Git with Pharo (2 and 3) works today on Mac and Linux with MonticelloFileTree and MonticelloFileTree-Git. FileSystem-Git will be a better way to do it (and more portable) :) Thierry ________________________________ De : Pharo-dev [[email protected]<mailto:[email protected]>] de la part de Alexandre Bergel [[email protected]<mailto:[email protected]>] Date d'envoi : lundi 4 novembre 2013 21:34 À : Pharo Development List Cc: Pharo Development List Objet : Re: [Pharo-dev] Github and Pharo +1 Everybody is waiting for using Git with Pharo. There is a real possibility to impact 100s of users... Go go go! Alexandre Alexandre Le 04-11-2013 à 15:35, kilon alios <[email protected]<mailto:[email protected]>> a écrit : Yeah I agree, this is an awesome project and thank you for your hard work :) On Mon, Nov 4, 2013 at 8:12 PM, GOUBIER Thierry <[email protected]<mailto:[email protected]>> wrote: Hi Max, I saw you were on it :) It's a huge effort you're undertaking. I learned a bit about git internal storage stepping through the code. Thierry ________________________________________ De : Pharo-dev [[email protected]<mailto:[email protected]>] de la part de Max Leske [[email protected]<mailto:[email protected]>] Date d'envoi : lundi 4 novembre 2013 17:44 À : Pharo Development List Objet : Re: [Pharo-dev] Github and Pharo FileSystem-Git is basically in alpha at the moment… I’m rewriting it. On 04.11.2013, at 17:04, Goubier Thierry <[email protected]<mailto:[email protected]>> wrote: > Ok, I tried a bit with FileSystem-Git, but it seems there is still a bit of > work to do... > > I tried on one of my work repository, and: > - it failed trying to uft8convert a packed data file. > So I corrected the error (get the stream as binary!) and > - It failed looking for one of the commit IDs > I found the ref in a pack file; apparently, it's not looking in there... > I'm forcing a read of the pack files in there > - Yet another utf8convert error on binary data > Corrected, I got the pack files, but the index isn't telling me much. > I tried to list the objects in it... Unknown compression method error. > > There's a huge amount of code in there, it's a bit frightening. I think I'll > stay with OSProcess a bit longer ;) > > Thierry > > Le 04/11/2013 14:28, Goubier Thierry a écrit : >> >> >> Le 04/11/2013 14:09, David T. Lewis a écrit : >>> On Mon, Nov 04, 2013 at 01:58:29PM +0100, Goubier Thierry wrote: >>>> >>>> >>>> Le 04/11/2013 12:11, kilon alios a ?crit : >>>>> yeap filetree did the trick here. However it does not allow to browse >>>>> through the git commits as gitfiletree does, the only commit available >>>>> is the last commit. >>>>> >>>>> I took a look at CommandShell and friends and they all look pretty much >>>>> very broken. For example in workspace I executed >>>>> [ CommandShellTranscript open.] and trying "ls" or "dir" it creates an >>>>> error because it add C path inside pharo subdirectories. Dont know if >>>>> this is normal behavior. >>> >>> Use "CommandShell open" rather than "CommandShellTranscript open". >>> >>> >>>> >>>> I hope someone with more knowledge than me of OSProcess under windows >>>> will have a look :) >>>> >>> OSProcess support for Windows is incomplete, so this will probably not >>> do what you need. If the OSProcess is included in the Windows VM, it will >>> let you run a Windows program, but it will not do most of the other >>> things >>> that you expect from OSProcess. >>> >>> Check http://www.squeaksource.com/ProcessWrapper.html for a possible >>> alternative. >> >> Thanks Dave; no easy solution on that, it seems. I'll have a look then >> with FileSystem-Git, this one may be a more portable solution. >> >> Windows is still a world apart from the rest :( >> >> Thierry > > -- > Thierry Goubier > CEA list > Laboratoire des Fondations des Systèmes Temps Réel Embarqués > 91191 Gif sur Yvette Cedex > France > Phone/Fax: +33 (0) 1 69 08 32 92 / 83 95 >
