Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 6858:8f256bf98219
Add support for multiple possible bisect results (issue1228, issue1182)
The real reason for both issue is that bisect can not handle cases where there
are multiple possibilities for the result.
Example (from issue1228):
rev 0 -> good
rev 1 -> skipped
rev 2 -> skipped
rev 3 -> skipped
rev 4 -> bad
Note that this patch does not only fix the reported Assertion Error but also
the problem of a non converging bisect:
hg init
for i in `seq 3`; do echo $i > $i; hg add $i; hg ci -m$i; done
hg bisect -b 2
hg bisect -g 0
hg bisect -s
From this state on, you can:
a) mark as bad forever (non converging!)
b) mark as good to get an inconsistent state
c) skip for the Assertion Error
Minor description and code edits by pmezard.
| author | Bernhard Leiner <bleiner@gmail.com> |
|---|---|
| date | Sat, 02 Aug 2008 22:10:10 +0200 |
| parents | e37fa751182a |
| children | 0b6f2fa5e03f 1a4c66d741a2 |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Jul 15 18:10:37 2008 -0500 +++ b/mercurial/commands.py Sat Aug 02 22:10:10 2008 +0200 @@ -324,12 +324,23 @@ return # actually bisect - node, changesets, good = hbisect.bisect(repo.changelog, state) + nodes, changesets, good = hbisect.bisect(repo.changelog, state) if changesets == 0: - ui.write(_("The first %s revision is:\n") % (good and "good" or "bad")) displayer = cmdutil.show_changeset(ui, repo, {}) - displayer.show(changenode=node) - elif node is not None: + transition = (good and "good" or "bad") + if len(nodes) == 1: + # narrowed it down to a single revision + ui.write(_("The first %s revision is:\n") % transition) + displayer.show(changenode=nodes[0]) + else: + # multiple possible revisions + ui.write(_("Due to skipped revisions, the first " + "%s revision could be any of:\n") % transition) + for n in nodes: + displayer.show(changenode=n) + else: + assert len(nodes) == 1 # only a single node can be tested next + node = nodes[0] # compute the approximate number of remaining tests tests, size = 0, 2 while size <= changesets: