Mercurial > hg
changeset 45875:e641bb2a6159
errors: raise StateError in `hg bisect`
Differential Revision: https://phab.mercurial-scm.org/D9337
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 17 Nov 2020 15:42:42 -0800 |
| parents | 1a72e4839795 |
| children | 568c05d8f3d2 |
| files | mercurial/hbisect.py tests/test-bisect.t |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hbisect.py Tue Nov 17 15:37:18 2020 -0800 +++ b/mercurial/hbisect.py Tue Nov 17 15:42:42 2020 -0800 @@ -172,13 +172,13 @@ def checkstate(state): """check we have both 'good' and 'bad' to define a range - Raise Abort exception otherwise.""" + Raise StateError exception otherwise.""" if state[b'good'] and state[b'bad']: return True if not state[b'good']: - raise error.Abort(_(b'cannot bisect (no known good revisions)')) + raise error.StateError(_(b'cannot bisect (no known good revisions)')) else: - raise error.Abort(_(b'cannot bisect (no known bad revisions)')) + raise error.StateError(_(b'cannot bisect (no known bad revisions)')) @contextlib.contextmanager
--- a/tests/test-bisect.t Tue Nov 17 15:37:18 2020 -0800 +++ b/tests/test-bisect.t Tue Nov 17 15:42:42 2020 -0800 @@ -364,7 +364,7 @@ $ hg bisect -r $ hg bisect abort: cannot bisect (no known good revisions) - [255] + [20] reproduce AssertionError, issue1445 @@ -475,7 +475,7 @@ $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" changeset 31:58c80a7c8a40: good abort: cannot bisect (no known bad revisions) - [255] + [20] $ hg up -qr 0 $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" changeset 0:b99c7b9c8e11: bad @@ -545,7 +545,7 @@ $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" changeset 31:58c80a7c8a40: good abort: cannot bisect (no known bad revisions) - [255] + [20] $ hg up -qr 0 $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" changeset 0:b99c7b9c8e11: bad