D4988: scmutil: wrap locker information in bytestr before repr()ing it
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Fri Oct 12 10:56:03 UTC 2018
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D4988
AFFECTED FILES
mercurial/scmutil.py
CHANGE DETAILS
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -171,7 +171,8 @@
# Mercurial-specific first, followed by built-in and library exceptions
except error.LockHeld as inst:
if inst.errno == errno.ETIMEDOUT:
- reason = _('timed out waiting for lock held by %r') % inst.locker
+ reason = _('timed out waiting for lock held by %r') % (
+ pycompat.bytestr(inst.locker))
else:
reason = _('lock held by %r') % inst.locker
ui.error(_("abort: %s: %s\n") % (
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list