Mercurial > hg

changeset 40167:c554dc0cc16e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
scmutil: wrap locker information in bytestr before repr()ing it Differential Revision: https://phab.mercurial-scm.org/D4988
author Augie Fackler <augie@google.com>
date Fri, 12 Oct 2018 06:50:01 -0400
parents 11727e38a920
children 5b8bab9a7e07
files mercurial/scmutil.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/scmutil.py	Fri Oct 12 06:50:46 2018 -0400
+++ b/mercurial/scmutil.py	Fri Oct 12 06:50:01 2018 -0400
@@ -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") % (