Mercurial > public > mercurial-scm > hg

diff mercurial/scmutil.py @ 36262:2b00dda6dad9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
scmutil: bytes-ify IOErrors before wrapping them in abort message Differential Revision: https://phab.mercurial-scm.org/D2292
author Augie Fackler <augie@google.com>
date Sat, 17 Feb 2018 00:29:23 -0500
parents 4f3e989536c3
children 3f98634b6572
line wrap: on
line diff
--- a/mercurial/scmutil.py	Sat Feb 17 13:55:12 2018 -0700
+++ b/mercurial/scmutil.py	Sat Feb 17 00:29:23 2018 -0500
@@ -215,7 +215,7 @@
             ui.warn(_("(is your Python install correct?)\n"))
     except IOError as inst:
         if util.safehasattr(inst, "code"):
-            ui.warn(_("abort: %s\n") % inst)
+            ui.warn(_("abort: %s\n") % util.forcebytestr(inst))
         elif util.safehasattr(inst, "reason"):
             try: # usually it is in the form (errno, strerror)
                 reason = inst.reason.args[1]