Mercurial > hg

diff mercurial/scmutil.py @ 43947:b4c82b704180 stable 5.2.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: force bytestr conversion of "reason" in scmutil.callcatch() For instance, reason may be an InvalidURL as shown in added test.
author Denis Laxalde <denis@laxalde.org>
date Wed, 18 Dec 2019 20:17:21 +0100
parents 899e55e2d375
children 60de488cad11
line wrap: on
line diff
--- a/mercurial/scmutil.py	Tue Nov 19 23:19:57 2019 +0900
+++ b/mercurial/scmutil.py	Wed Dec 18 20:17:21 2019 +0100
@@ -262,7 +262,7 @@
             if isinstance(reason, pycompat.unicode):
                 # SSLError of Python 2.7.9 contains a unicode
                 reason = encoding.unitolocal(reason)
-            ui.error(_(b"abort: error: %s\n") % reason)
+            ui.error(_(b"abort: error: %s\n") % stringutil.forcebytestr(reason))
         elif (
             util.safehasattr(inst, b"args")
             and inst.args