This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4811

py3: use util.forcebytestr() to convert error messages to bytes
ClosedPublic

Authored by pulkit on Sep 29 2018, 8:25 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd70e620ee8c9: py3: use util.forcebytestr() to convert error messages to bytes
rHG7eb937f598d1: py3: use util.forcebytestr() to convert error messages to bytes
Summary

This makes the python 3 buildbot green again.

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 created this revision.Sep 29 2018, 8:25 PM
Closed by commit rHG7eb937f598d1: py3: use util.forcebytestr() to convert error messages to bytes (authored by pulkit). · Explain WhySep 29 2018, 9:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (3 lines)

Diff 11498

mercurial/revlog.py

except error.CensoredNodeError: except error.CensoredNodeError:
if state['erroroncensored']: if state['erroroncensored']:
yield revlogproblem(error=_('censored file data'), yield revlogproblem(error=_('censored file data'),
node=node) node=node)
state['skipread'].add(node) state['skipread'].add(node)
except Exception as e: except Exception as e:
yield revlogproblem( yield revlogproblem(
error=_('unpacking %s: %s') % (short(node), e), error=_('unpacking %s: %s') % (short(node),
stringutil.forcebytestr(e)),
node=node) node=node)
state['skipread'].add(node) state['skipread'].add(node)
def storageinfo(self, exclusivefiles=False, sharedfiles=False, def storageinfo(self, exclusivefiles=False, sharedfiles=False,
revisionscount=False, trackedsize=False, revisionscount=False, trackedsize=False,
storedsize=False): storedsize=False):
d = {} d = {}