Mercurial > public > mercurial-scm > hg
diff tests/test-merge1.t @ 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 | 8c4f32b907e6 |
| children | 527ce85c2e60 |
line wrap: on
line diff
--- a/tests/test-merge1.t Tue Oct 06 21:06:18 2020 -0700 +++ b/tests/test-merge1.t Thu Oct 08 15:35:44 2020 -0700 @@ -360,7 +360,7 @@ > ) > def applyupdates(orig, *args, **kwargs): > orig(*args, **kwargs) - > raise error.Abort('intentional aborting') + > raise error.Abort(b'intentional aborting') > def extsetup(ui): > extensions.wrapfunction(merge, "applyupdates", applyupdates) > EOF