Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/scmutil.py
changeset 40167 c554dc0cc16e
parent 40087 1d09ba0d2ed3
child 40341 d916ed3ca951 
--- 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") % (
Mercurial