Mercurial > public > mercurial-scm > hg-stable
diff mercurial/exchange.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 | 10284ce3d5ed |
| children | 74271829ddc0 |
line wrap: on
line diff
--- a/mercurial/exchange.py Tue Oct 06 21:06:18 2020 -0700 +++ b/mercurial/exchange.py Thu Oct 08 15:35:44 2020 -0700 @@ -1720,7 +1720,7 @@ repo = reporef() cm = _(b'accept incoming changes (yn)?$$ &Yes $$ &No') if repo.ui.promptchoice(cm): - raise error.Abort("user aborted") + raise error.Abort(b"user aborted") tr.addvalidator(b'900-pull-prompt', prompt)