diff mercurial/scmutil.py @ 44000:60de488cad11

merge with stable

--- 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