Show More
@@ -31,8 +31,16 b' def bisect(changelog, state):' | |||||
31 | # only the earliest bad revision matters |
|
31 | # only the earliest bad revision matters | |
32 | badrev = min([changelog.rev(n) for n in bad]) |
|
32 | badrev = min([changelog.rev(n) for n in bad]) | |
33 | goodrevs = [changelog.rev(n) for n in good] |
|
33 | goodrevs = [changelog.rev(n) for n in good] | |
34 | # build ancestors array |
|
34 | goodrev = min(goodrevs) | |
35 | ancestors = [[]] * (len(changelog) + 1) # an extra for [-1] |
|
35 | # build visit array | |
|
36 | ancestors = [None] * (len(changelog) + 1) # an extra for [-1] | |||
|
37 | ||||
|
38 | # set nodes descended from goodrev | |||
|
39 | ancestors[goodrev] = [] | |||
|
40 | for rev in xrange(goodrev + 1, len(changelog)): | |||
|
41 | for prev in clparents(rev): | |||
|
42 | if ancestors[prev] == []: | |||
|
43 | ancestors[rev] = [] | |||
36 |
|
44 | |||
37 | # clear good revs from array |
|
45 | # clear good revs from array | |
38 | for node in goodrevs: |
|
46 | for node in goodrevs: |
@@ -201,12 +201,12 b' date: Thu Jan 01 00:00:15 1970 +0' | |||||
201 | summary: merge 10,13 |
|
201 | summary: merge 10,13 | |
202 |
|
202 | |||
203 | % complex bisect test 4 |
|
203 | % complex bisect test 4 | |
204 |
Testing changeset 1 |
|
204 | Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) | |
205 |
|
|
205 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
206 |
Testing changeset 1 |
|
206 | Testing changeset 10:429fcd26f52d (5 changesets remaining, ~2 tests) | |
207 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
207 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
208 | Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) |
|
208 | Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) | |
209 |
|
|
209 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
210 | Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests) |
|
210 | Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests) | |
211 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
211 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
212 | Due to skipped revisions, the first good revision could be any of: |
|
212 | Due to skipped revisions, the first good revision could be any of: |
General Comments 0
You need to be logged in to leave comments.
Login now