changeset 32152 | 994b0b1c77d6 |
parent 32115 | ef966bcf48a5 |
child 32172 | 448ed4d3ee90 |
--- a/mercurial/scmutil.py Wed May 03 10:43:59 2017 -0700 +++ b/mercurial/scmutil.py Sat Apr 08 11:02:37 2017 +0530 @@ -212,7 +212,7 @@ reason = inst.reason if isinstance(reason, unicode): # SSLError of Python 2.7.9 contains a unicode - reason = reason.encode(encoding.encoding, 'replace') + reason = encoding.unitolocal(reason) ui.warn(_("abort: error: %s\n") % reason) elif (util.safehasattr(inst, "args") and inst.args and inst.args[0] == errno.EPIPE):