bisect: use changelog for iteration

With changelog filtering, we can not use xrange anymore. We have to use the
changelog to do the iteration. This way, the changelog excludes filtered
revision and we can safely use what we iterate over.

Without this changes, bisect crash with a traceback if there is filtered
revision in the repo. Tests have been updated.

mercurial/hbisect.py

@@ -1,258 +1,258
 # changelog bisection for mercurial
 #
 # Copyright 2007 Matt Mackall
 # Copyright 2005, 2006 Benoit Boissinot <[e-mail]>
 #
 # Inspired by git bisect, extension skeleton taken from mq.py.
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 import os, error
 from i18n import _
 from node import short, hex
 import util
 
 def bisect(changelog, state):
     """find the next node (if any) for testing during a bisect search.
     returns a (nodes, number, good) tuple.
 
     'nodes' is the final result of the bisect if 'number' is 0.
     Otherwise 'number' indicates the remaining possible candidates for
     the search and 'nodes' contains the next bisect target.
     'good' is True if bisect is searching for a first good changeset, False
     if searching for a first bad one.
     """
 
     clparents = changelog.parentrevs
     skip = set([changelog.rev(n) for n in state['skip']])
 
     def buildancestors(bad, good):
         # only the earliest bad revision matters
         badrev = min([changelog.rev(n) for n in bad])
         goodrevs = [changelog.rev(n) for n in good]
         goodrev = min(goodrevs)
         # build visit array
         ancestors = [None] * (len(changelog) + 1) # an extra for [-1]
 
         # set nodes descended from goodrevs
         for rev in goodrevs:
             ancestors[rev] = []
-        for rev in xrange(goodrev + 1, len(changelog)):
+        for rev in changelog.revs(goodrev + 1):
             for prev in clparents(rev):
                 if ancestors[prev] == []:
                     ancestors[rev] = []
 
         # clear good revs from array
         for rev in goodrevs:
             ancestors[rev] = None
-        for rev in xrange(len(changelog), goodrev, -1):
+        for rev in changelog.revs(len(changelog), goodrev):
             if ancestors[rev] is None:
                 for prev in clparents(rev):
                     ancestors[prev] = None
 
         if ancestors[badrev] is None:
             return badrev, None
         return badrev, ancestors
 
     good = False
     badrev, ancestors = buildancestors(state['bad'], state['good'])
     if not ancestors: # looking for bad to good transition?
         good = True
         badrev, ancestors = buildancestors(state['good'], state['bad'])
     bad = changelog.node(badrev)
     if not ancestors: # now we're confused
         if len(state['bad']) == 1 and len(state['good']) == 1:
             raise util.Abort(_("starting revisions are not directly related"))
         raise util.Abort(_("inconsistent state, %s:%s is good and bad")
                          % (badrev, short(bad)))
 
     # build children dict
     children = {}
     visit = util.deque([badrev])
     candidates = []
     while visit:
         rev = visit.popleft()
         if ancestors[rev] == []:
             candidates.append(rev)
             for prev in clparents(rev):
                 if prev != -1:
                     if prev in children:
                         children[prev].append(rev)
                     else:
                         children[prev] = [rev]
                         visit.append(prev)
 
     candidates.sort()
     # have we narrowed it down to one entry?
     # or have all other possible candidates besides 'bad' have been skipped?
     tot = len(candidates)
     unskipped = [c for c in candidates if (c not in skip) and (c != badrev)]
     if tot == 1 or not unskipped:
         return ([changelog.node(rev) for rev in candidates], 0, good)
     perfect = tot // 2
 
     # find the best node to test
     best_rev = None
     best_len = -1
     poison = set()
     for rev in candidates:
         if rev in poison:
             # poison children
             poison.update(children.get(rev, []))
             continue
 
         a = ancestors[rev] or [rev]
         ancestors[rev] = None
 
         x = len(a) # number of ancestors
         y = tot - x # number of non-ancestors
         value = min(x, y) # how good is this test?
         if value > best_len and rev not in skip:
             best_len = value
             best_rev = rev
             if value == perfect: # found a perfect candidate? quit early
                 break
 
         if y < perfect and rev not in skip: # all downhill from here?
             # poison children
             poison.update(children.get(rev, []))
             continue
 
         for c in children.get(rev, []):
             if ancestors[c]:
                 ancestors[c] = list(set(ancestors[c] + a))
             else:
                 ancestors[c] = a + [c]
 
     assert best_rev is not None
     best_node = changelog.node(best_rev)
 
     return ([best_node], tot, good)
 
 
 def load_state(repo):
     state = {'current': [], 'good': [], 'bad': [], 'skip': []}
     if os.path.exists(repo.join("bisect.state")):
         for l in repo.opener("bisect.state"):
             kind, node = l[:-1].split()
             node = repo.lookup(node)
             if kind not in state:
                 raise util.Abort(_("unknown bisect kind %s") % kind)
             state[kind].append(node)
     return state
 
 
 def save_state(repo, state):
     f = repo.opener("bisect.state", "w", atomictemp=True)
     wlock = repo.wlock()
     try:
         for kind in sorted(state):
             for node in state[kind]:
                 f.write("%s %s\n" % (kind, hex(node)))
         f.close()
     finally:
         wlock.release()
 
 def get(repo, status):
     """
     Return a list of revision(s) that match the given status:
 
     - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip
     - ``goods``, ``bads``      : csets topologically good/bad
     - ``range``              : csets taking part in the bisection
     - ``pruned``             : csets that are goods, bads or skipped
     - ``untested``           : csets whose fate is yet unknown
     - ``ignored``            : csets ignored due to DAG topology
     - ``current``            : the cset currently being bisected
     """
     state = load_state(repo)
     if status in ('good', 'bad', 'skip', 'current'):
         return map(repo.changelog.rev, state[status])
     else:
         # In the following sets, we do *not* call 'bisect()' with more
         # than one level of recursion, because that can be very, very
         # time consuming. Instead, we always develop the expression as
         # much as possible.
 
         # 'range' is all csets that make the bisection:
         #   - have a good ancestor and a bad descendant, or conversely
         # that's because the bisection can go either way
         range = '( bisect(bad)::bisect(good) | bisect(good)::bisect(bad) )'
 
         _t = repo.revs('bisect(good)::bisect(bad)')
         # The sets of topologically good or bad csets
         if len(_t) == 0:
             # Goods are topologically after bads
             goods = 'bisect(good)::'    # Pruned good csets
             bads  = '::bisect(bad)'     # Pruned bad csets
         else:
             # Goods are topologically before bads
             goods = '::bisect(good)'    # Pruned good csets
             bads  = 'bisect(bad)::'     # Pruned bad csets
 
         # 'pruned' is all csets whose fate is already known: good, bad, skip
         skips = 'bisect(skip)'                 # Pruned skipped csets
         pruned = '( (%s) | (%s) | (%s) )' % (goods, bads, skips)
 
         # 'untested' is all cset that are- in 'range', but not in 'pruned'
         untested = '( (%s) - (%s) )' % (range, pruned)
 
         # 'ignored' is all csets that were not used during the bisection
         # due to DAG topology, but may however have had an impact.
         # E.g., a branch merged between bads and goods, but whose branch-
         # point is out-side of the range.
         iba = '::bisect(bad) - ::bisect(good)'  # Ignored bads' ancestors
         iga = '::bisect(good) - ::bisect(bad)'  # Ignored goods' ancestors
         ignored = '( ( (%s) | (%s) ) - (%s) )' % (iba, iga, range)
 
         if status == 'range':
             return repo.revs(range)
         elif status == 'pruned':
             return repo.revs(pruned)
         elif status == 'untested':
             return repo.revs(untested)
         elif status == 'ignored':
             return repo.revs(ignored)
         elif status == "goods":
             return repo.revs(goods)
         elif status == "bads":
             return repo.revs(bads)
         else:
             raise error.ParseError(_('invalid bisect state'))
 
 def label(repo, node):
     rev = repo.changelog.rev(node)
 
     # Try explicit sets
     if rev in get(repo, 'good'):
         # i18n: bisect changeset status
         return _('good')
     if rev in get(repo, 'bad'):
         # i18n: bisect changeset status
         return _('bad')
     if rev in get(repo, 'skip'):
         # i18n: bisect changeset status
         return _('skipped')
     if rev in get(repo, 'untested') or rev in get(repo, 'current'):
         # i18n: bisect changeset status
         return _('untested')
     if rev in get(repo, 'ignored'):
         # i18n: bisect changeset status
         return _('ignored')
 
     # Try implicit sets
     if rev in get(repo, 'goods'):
         # i18n: bisect changeset status
         return _('good (implicit)')
     if rev in get(repo, 'bads'):
         # i18n: bisect changeset status
         return _('bad (implicit)')
 
     return None
 
 def shortlabel(label):
     if label:
         return label[0].upper()
 
     return None

tests/test-bisect.t

@@ -1,510 +1,565
   $ hg init
 
 
 committing changes
 
   $ count=0
   $ echo > a
   $ while test $count -lt 32 ; do
   >     echo 'a' >> a
   >     test $count -eq 0 && hg add
   >     hg ci -m "msg $count" -d "$count 0"
   >     count=`expr $count + 1`
   > done
   adding a
 
 
   $ hg log
   changeset:   31:58c80a7c8a40
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:31 1970 +0000
   summary:     msg 31
   
   changeset:   30:ed2d2f24b11c
   user:        test
   date:        Thu Jan 01 00:00:30 1970 +0000
   summary:     msg 30
   
   changeset:   29:b5bd63375ab9
   user:        test
   date:        Thu Jan 01 00:00:29 1970 +0000
   summary:     msg 29
   
   changeset:   28:8e0c2264c8af
   user:        test
   date:        Thu Jan 01 00:00:28 1970 +0000
   summary:     msg 28
   
   changeset:   27:288867a866e9
   user:        test
   date:        Thu Jan 01 00:00:27 1970 +0000
   summary:     msg 27
   
   changeset:   26:3efc6fd51aeb
   user:        test
   date:        Thu Jan 01 00:00:26 1970 +0000
   summary:     msg 26
   
   changeset:   25:02a84173a97a
   user:        test
   date:        Thu Jan 01 00:00:25 1970 +0000
   summary:     msg 25
   
   changeset:   24:10e0acd3809e
   user:        test
   date:        Thu Jan 01 00:00:24 1970 +0000
   summary:     msg 24
   
   changeset:   23:5ec79163bff4
   user:        test
   date:        Thu Jan 01 00:00:23 1970 +0000
   summary:     msg 23
   
   changeset:   22:06c7993750ce
   user:        test
   date:        Thu Jan 01 00:00:22 1970 +0000
   summary:     msg 22
   
   changeset:   21:e5db6aa3fe2a
   user:        test
   date:        Thu Jan 01 00:00:21 1970 +0000
   summary:     msg 21
   
   changeset:   20:7128fb4fdbc9
   user:        test
   date:        Thu Jan 01 00:00:20 1970 +0000
   summary:     msg 20
   
   changeset:   19:52798545b482
   user:        test
   date:        Thu Jan 01 00:00:19 1970 +0000
   summary:     msg 19
   
   changeset:   18:86977a90077e
   user:        test
   date:        Thu Jan 01 00:00:18 1970 +0000
   summary:     msg 18
   
   changeset:   17:03515f4a9080
   user:        test
   date:        Thu Jan 01 00:00:17 1970 +0000
   summary:     msg 17
   
   changeset:   16:a2e6ea4973e9
   user:        test
   date:        Thu Jan 01 00:00:16 1970 +0000
   summary:     msg 16
   
   changeset:   15:e7fa0811edb0
   user:        test
   date:        Thu Jan 01 00:00:15 1970 +0000
   summary:     msg 15
   
   changeset:   14:ce8f0998e922
   user:        test
   date:        Thu Jan 01 00:00:14 1970 +0000
   summary:     msg 14
   
   changeset:   13:9d7d07bc967c
   user:        test
   date:        Thu Jan 01 00:00:13 1970 +0000
   summary:     msg 13
   
   changeset:   12:1941b52820a5
   user:        test
   date:        Thu Jan 01 00:00:12 1970 +0000
   summary:     msg 12
   
   changeset:   11:7b4cd9578619
   user:        test
   date:        Thu Jan 01 00:00:11 1970 +0000
   summary:     msg 11
   
   changeset:   10:7c5eff49a6b6
   user:        test
   date:        Thu Jan 01 00:00:10 1970 +0000
   summary:     msg 10
   
   changeset:   9:eb44510ef29a
   user:        test
   date:        Thu Jan 01 00:00:09 1970 +0000
   summary:     msg 9
   
   changeset:   8:453eb4dba229
   user:        test
   date:        Thu Jan 01 00:00:08 1970 +0000
   summary:     msg 8
   
   changeset:   7:03750880c6b5
   user:        test
   date:        Thu Jan 01 00:00:07 1970 +0000
   summary:     msg 7
   
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
   changeset:   5:7874a09ea728
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     msg 5
   
   changeset:   4:9b2ba8336a65
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   summary:     msg 4
   
   changeset:   3:b53bea5e2fcb
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     msg 3
   
   changeset:   2:db07c04beaca
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     msg 2
   
   changeset:   1:5cd978ea5149
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     msg 1
   
   changeset:   0:b99c7b9c8e11
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     msg 0
   
 
   $ hg up -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 bisect test
 
   $ hg bisect -r
   $ hg bisect -b
   $ hg bisect -g 1
   Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 23:5ec79163bff4 (15 changesets remaining, ~3 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 skip
 
   $ hg bisect -s
   Testing changeset 24:10e0acd3809e (15 changesets remaining, ~3 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 27:288867a866e9 (7 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 29:b5bd63375ab9 (4 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -b
   Testing changeset 28:8e0c2264c8af (2 changesets remaining, ~1 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   The first bad revision is:
   changeset:   29:b5bd63375ab9
   user:        test
   date:        Thu Jan 01 00:00:29 1970 +0000
   summary:     msg 29
   
 
 mark revsets instead of single revs
 
   $ hg bisect -r
   $ hg bisect -b "0::3"
   $ hg bisect -s "13::16"
   $ hg bisect -g "26::tip"
   Testing changeset 12:1941b52820a5 (23 changesets remaining, ~4 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat .hg/bisect.state
   bad b99c7b9c8e11558adef3fad9af211c58d46f325b
   bad 5cd978ea51499179507ee7b6f340d2dbaa401185
   bad db07c04beaca44cf24832541e7f4a2346a95275b
   bad b53bea5e2fcb30d3e00bd3409507a5659ce0fd8b
   current 1941b52820a544549596820a8ae006842b0e2c64
   good 3efc6fd51aeb8594398044c6c846ca59ae021203
   good 288867a866e9adb7a29880b66936c874b80f4651
   good 8e0c2264c8af790daf3585ada0669d93dee09c83
   good b5bd63375ab9a290419f2024b7f4ee9ea7ce90a8
   good ed2d2f24b11c368fa8aa0da9f4e1db580abade59
   good 58c80a7c8a4025a94cedaf7b4a4e3124e8909a96
   skip 9d7d07bc967ca98ad0600c24953fd289ad5fa991
   skip ce8f0998e922c179e80819d5066fbe46e2998784
   skip e7fa0811edb063f6319531f0d0a865882138e180
   skip a2e6ea4973e9196ddd3386493b0c214b41fd97d3
 
 bisect reverse test
 
   $ hg bisect -r
   $ hg bisect -b null
   $ hg bisect -g tip
   Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 7:03750880c6b5 (16 changesets remaining, ~4 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 skip
 
   $ hg bisect -s
   Testing changeset 6:a3d5c6fdf0d3 (16 changesets remaining, ~4 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 2:db07c04beaca (7 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   Testing changeset 0:b99c7b9c8e11 (3 changesets remaining, ~1 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -b
   Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   The first good revision is:
   changeset:   1:5cd978ea5149
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     msg 1
   
 
   $ hg bisect -r
   $ hg bisect -g tip
   $ hg bisect -b tip
   abort: starting revisions are not directly related
   [255]
 
   $ hg bisect -r
   $ hg bisect -g null
   $ hg bisect -bU tip
   Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
   $ hg id
   5cd978ea5149
 
 
 Issue1228: hg bisect crashes when you skip the last rev in bisection
 Issue1182: hg bisect exception
 
   $ hg bisect -r
   $ hg bisect -b 4
   $ hg bisect -g 0
   Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 3:b53bea5e2fcb (4 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Due to skipped revisions, the first bad revision could be any of:
   changeset:   1:5cd978ea5149
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     msg 1
   
   changeset:   2:db07c04beaca
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     msg 2
   
   changeset:   3:b53bea5e2fcb
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     msg 3
   
   changeset:   4:9b2ba8336a65
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   summary:     msg 4
   
 
 
 reproduce non converging bisect, issue1182
 
   $ hg bisect -r
   $ hg bisect -g 0
   $ hg bisect -b 2
   Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Due to skipped revisions, the first bad revision could be any of:
   changeset:   1:5cd978ea5149
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     msg 1
   
   changeset:   2:db07c04beaca
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     msg 2
   
 
 
 test no action
 
   $ hg bisect -r
   $ hg bisect
   abort: cannot bisect (no known good revisions)
   [255]
 
 
 reproduce AssertionError, issue1445
 
   $ hg bisect -r
   $ hg bisect -b 6
   $ hg bisect -g 0
   Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -s
   Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect -g
   The first bad revision is:
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
   $ hg log -r "bisect(good)"
   changeset:   0:b99c7b9c8e11
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     msg 0
   
   changeset:   5:7874a09ea728
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     msg 5
   
   $ hg log -r "bisect(bad)"
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
   $ hg log -r "bisect(current)"
   changeset:   5:7874a09ea728
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     msg 5
   
   $ hg log -r "bisect(skip)"
   changeset:   1:5cd978ea5149
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     msg 1
   
   changeset:   2:db07c04beaca
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     msg 2
   
   changeset:   3:b53bea5e2fcb
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     msg 3
   
   changeset:   4:9b2ba8336a65
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   summary:     msg 4
   
 
 test legacy bisected() keyword
 
   $ hg log -r "bisected(bad)"
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
 
   $ set +e
 
 test invalid command
 assuming that the shell returns 127 if command not found ...
 
   $ hg bisect -r
   $ hg bisect --command 'exit 127'
   abort: failed to execute exit 127
   [255]
 
 
 test bisecting command
 
   $ cat > script.py <<EOF
   > #!/usr/bin/env python
   > import sys
   > from mercurial import ui, hg
   > repo = hg.repository(ui.ui(), '.')
   > if repo['.'].rev() < 6:
   >     sys.exit(1)
   > EOF
   $ chmod +x script.py
   $ hg bisect -r
   $ hg bisect --good tip
   $ hg bisect --bad 0
   Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bisect --command "python \"$TESTTMP/script.py\" and some parameters"
   changeset 15:e7fa0811edb0: good
   changeset 7:03750880c6b5: good
   changeset 3:b53bea5e2fcb: bad
   changeset 5:7874a09ea728: bad
   changeset 6:a3d5c6fdf0d3: good
   The first good revision is:
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
 
 
 test bisecting via a command without updating the working dir, and
 ensure that the bisect state file is updated before running a test
 command
 
   $ hg update null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cat > script.sh <<'EOF'
   > #!/bin/sh
   > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127)
   > current="`hg log -r \"bisect(current)\" --template {node}`"
   > test "$current" = "$HG_NODE" || (echo current is bad: $current; exit 127)
   > rev="`hg log -r $HG_NODE --template {rev}`"
   > test "$rev" -ge 6
   > EOF
   $ chmod +x script.sh
   $ hg bisect -r
   $ hg bisect --good tip --noupdate
   $ hg bisect --bad 0 --noupdate
   Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests)
   $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" --noupdate
   changeset 15:e7fa0811edb0: good
   changeset 7:03750880c6b5: good
   changeset 3:b53bea5e2fcb: bad
   changeset 5:7874a09ea728: bad
   changeset 6:a3d5c6fdf0d3: good
   The first good revision is:
   changeset:   6:a3d5c6fdf0d3
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     msg 6
   
 
 ensure that we still don't have a working dir
 
   $ hg parents
+
+
+Check that bisect does not break on obsolete changesets
+=========================================================
+
+  $ cat > ${TESTTMP}/obs.py << EOF
+  > import mercurial.obsolete
+  > mercurial.obsolete._enabled = True
+  > EOF
+  $ echo '[extensions]' >> $HGRCPATH
+  $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
+
+tip is obsolete
+---------------------
+
+  $ hg debugobsolete `hg id --debug -i -r tip`
+  $ hg bisect --reset
+  $ hg bisect --good 15
+  $ hg bisect --bad 30
+  Testing changeset 22:06c7993750ce (15 changesets remaining, ~3 tests)
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg bisect --command true
+  changeset 22:06c7993750ce: good
+  changeset 26:3efc6fd51aeb: good
+  changeset 28:8e0c2264c8af: good
+  changeset 29:b5bd63375ab9: good
+  The first bad revision is:
+  changeset:   30:ed2d2f24b11c
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:30 1970 +0000
+  summary:     msg 30
+  
+
+Changeset in the bad:good range is obsolete
+---------------------------------------------
+
+  $ hg up 30
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo 'a' >> a
+  $ hg ci -m "msg 32" -d "32 0"
+  $ hg bisect --reset
+  $ hg bisect --good .
+  $ hg bisect --bad 25
+  Testing changeset 28:8e0c2264c8af (6 changesets remaining, ~2 tests)
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg bisect --command true
+  changeset 28:8e0c2264c8af: good
+  changeset 26:3efc6fd51aeb: good
+  The first good revision is:
+  changeset:   26:3efc6fd51aeb
+  user:        test
+  date:        Thu Jan 01 00:00:26 1970 +0000
+  summary:     msg 26
+