Hi Peter, thanks for raising all those issues. A few comments inlined... 2015-02-20 11:14 GMT+01:00 Peter Uhnák <i.uhnak@gmail.com>:

Hi,

thank you both, I've semi-successfully managed to convert it to git. However there were some problems I've encountered (mostly because I wanted more than was provided :)). So there are some changes that might be worth considering for integration.

1) it will NOT recreate a commit for each mcz from oldest to newest In fact the order seems to be random (just like all Pharo directory operations)

Oups. Last time I did it, it was in order :(

I ended up sorting it manually; it is not perfect because it groups by packages; but the alternative (by ancestry) is much more work. ===================================================================== sortBlock := [ :x : y | (x second = y second) ifTrue: [ x fourth asNumber <= y fourth asNumber ] ifFalse: [ x second < y second ]. ].

"My-Package-Author.Number" re := '^(.+)-([^-]+)\.(\d+)$' asRegex. fileBlocks := source allVersionNames collect: [ :each | re search: each. { re subexpression: 1. "first - full string" re subexpression: 2. "second - package name" re subexpression: 3. "third - author name" re subexpression: 4. "fourth - commit name" } ]. filesSorted := fileBlocks asSortedCollection: sortBlock.

files := (filesSorted collect: [ :x | x first ]) asArray. =====================================================================

2) Git by default doesn't accept empty messages While Monticello does so I ran into a trouble. (Not sure how we ended up with empty message but whatever). This can be easily remedied with --allow-empty-message (see further down)

Good point. Bad programmers do commits without messages :):)

3) The author and date is not preserved. Obviously for collaborated project I can't just appropriate someone else's code. Also having the original date is nice. With author there's an issue that git requires an email, this can be solved with having external mapping class (or having something on MCFileTreeGitRepository class-side).

Well, original history and author name is still there (if you reread the monticello.meta/version file), it does not appear in the git history. But, yes, some mapping may be usefull (or an automatic, fetch name from version) and a differentiation between the author name and the commiter name (I remember seeing both in git).

4) Ignored .class directories If you are dummy like me, use Java and have *.class in your system-wide ignore file... there's a nasty surprise waiting. :)

:) Try .package in the .ignore file :)

2+3 code) in "MCFileTreeGitRepository>>basicStoreVersion: aVersion" I moved the command to separate methods ===================================================================== c := PipeableOSProcess command: self cdCommand, (self gitAddCommand: packageDirectoryString), (self gitCommitCommand: aVersion directory: packageDirectoryString). =====================================================================

and new methods

===================================================================== MCFileTreeGitRepository>>cdCommand ^ 'cd "{1}";' format: {(self fileUtils directoryPathString: directory)}

MCFileTreeGitRepository>>gitAddCommand: packageDirectoryString ^ 'git add ' , packageDirectoryString , ';'

MCFileTreeGitRepository>>gitCommitCommand: aVersion directory: packageDirectoryString ^ 'git commit --allow-empty-message -m "{1}" --author="{2}" --date="{3}" -- {4};' format: {(self escapeForShell: aVersion info message convertToSystemString). (self escapeForShell: (GitAuthorConverter gitNameFor: aVersion info author)). (self escapeForShell: aVersion info timeStamp truncated asString convertToSystemString). packageDirectoryString} =====================================================================

GitAuthorConverter is just a dummy class to map Monticello author (so a global Dictionary).

===================================================================== GitAuthorConverter map: 'PeterUhnak' to: 'Peter Uhnak <i.uhnak@gmail.com

...

'. GitAuthorConverter gitNameFor: 'PeterUhnak' "--> returns Peter Uhnak < i.uhnak@gmail.com>'. =====================================================================

Peter

I rewrote all the git command subsystems to solve two issues, so the structure is a lot nicer now. It doesn't cd anymore, instead it uses git -C <target-working-directory>which should help getting it to work on windows (and you can also set a different git executable path in a setting). I'll add issues for the points you raise in the filetree repository; for now, the very latest code is available this way, if you want to experiment: Metacello new baseline: 'FileTree'; repository: 'github://dalehenrich/filetree:issue_142/repository'; load: 'Git' Thanks, Thierry

Le 29/04/2015 14:32, Damien Pollet a écrit :

On 20 February 2015 at 11:31, Thierry Goubier <thierry.goubier@gmail.com <mailto:thierry.goubier@gmail.com>> wrote:

Good point. Bad programmers do commits without messages :):)

That could be easily remedied by integrating MC with http://whatthecommit.com :D

Got 'made it compile' on the first try. Yep, that would be allways true ;) Thierry

Hi Sean, Le 29/04/2015 00:41, Sean P. DeNigris a écrit :

Peter Uhnák wrote

...

So there are some changes that might be worth considering for integration. ...

Were these incorporated into GitFileTree? If not, it may be good to put this somewhere a bit more permanent. Would it warrant adding to https://github.com/SquareBracketAssociates/PharoInProgress/tree/master/GitAn... ?

They were all integrated. Thierry