changeset 36549 | 3696efeab66f |
parent 34218 | aa877860d4d7 |
child 36797 | d4c760c997cd |
--- a/mercurial/encoding.py Thu Mar 01 17:43:25 2018 -0500 +++ b/mercurial/encoding.py Thu Mar 01 17:56:32 2018 -0500 @@ -181,7 +181,8 @@ return u.encode("utf-8") except UnicodeDecodeError as inst: sub = s[max(0, inst.start - 10):inst.start + 10] - raise error.Abort("decoding near '%s': %s!" % (sub, inst)) + raise error.Abort("decoding near '%s': %s!" + % (sub, pycompat.bytestr(inst))) except LookupError as k: raise error.Abort(k, hint="please check your locale settings")