Re: mercurial to git

On Wed, Mar 14, 2007 at 11:12:57AM +0000, Rocco Rutte wrote:

I tried the import on the e2fsprogs repo and the files come out 
identical, authors/comitters look okay to me, too.

Very cool!  It looks like some of the git author dates are only
getting set if the -s flag is set.  Was that intentional?

						- Ted

Hi,

* Theodore Tso [07-03-14 20:25:07 -0400] wrote:

On Wed, Mar 14, 2007 at 11:12:57AM +0000, Rocco Rutte wrote:

I failed to send a response to the list and it went Theodore privately 
only, sorry. I merged hg2git into fast-export.git at repo.or.cz and 
named it 'hg-fast-export' to match with the other importers there. It 
now can parse Signed-off-by lines and supports author maps (as 
git-cvsimport and git-svnimport do, same syntax).

quoted

I tried the import on the e2fsprogs repo and the files come out 
identical, authors/comitters look okay to me, too.

Very cool!  It looks like some of the git author dates are only
getting set if the -s flag is set.  Was that intentional?

For which changesets exactly? The script only attempts to write out the 
'author' command if -s (for parsing signed-off-by) is given. But for 
both commands the time information written out are identical and are 
exactly what hg gives us. So the bug must be elsewhere.

   bye, Rocco
-- 
:wq!

On Thu, Mar 15, 2007 at 10:19:13AM +0000, Rocco Rutte wrote:

I failed to send a response to the list and it went Theodore privately 
only, sorry. I merged hg2git into fast-export.git at repo.or.cz and 
named it 'hg-fast-export' to match with the other importers there. It 
now can parse Signed-off-by lines and supports author maps (as 
git-cvsimport and git-svnimport do, same syntax).

BTW, there are a number of places where the old name (hg2git) is still
being used for filenames, et.al, because $PFX is still being set to
hg2git.  

For which changesets exactly? The script only attempts to write out the 
'author' command if -s (for parsing signed-off-by) is given. But for 
both commands the time information written out are identical and are 
exactly what hg gives us. So the bug must be elsewhere.

All of them.  :-)

Upon doing more investigation, the failure case seems to be if -A is
specified but NOT -s.  Comare:

(Generated using: hg-fast-export.sh -A ../e2fsprogs.authors -r ../e2fsprogs)
commit b584b9c57ecbbeef91970ca2924d66662029ab29
Author: Theodore Ts'o [off-list ref]
Date:   Thu Jan 1 00:00:00 1970 +0000  <=============

with

(Generated using: hg-fast-export.sh -s -A ../e2fsprogs.authors -r ../e2fsprogs)
commit 9e9a5867e4d4985bde6d6be072efb96e901e08cc
Author: Theodore Ts'o [off-list ref]
Date:   Wed Mar 7 08:09:10 2007 -0500  <=============

The date seems to be correctly generated using

	hg-fast-export.sh -s -A ../e2fsprogs.authors -r ../e2fsprogs
	hg-fast-export.sh -s -r ../e2fsprogs
	hg-fast-export.sh -r ../e2fsprogs

It seems to be this combination of options:

	hg-fast-export.sh -A ../e2fsprogs.authors -r ../e2fsprogs

Where all of the dates end up being Jan 1, 1970.

Regards,

						- Ted

Hi,

* Theodore Tso [07-03-15 10:12:27 -0400] wrote:

On Thu, Mar 15, 2007 at 10:19:13AM +0000, Rocco Rutte wrote:

quoted

I failed to send a response to the list and it went Theodore privately 
only, sorry. I merged hg2git into fast-export.git at repo.or.cz and 
named it 'hg-fast-export' to match with the other importers there. It 
now can parse Signed-off-by lines and supports author maps (as 
git-cvsimport and git-svnimport do, same syntax).

BTW, there are a number of places where the old name (hg2git) is still
being used for filenames, et.al, because $PFX is still being set to
hg2git.

I know and intend to leave it that way as the filenames are shorter.

The date seems to be correctly generated using

hg-fast-export.sh -s -A ../e2fsprogs.authors -r ../e2fsprogs
hg-fast-export.sh -s -r ../e2fsprogs
hg-fast-export.sh -r ../e2fsprogs

It seems to be this combination of options:

hg-fast-export.sh -A ../e2fsprogs.authors -r ../e2fsprogs

Where all of the dates end up being Jan 1, 1970.

Hmm. Strange, I cannot reproduce this. Can you mail me your authors file 
along with version information privately please?

   bye, Rocco
-- 
:wq!

On Thu, 15 Mar 2007, Theodore Tso wrote:

(Generated using: hg-fast-export.sh -A ../e2fsprogs.authors -r ../e2fsprogs)
commit b584b9c57ecbbeef91970ca2924d66662029ab29
Author: Theodore Ts'o [off-list ref]
Date:   Thu Jan 1 00:00:00 1970 +0000  <=============

Is the committer date ok (does it even exist)? Use "--pretty=fuller" or 
perhaps even "--pretty=raw" to see both author and committer date.

The normal log only shows author date, since that's usually the one people 
care about (git itself doesn't at all, it uses the committer date-stamp to 
do it's "choose most recent path to go down").

		Linus