Patchwork [4,of,5] py3: fix formatting of lock error message

login
register
mail settings
Submitter Yuya Nishihara
Date March 3, 2018, 5:12 p.m.
Message ID <f9c0c67072248a5f88ff.1520097152@mimosa>
Download mbox | patch
Permalink /patch/28793/
State Accepted
Headers show

Comments

Yuya Nishihara - March 3, 2018, 5:12 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1520091126 18000
#      Sat Mar 03 10:32:06 2018 -0500
# Node ID f9c0c67072248a5f88ffc0baa33fa0c0f31d43ef
# Parent  eb6c1453a714d61c7101a3c0f360cb8f661d827c
py3: fix formatting of lock error message

Patch

diff --git a/mercurial/lock.py b/mercurial/lock.py
--- a/mercurial/lock.py
+++ b/mercurial/lock.py
@@ -50,10 +50,12 @@  def trylock(ui, vfs, lockname, timeout, 
         # show more details for new-style locks
         if ':' in locker:
             host, pid = locker.split(":", 1)
-            msg = _("waiting for lock on %s held by process %r "
-                    "on host %r\n") % (l.desc, pid, host)
+            msg = (_("waiting for lock on %s held by process %r on host %r\n")
+                   % (pycompat.bytestr(l.desc), pycompat.bytestr(pid),
+                      pycompat.bytestr(host)))
         else:
-            msg = _("waiting for lock on %s held by %r\n") % (l.desc, locker)
+            msg = (_("waiting for lock on %s held by %r\n")
+                   % (l.desc, pycompat.bytestr(locker)))
         printer(msg)
 
     l = lock(vfs, lockname, 0, *args, dolock=False, **kwargs)