This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9337

errors: raise StateError in `hg bisect`
ClosedPublic

Authored by martinvonz on Nov 17 2020, 7:56 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGe641bb2a6159: errors: raise StateError in `hg bisect`
rHG6464a3531ad1: errors: raise StateError in `hg bisect`

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/hbisect.py (6 lines)
Mtests/test-bisect.t (6 lines)

Diff 23560

mercurial/hbisect.py

"""remove any bisect state from the repository""" """remove any bisect state from the repository"""
if repo.vfs.exists(b"bisect.state"): if repo.vfs.exists(b"bisect.state"):
repo.vfs.unlink(b"bisect.state") repo.vfs.unlink(b"bisect.state")
def checkstate(state): def checkstate(state):
"""check we have both 'good' and 'bad' to define a range """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']: if state[b'good'] and state[b'bad']:
return True return True
if not state[b'good']: 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: else:
raise error.Abort(_(b'cannot bisect (no known bad revisions)')) raise error.StateError(_(b'cannot bisect (no known bad revisions)'))
@contextlib.contextmanager @contextlib.contextmanager
def restore_state(repo, state, node): def restore_state(repo, state, node):
try: try:
yield yield
finally: finally:
state[b'current'] = [node] state[b'current'] = [node]

tests/test-bisect.t

test no action test no action
$ hg bisect -r $ hg bisect -r
$ hg bisect $ hg bisect
abort: cannot bisect (no known good revisions) abort: cannot bisect (no known good revisions)
[255] [20]
reproduce AssertionError, issue1445 reproduce AssertionError, issue1445
$ hg bisect -r $ hg bisect -r
$ hg bisect -b 6 $ hg bisect -b 6
$ hg bisect -g 0 $ hg bisect -g 0
Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests) Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests)
> sys.exit(1) > sys.exit(1)
> EOF > EOF
$ chmod +x script.py $ chmod +x script.py
$ hg bisect -r $ hg bisect -r
$ hg up -qr tip $ hg up -qr tip
$ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters"
changeset 31:58c80a7c8a40: good changeset 31:58c80a7c8a40: good
abort: cannot bisect (no known bad revisions) abort: cannot bisect (no known bad revisions)
[255] [20]
$ hg up -qr 0 $ hg up -qr 0
$ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters"
changeset 0:b99c7b9c8e11: bad changeset 0:b99c7b9c8e11: bad
changeset 15:e7fa0811edb0: good changeset 15:e7fa0811edb0: good
changeset 7:03750880c6b5: good changeset 7:03750880c6b5: good
changeset 3:b53bea5e2fcb: bad changeset 3:b53bea5e2fcb: bad
changeset 5:7874a09ea728: bad changeset 5:7874a09ea728: bad
changeset 6:a3d5c6fdf0d3: good changeset 6:a3d5c6fdf0d3: good
> test "$rev" -ge 6 > test "$rev" -ge 6
> EOF > EOF
$ chmod +x script.sh $ chmod +x script.sh
$ hg bisect -r $ hg bisect -r
$ hg up -qr tip $ hg up -qr tip
$ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params"
changeset 31:58c80a7c8a40: good changeset 31:58c80a7c8a40: good
abort: cannot bisect (no known bad revisions) abort: cannot bisect (no known bad revisions)
[255] [20]
$ hg up -qr 0 $ hg up -qr 0
$ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params"
changeset 0:b99c7b9c8e11: bad changeset 0:b99c7b9c8e11: bad
changeset 15:e7fa0811edb0: good changeset 15:e7fa0811edb0: good
changeset 7:03750880c6b5: good changeset 7:03750880c6b5: good
changeset 3:b53bea5e2fcb: bad changeset 3:b53bea5e2fcb: bad
changeset 5:7874a09ea728: bad changeset 5:7874a09ea728: bad
changeset 6:a3d5c6fdf0d3: good changeset 6:a3d5c6fdf0d3: good