Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use util.forcebytestr() to convert push lock error to bytes
authorMatt Harbison <matt_harbison@yahoo.com>
Sat, 29 Sep 2018 23:52:00 -0400
changeset 39911 d1bc6cf2be69
parent 39910 6e2c8f7f894e
child 39912 7b35209ba1a7
py3: use util.forcebytestr() to convert push lock error to bytes
mercurial/exchange.py file | annotate | diff | comparison | revisions 
--- a/mercurial/exchange.py	Sat Sep 29 20:57:49 2018 -0400
+++ b/mercurial/exchange.py	Sat Sep 29 23:52:00 2018 -0400
@@ -522,7 +522,8 @@
         # source repo cannot be locked.
         # We do not abort the push, but just disable the local phase
         # synchronisation.
-        msg = 'cannot lock source repository: %s\n' % err
+        msg = ('cannot lock source repository: %s\n'
+               % stringutil.forcebytestr(err))
         pushop.ui.debug(msg)
 
     with wlock or util.nullcontextmanager(), \
Mercurial