Mercurial > public > mercurial-scm > hg
diff mercurial/encoding.py @ 45681:a736ab681b78
errors: stop passing non-strings to Abort's constructor
The next patch will change `Abort`'s constructor and `__bytes__`
functions and they will start assuming that the first argument is the
messages as `bytes`.
Differential Revision: https://phab.mercurial-scm.org/D9178
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 08 Oct 2020 15:35:44 -0700 |
| parents | 9d2b2df2c2ba |
| children | 89a2afe31e82 |
line wrap: on
line diff
--- a/mercurial/encoding.py Tue Oct 06 21:06:18 2020 -0700 +++ b/mercurial/encoding.py Thu Oct 08 15:35:44 2020 -0700 @@ -207,7 +207,9 @@ # can't round-trip return u.encode(_sysstr(encoding), "replace") except LookupError as k: - raise error.Abort(k, hint=b"please check your locale settings") + raise error.Abort( + pycompat.bytestr(k), hint=b"please check your locale settings" + ) def fromlocal(s):