This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3489

cvsps: convert encoding name to sysstr
ClosedPublic

Authored by durin42 on May 8 2018, 9:37 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG120c343c38b7: cvsps: convert encoding name to sysstr
Summary

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

durin42 created this revision.May 8 2018, 9:37 AM
pulkit accepted this revision.May 9 2018, 6:10 PM
Closed by commit rHG120c343c38b7: cvsps: convert encoding name to sysstr (authored by durin42). · Explain WhyMay 10 2018, 6:41 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/cvsps.py (3 lines)

Diff 8598

hgext/convert/cvsps.py

# this is needed, because logentry.revision is a tuple of "int" # this is needed, because logentry.revision is a tuple of "int"
# (e.g. (1, 2) for "1.2") # (e.g. (1, 2) for "1.2")
return '.'.join(pycompat.maplist(pycompat.bytestr, r)) return '.'.join(pycompat.maplist(pycompat.bytestr, r))
for entry in log: for entry in log:
comment = entry.comment comment = entry.comment
for e in encodings: for e in encodings:
try: try:
entry.comment = comment.decode(e).encode('utf-8') entry.comment = comment.decode(
pycompat.sysstr(e)).encode('utf-8')
if ui.debugflag: if ui.debugflag:
ui.debug("transcoding by %s: %s of %s\n" % ui.debug("transcoding by %s: %s of %s\n" %
(e, revstr(entry.revision), entry.file)) (e, revstr(entry.revision), entry.file))
break break
except UnicodeDecodeError: except UnicodeDecodeError:
pass # try next encoding pass # try next encoding
except LookupError as inst: # unknown encoding, maybe except LookupError as inst: # unknown encoding, maybe
raise error.Abort(inst, raise error.Abort(inst,