# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 2018-10-12 10:50:01
# Node ID c554dc0cc16e38683fb5eb5a767a284715596edf
# Parent  11727e38a920178511968ec8a5b89588f462e2b3

scmutil: wrap locker information in bytestr before repr()ing it

Differential Revision: https://phab.mercurial-scm.org/D4988

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -171,7 +171,8 @@ def callcatch(ui, func):
     # 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") % (