Mercurial > public > mercurial-scm > hg-stable
diff tests/failfilemerge.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 | 2372284d9457 |
| children | de8181c5414d |
line wrap: on
line diff
--- a/tests/failfilemerge.py Tue Oct 06 21:06:18 2020 -0700 +++ b/tests/failfilemerge.py Thu Oct 08 15:35:44 2020 -0700 @@ -12,7 +12,7 @@ def failfilemerge( filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None ): - raise error.Abort("^C") + raise error.Abort(b"^C") return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)