This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4985

obsolete: convert error string to a sysstr
ClosedPublic

Authored by durin42 on Oct 12 2018, 6:40 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfee616937ef3: obsolete: convert error string to a sysstr
Summary

This should be okay because we're just %-formatting a hash into a
localized string.

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.Oct 12 2018, 6:40 AM
pulkit accepted this revision.Oct 12 2018, 6:48 AM
Closed by commit rHGfee616937ef3: obsolete: convert error string to a sysstr (authored by durin42). · Explain WhyOct 12 2018, 6:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/obsolete.py (3 lines)

Diff 11867

mercurial/obsolete.py

else: else:
date = dateutil.makedate() date = dateutil.makedate()
if len(prec) != 20: if len(prec) != 20:
raise ValueError(prec) raise ValueError(prec)
for succ in succs: for succ in succs:
if len(succ) != 20: if len(succ) != 20:
raise ValueError(succ) raise ValueError(succ)
if prec in succs: if prec in succs:
raise ValueError(_('in-marker cycle with %s') % node.hex(prec)) raise ValueError(
pycompat.sysstr(_('in-marker cycle with %s') % node.hex(prec)))
metadata = tuple(sorted(metadata.iteritems())) metadata = tuple(sorted(metadata.iteritems()))
for k, v in metadata: for k, v in metadata:
try: try:
# might be better to reject non-ASCII keys # might be better to reject non-ASCII keys
k.decode('utf-8') k.decode('utf-8')
v.decode('utf-8') v.decode('utf-8')
except UnicodeDecodeError: except UnicodeDecodeError: