This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8486

fastexport: adjust output to be more canonical
ClosedPublic

Authored by joerg.sonnenberger on Apr 27 2020, 3:55 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG711df97dbc0f: fastexport: adjust output to be more canonical
rHGbe3f7db9b55a: fastexport: adjust output to be more canonical
Summary

The real name part of the committer name is normally not quoted, so
don't enforce that. Prefer UTC+0 to UTC-0, git doesn't normalize it.

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

marmoute accepted this revision.Apr 28 2020, 4:24 AM
joerg.sonnenberger added a commit: rHGbe3f7db9b55a: fastexport: adjust output to be more canonical.May 7 2020, 11:02 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGbe3f7db9b55a: fastexport: adjust output to be more canonical (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.May 7 2020, 11:56 AM
martinvonz added inline comments.
hgext/fastexport.py
56

It looks like this not only changed the treatment of utcoff == 0 but completely negated it. Is that how it should be? We don't seem to have any tests with non-zero utcoff...

martinvonz added inline comments.May 12 2020, 1:08 PM
hgext/fastexport.py
56

It's a trivial fix that I could of course easily do in flight, but I'd at least like a confirmation first. I'll instead drop this patch for now.

Revision Contents
Changeset List

PathPackages
Mhgext/fastexport.py (6 lines)
Mtests/test-fastexport.t (32 lines)

Diff 21284

hgext/fastexport.py

if GIT_EMAIL_PROHIBITED.match(user_email) or GIT_PERSON_PROHIBITED.match( if GIT_EMAIL_PROHIBITED.match(user_email) or GIT_PERSON_PROHIBITED.match(
user_person user_person
): ):
raise error.Abort( raise error.Abort(
_(b"Unable to parse user into person and email for revision %s") _(b"Unable to parse user into person and email for revision %s")
% rev % rev
) )
if user_person: if user_person:
return b'"' + user_person + b'" <' + user_email + b'>' return b'%s <%s>' % (user_person, user_email)
else: else:
return b"<" + user_email + b">" return b"<%s>" % user_email
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"-"
martinvonzUnsubmitted
Not Done

It looks like this not only changed the treatment of utcoff == 0 but completely negated it. Is that how it should be? We don't seem to have any tests with non-zero utcoff...

martinvonz: It looks like this not only changed the treatment of `utcoff == 0` but completely negated it.
martinvonzUnsubmitted
Not Done

It's a trivial fix that I could of course easily do in flight, but I'd at least like a confirmation first. I'll instead drop this patch for now.

martinvonz: It's a trivial fix that I could of course easily do in flight, but I'd at least like a…
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

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 +0000
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
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