This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8398

fastexport: fix diagnostics
ClosedPublic

Authored by joerg.sonnenberger on Apr 10 2020, 4:33 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG44aff45b556d: fastexport: make a diagnostics message more localizable
rHG4c806a5fe254: fastexport: fix diagnostics

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

pulkit accepted this revision.Apr 13 2020, 11:49 AM
This revision is now accepted and ready to land.Apr 13 2020, 11:49 AM
pulkit added inline comments.Apr 13 2020, 11:51 AM
hgext/fastexport.py
36

Removed this unrequired change to make test-check-format.t happy.

joerg.sonnenberger added a commit: rHG4c806a5fe254: fastexport: fix diagnostics.Apr 13 2020, 12:11 PM
Closed by commit rHG4c806a5fe254: fastexport: fix diagnostics (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Apr 13 2020, 1:20 PM

What was broken before? The test case still seems to pass for me if I undo the code change.

joerg.sonnenberger added a comment.Apr 13 2020, 1:34 PM

Think about any attempt to localize the error message.

martinvonz added a comment.Apr 13 2020, 1:38 PM
In D8398#125450, @joerg.sonnenberger wrote:

Think about any attempt to localize the error message.

Would have helped to put that in the commit message. So the pycompat.bytestr() call is unrelated and not needed, right?

martinvonz added a comment.Apr 13 2020, 1:43 PM
In D8398#125451, @martinvonz wrote:
In D8398#125450, @joerg.sonnenberger wrote:

Think about any attempt to localize the error message.

Would have helped to put that in the commit message. So the pycompat.bytestr() call is unrelated and not needed, right?

I'll update it in flight with a new commit message and without the pycompat.bytestr().

Revision Contents
Changeset List

PathPackages
Mhgext/fastexport.py (3 lines)
Mtests/test-fastexport.t (10 lines)

Diff 21040

hgext/fastexport.py

testedwith = b"ships-with-hg-core" testedwith = b"ships-with-hg-core"
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
GIT_PERSON_PROHIBITED = re.compile(b'[<>\n"]') GIT_PERSON_PROHIBITED = re.compile(b'[<>\n"]')
GIT_EMAIL_PROHIBITED = re.compile(b"[<> \n]") GIT_EMAIL_PROHIBITED = re.compile(b"[<> \n]")
pulkitUnsubmitted
Not Done

Removed this unrequired change to make test-check-format.t happy.

pulkit: Removed this unrequired change to make test-check-format.t happy.
def convert_to_git_user(authormap, user, rev): def convert_to_git_user(authormap, user, rev):
mapped_user = authormap.get(user, user) mapped_user = authormap.get(user, user)
user_person = stringutil.person(mapped_user) user_person = stringutil.person(mapped_user)
user_email = stringutil.email(mapped_user) user_email = stringutil.email(mapped_user)
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 " + rev) _(b"Unable to parse user into person and email for revision %s")
% pycompat.bytestr(rev)
) )
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):

tests/test-fastexport.t

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
$ 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
blob
mark :50
data 4
foo
abort: Unable to parse user into person and email for revision 4f71ca786403919cd16669d94ff7cd1c09437a44
[255]