This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9184

py3: convert an exception message to bytes
ClosedPublic

Authored by martinvonz on Oct 9 2020, 12:22 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGed0ded64a8a9: py3: convert an exception message to bytes
Summary

One of our users ran into this (unrelated to my recent work on
more specific errors).

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

martinvonz created this revision.Oct 9 2020, 12:22 PM
pulkit accepted this revision.Oct 10 2020, 1:58 AM
This revision is now accepted and ready to land.Oct 10 2020, 1:58 AM
martinvonz added a commit: rHGed0ded64a8a9: py3: convert an exception message to bytes.Oct 10 2020, 2:18 AM
Closed by commit rHGed0ded64a8a9: py3: convert an exception message to bytes (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (3 lines)

Diff 23163

mercurial/merge.py

repo.ui.debug(b" %s: %s -> r\n" % (f, msg)) repo.ui.debug(b" %s: %s -> r\n" % (f, msg))
if verbose: if verbose:
repo.ui.note(_(b"removing %s\n") % f) repo.ui.note(_(b"removing %s\n") % f)
wctx[f].audit() wctx[f].audit()
try: try:
wctx[f].remove(ignoremissing=True) wctx[f].remove(ignoremissing=True)
except OSError as inst: except OSError as inst:
repo.ui.warn( repo.ui.warn(
_(b"update failed to remove %s: %s!\n") % (f, inst.strerror) _(b"update failed to remove %s: %s!\n")
% (f, pycompat.bytestr(inst.strerror))
) )
if i == 100: if i == 100:
yield i, f yield i, f
i = 0 i = 0
i += 1 i += 1
if i > 0: if i > 0:
yield i, f yield i, f