Mercurial > public > mercurial-scm > hg-stable

diff mercurial/scmutil.py @ 44003:60de488cad11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Tue, 07 Jan 2020 09:26:06 -0500
parents f2de8dc9c52f b4c82b704180
children 992f0d6e7f33
line wrap: on
line diff
--- a/mercurial/scmutil.py	Fri Dec 27 19:00:38 2019 -0500
+++ b/mercurial/scmutil.py	Tue Jan 07 09:26:06 2020 -0500
@@ -236,7 +236,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