This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8522

fastexport: adjust output to be more canonical
ClosedPublic

Authored by joerg.sonnenberger on May 12 2020, 4:30 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGedffab2cf0ea: fastexport: adjust output to be more canonical
Summary

For time zones, git doesn't consider +0 and -0 the same timezone, so use
the former canonically. Add a test case to ensure that non-UTC offsets
are handled correctly. The real name part of the committer name is
normally not quoted, so don't enforce that.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz accepted this revision.May 12 2020, 6:07 PM
martinvonz added a subscriber: martinvonz.

Thanks for the quick fix and the added test case!

This revision is now accepted and ready to land.May 12 2020, 6:07 PM

Revision Contents
Changeset List

PathPackages
Mhgext/fastexport.py (2 lines)
Mtests/test-fastexport.t (48 lines)

Diff 21371

hgext/fastexport.py

if user_person: if user_person:
return b'"' + user_person + b'" <' + user_email + b'>' return b'"' + user_person + b'" <' + user_email + b'>'
else: else:
return b"<" + user_email + b">" return b"<" + user_email + b">"
def convert_to_git_date(date): def convert_to_git_date(date):
timestamp, utcoff = date timestamp, utcoff = date
tzsign = b"+" if utcoff < 0 else b"-" tzsign = b"+" if utcoff <= 0 else b"-"
if utcoff % 60 != 0: if utcoff % 60 != 0:
raise error.Abort( raise error.Abort(
_(b"UTC offset in %b is not an integer number of seconds") % (date,) _(b"UTC offset in %b is not an integer number of seconds") % (date,)
) )
utcoff = abs(utcoff) // 60 utcoff = abs(utcoff) // 60
tzh = utcoff // 60 tzh = utcoff // 60
tzmin = utcoff % 60 tzmin = utcoff % 60
return b"%d " % int(timestamp) + tzsign + b"%02d%02d" % (tzh, tzmin) return b"%d " % int(timestamp) + tzsign + b"%02d%02d" % (tzh, tzmin)

tests/test-fastexport.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> fastexport= > fastexport=
> EOF > EOF
$ hg init $ hg init
$ hg debugbuilddag -mon '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip' $ hg debugbuilddag -mon '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
$ hg up -r 10 $ hg up -r 10
13 files updated, 0 files merged, 0 files removed, 0 files unresolved 13 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rm nf10 $ hg rm nf10
$ hg commit -u debugbuilddag --date 'Thu Jan 01 00:00:12 1970 +0000' -m r12 $ hg commit -u debugbuilddag --date 'Thu Jan 01 02:30:12 1970 +0230' -m r12
created new head created new head
$ hg up -r 11 $ hg up -r 11
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge -r 12 $ hg merge -r 12
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg commit -m debugbuilddag --date 'Thu Jan 01 00:00:13 1970 +0000' $ hg commit -m debugbuilddag --date 'Thu Jan 01 00:00:13 1970 +0000'
$ hg log -G $ hg log -G
@ changeset: 13:e5c379648af4 @ changeset: 13:5544befcb7ce
|\ branch: both |\ branch: both
| | tag: tip | | tag: tip
| | parent: 11:2cbd52c10e88 | | parent: 11:2cbd52c10e88
| | parent: 12:4f31c9604af6 | | parent: 12:66d0c21243be
| | user: test | | user: test
| | date: Thu Jan 01 00:00:13 1970 +0000 | | date: Thu Jan 01 00:00:13 1970 +0000
| | summary: debugbuilddag | | summary: debugbuilddag
| | | |
| o changeset: 12:4f31c9604af6 | o changeset: 12:66d0c21243be
| | branch: both | | branch: both
| | parent: 10:9220596cb068 | | parent: 10:9220596cb068
| | user: debugbuilddag | | user: debugbuilddag
| | date: Thu Jan 01 00:00:12 1970 +0000 | | date: Thu Jan 01 02:30:12 1970 +0230
| | summary: r12 | | summary: r12
| | | |
o | changeset: 11:2cbd52c10e88 o | changeset: 11:2cbd52c10e88
|/ branch: both |/ branch: both
| tag: tmaintip | tag: tmaintip
| user: debugbuilddag | user: debugbuilddag
| date: Thu Jan 01 00:00:11 1970 +0000 | date: Thu Jan 01 00:00:11 1970 +0000
| summary: r11 | summary: r11
blob blob
mark :2 mark :2
data 3 data 3
r0 r0
commit refs/heads/default commit refs/heads/default
mark :3 mark :3
committer "debugbuilddag" <debugbuilddag> 0 -0000 committer "debugbuilddag" <debugbuilddag> 0 +0000
data 2 data 2
r0 r0
M 644 :1 mf M 644 :1 mf
M 644 :2 nf0 M 644 :2 nf0
M 644 :2 of M 644 :2 of
blob blob
mark :4 mark :4
blob blob
mark :6 mark :6
data 3 data 3
r1 r1
commit refs/heads/default commit refs/heads/default
mark :7 mark :7
committer "debugbuilddag" <debugbuilddag> 1 -0000 committer "debugbuilddag" <debugbuilddag> 1 +0000
data 2 data 2
r1 r1
from :3 from :3
M 644 :4 mf M 644 :4 mf
M 644 :5 nf1 M 644 :5 nf1
M 644 :6 of M 644 :6 of
blob blob
blob blob
mark :10 mark :10
data 3 data 3
r2 r2
commit refs/heads/name1 commit refs/heads/name1
mark :11 mark :11
committer "debugbuilddag" <debugbuilddag> 2 -0000 committer "debugbuilddag" <debugbuilddag> 2 +0000
data 2 data 2
r2 r2
from :7 from :7
M 644 :8 mf M 644 :8 mf
M 644 :9 nf2 M 644 :9 nf2
M 644 :10 of M 644 :10 of
blob blob
blob blob
mark :14 mark :14
data 3 data 3
r3 r3
commit refs/heads/name1 commit refs/heads/name1
mark :15 mark :15
committer "debugbuilddag" <debugbuilddag> 3 -0000 committer "debugbuilddag" <debugbuilddag> 3 +0000
data 2 data 2
r3 r3
from :11 from :11
M 644 :12 mf M 644 :12 mf
M 644 :13 nf3 M 644 :13 nf3
M 644 :14 of M 644 :14 of
blob blob
blob blob
mark :18 mark :18
data 3 data 3
r4 r4
commit refs/heads/name1 commit refs/heads/name1
mark :19 mark :19
committer "debugbuilddag" <debugbuilddag> 4 -0000 committer "debugbuilddag" <debugbuilddag> 4 +0000
data 2 data 2
r4 r4
from :15 from :15
M 644 :16 mf M 644 :16 mf
M 644 :17 nf4 M 644 :17 nf4
M 644 :18 of M 644 :18 of
blob blob
blob blob
mark :22 mark :22
data 3 data 3
r5 r5
commit refs/heads/name2 commit refs/heads/name2
mark :23 mark :23
committer "debugbuilddag" <debugbuilddag> 5 -0000 committer "debugbuilddag" <debugbuilddag> 5 +0000
data 2 data 2
r5 r5
from :7 from :7
M 644 :20 mf M 644 :20 mf
M 644 :21 nf5 M 644 :21 nf5
M 644 :22 of M 644 :22 of
blob blob
blob blob
mark :26 mark :26
data 3 data 3
r6 r6
commit refs/heads/name2 commit refs/heads/name2
mark :27 mark :27
committer "debugbuilddag" <debugbuilddag> 6 -0000 committer "debugbuilddag" <debugbuilddag> 6 +0000
data 2 data 2
r6 r6
from :23 from :23
M 644 :24 mf M 644 :24 mf
M 644 :25 nf6 M 644 :25 nf6
M 644 :26 of M 644 :26 of
blob blob
blob blob
mark :30 mark :30
data 3 data 3
r7 r7
commit refs/heads/name2 commit refs/heads/name2
mark :31 mark :31
committer "debugbuilddag" <debugbuilddag> 7 -0000 committer "debugbuilddag" <debugbuilddag> 7 +0000
data 2 data 2
r7 r7
from :27 from :27
M 644 :28 mf M 644 :28 mf
M 644 :29 nf7 M 644 :29 nf7
M 644 :30 of M 644 :30 of
blob blob
blob blob
mark :34 mark :34
data 3 data 3
r8 r8
commit refs/heads/name2 commit refs/heads/name2
mark :35 mark :35
committer "debugbuilddag" <debugbuilddag> 8 -0000 committer "debugbuilddag" <debugbuilddag> 8 +0000
data 2 data 2
r8 r8
from :31 from :31
M 644 :32 mf M 644 :32 mf
M 644 :33 nf8 M 644 :33 nf8
M 644 :34 of M 644 :34 of
blob blob
blob blob
mark :38 mark :38
data 3 data 3
r9 r9
commit refs/heads/both commit refs/heads/both
mark :39 mark :39
committer "debugbuilddag" <debugbuilddag> 9 -0000 committer "debugbuilddag" <debugbuilddag> 9 +0000
data 2 data 2
r9 r9
from :35 from :35
merge :19 merge :19
M 644 :36 mf M 644 :36 mf
M 644 :9 nf2 M 644 :9 nf2
M 644 :13 nf3 M 644 :13 nf3
M 644 :17 nf4 M 644 :17 nf4
blob blob
mark :42 mark :42
data 4 data 4
r10 r10
commit refs/heads/both commit refs/heads/both
mark :43 mark :43
committer "debugbuilddag" <debugbuilddag> 10 -0000 committer "debugbuilddag" <debugbuilddag> 10 +0000
data 3 data 3
r10 r10
from :39 from :39
M 644 :40 mf M 644 :40 mf
M 644 :41 nf10 M 644 :41 nf10
M 644 :42 of M 644 :42 of
blob blob
blob blob
mark :46 mark :46
data 4 data 4
r11 r11
commit refs/heads/both commit refs/heads/both
mark :47 mark :47
committer "debugbuilddag" <debugbuilddag> 11 -0000 committer "debugbuilddag" <debugbuilddag> 11 +0000
data 3 data 3
r11 r11
from :43 from :43
M 644 :44 mf M 644 :44 mf
M 644 :45 nf11 M 644 :45 nf11
M 644 :46 of M 644 :46 of
commit refs/heads/both commit refs/heads/both
mark :48 mark :48
committer "debugbuilddag" <debugbuilddag> 12 -0000 committer "debugbuilddag" <debugbuilddag> 12 +0230
data 3 data 3
r12 r12
from :43 from :43
D nf10 D nf10
commit refs/heads/both commit refs/heads/both
mark :49 mark :49
committer "test" <test> 13 -0000 committer "test" <test> 13 +0000
data 13 data 13
debugbuilddag debugbuilddag
from :47 from :47
merge :48 merge :48
D nf10 D nf10
$ cat fastexport.marks $ cat fastexport.marks
e1767c7564f83127d75331428473dd0512b36cc6 e1767c7564f83127d75331428473dd0512b36cc6
284ca43bbbe82e89c0f1d977e8ac6cfb969c05ec 284ca43bbbe82e89c0f1d977e8ac6cfb969c05ec
15315ab9e272ec81ae8d847996e5bdecd5635b0b 15315ab9e272ec81ae8d847996e5bdecd5635b0b
78c10aaf21f49d518c7ccb8318c29abb5d4e5db7 78c10aaf21f49d518c7ccb8318c29abb5d4e5db7
9220596cb068dfc73e2f7e695dc8ad0858a936db 9220596cb068dfc73e2f7e695dc8ad0858a936db
32abd0da49b7c7ee756298fc46a15584d6aedc99 32abd0da49b7c7ee756298fc46a15584d6aedc99
33fbc651630ffa7ccbebfe4eb91320a873e7291c 33fbc651630ffa7ccbebfe4eb91320a873e7291c
868d828870663d075cdcff502d26cf8445ce068e 868d828870663d075cdcff502d26cf8445ce068e
2cbd52c10e88ce604402dc83a869ec4f07765b3d 2cbd52c10e88ce604402dc83a869ec4f07765b3d
4f31c9604af676986343d775b05695f535e8db5e 66d0c21243be072f82ced64aa730ab0367252451
e5c379648af4c9fa3b5546ab7ee6e61a36082830 5544befcb7ce4a558ed9e19909e16af574a2a3c6
$ hg fastexport --export-marks fastexport.marks2 -r 0 $ hg fastexport --export-marks fastexport.marks2 -r 0
blob blob
mark :1 mark :1
data 65 data 65
0 r0 0 r0
1 1
2 2
blob blob
mark :2 mark :2
data 3 data 3
r0 r0
commit refs/heads/default commit refs/heads/default
mark :3 mark :3
committer "debugbuilddag" <debugbuilddag> 0 -0000 committer "debugbuilddag" <debugbuilddag> 0 +0000
data 2 data 2
r0 r0
M 644 :1 mf M 644 :1 mf
M 644 :2 nf0 M 644 :2 nf0
M 644 :2 of M 644 :2 of
$ cat fastexport.marks2 $ cat fastexport.marks2
e1767c7564f83127d75331428473dd0512b36cc6 e1767c7564f83127d75331428473dd0512b36cc6
blob blob
mark :6 mark :6
data 3 data 3
r1 r1
commit refs/heads/default commit refs/heads/default
mark :7 mark :7
committer "debugbuilddag" <debugbuilddag> 1 -0000 committer "debugbuilddag" <debugbuilddag> 1 +0000
data 2 data 2
r1 r1
from :3 from :3
M 644 :4 mf M 644 :4 mf
M 644 :5 nf1 M 644 :5 nf1
M 644 :6 of M 644 :6 of
$ echo foo > of $ echo foo > of
$ hg commit --user '<badname> <bad email>' --date 'Fri Jan 02 00:00:00 1970 +0000' -m 'Testcommit' $ hg commit --user '<badname> <bad email>' --date 'Fri Jan 02 00:00:00 1970 +0000' -m 'Testcommit'
$ hg fastexport --import-marks fastexport.marks -r tip $ hg fastexport --import-marks fastexport.marks -r tip
blob blob
mark :50 mark :50
data 4 data 4
foo foo
abort: Unable to parse user into person and email for revision 4f71ca786403919cd16669d94ff7cd1c09437a44 abort: Unable to parse user into person and email for revision 65a3f69b9b519de73d755472c1ab05990ab8a7f7
[255] [255]