hbisect.py
155 lines
| 5.1 KiB
| text/x-python
|
PythonLexer
/ mercurial / hbisect.py
Matt Mackall
|
r5775 | # changelog bisection for mercurial | ||
# | ||||
# Copyright 2007 Matt Mackall | ||||
# Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org> | ||||
Martin Geisler
|
r8228 | # | ||
Matt Mackall
|
r5775 | # Inspired by git bisect, extension skeleton taken from mq.py. | ||
# | ||||
Martin Geisler
|
r8225 | # This software may be used and distributed according to the terms of the | ||
Matt Mackall
|
r10263 | # GNU General Public License version 2 or any later version. | ||
Matt Mackall
|
r5775 | |||
Alexander Solovyov
|
r7227 | import os | ||
Matt Mackall
|
r5775 | from i18n import _ | ||
Alexander Solovyov
|
r7227 | from node import short, hex | ||
Joel Rosdahl
|
r6217 | import util | ||
Matt Mackall
|
r5775 | |||
def bisect(changelog, state): | ||||
Bernhard Leiner
|
r6858 | """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. | ||||
""" | ||||
Matt Mackall
|
r5775 | clparents = changelog.parentrevs | ||
Martin Geisler
|
r8152 | skip = set([changelog.rev(n) for n in state['skip']]) | ||
Matt Mackall
|
r5775 | |||
Matt Mackall
|
r5776 | 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] | ||||
Matt Mackall
|
r9583 | goodrev = min(goodrevs) | ||
# build visit array | ||||
ancestors = [None] * (len(changelog) + 1) # an extra for [-1] | ||||
# set nodes descended from goodrev | ||||
ancestors[goodrev] = [] | ||||
for rev in xrange(goodrev + 1, len(changelog)): | ||||
for prev in clparents(rev): | ||||
if ancestors[prev] == []: | ||||
ancestors[rev] = [] | ||||
Matt Mackall
|
r5775 | |||
Matt Mackall
|
r5776 | # clear good revs from array | ||
for node in goodrevs: | ||||
ancestors[node] = None | ||||
Matt Mackall
|
r6750 | for rev in xrange(len(changelog), -1, -1): | ||
Matt Mackall
|
r5776 | if ancestors[rev] is None: | ||
for prev in clparents(rev): | ||||
ancestors[prev] = None | ||||
Matt Mackall
|
r5775 | |||
Matt Mackall
|
r5776 | if ancestors[badrev] is None: | ||
Matt Mackall
|
r5777 | return badrev, None | ||
Matt Mackall
|
r5776 | return badrev, ancestors | ||
Martin Geisler
|
r14215 | good = False | ||
Matt Mackall
|
r5776 | badrev, ancestors = buildancestors(state['bad'], state['good']) | ||
if not ancestors: # looking for bad to good transition? | ||||
Martin Geisler
|
r14215 | good = True | ||
Matt Mackall
|
r5776 | badrev, ancestors = buildancestors(state['good'], state['bad']) | ||
Matt Mackall
|
r5777 | bad = changelog.node(badrev) | ||
Matt Mackall
|
r5776 | if not ancestors: # now we're confused | ||
Matt Mackall
|
r12005 | if len(state['bad']) == 1 and len(state['good']) == 1: | ||
raise util.Abort(_("starting revisions are not directly related")) | ||||
Martin Geisler
|
r12067 | raise util.Abort(_("inconsistent state, %s:%s is good and bad") | ||
Joel Rosdahl
|
r6217 | % (badrev, short(bad))) | ||
Matt Mackall
|
r5775 | |||
# build children dict | ||||
children = {} | ||||
visit = [badrev] | ||||
candidates = [] | ||||
while visit: | ||||
rev = visit.pop(0) | ||||
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? | ||||
Bernhard Leiner
|
r6858 | # or have all other possible candidates besides 'bad' have been skipped? | ||
Matt Mackall
|
r5775 | tot = len(candidates) | ||
Bernhard Leiner
|
r6858 | 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) | ||||
Benoit Boissinot
|
r7902 | perfect = tot // 2 | ||
Matt Mackall
|
r5775 | |||
# find the best node to test | ||||
best_rev = None | ||||
best_len = -1 | ||||
Benoit Boissinot
|
r8463 | poison = set() | ||
Matt Mackall
|
r5775 | for rev in candidates: | ||
if rev in poison: | ||||
Martin Geisler
|
r8482 | # poison children | ||
poison.update(children.get(rev, [])) | ||||
Matt Mackall
|
r5775 | 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 | ||||
Bernhard Leiner
|
r7557 | if y < perfect and rev not in skip: # all downhill from here? | ||
Martin Geisler
|
r8482 | # poison children | ||
poison.update(children.get(rev, [])) | ||||
Matt Mackall
|
r5775 | continue | ||
for c in children.get(rev, []): | ||||
if ancestors[c]: | ||||
Martin Geisler
|
r8152 | ancestors[c] = list(set(ancestors[c] + a)) | ||
Matt Mackall
|
r5775 | else: | ||
ancestors[c] = a + [c] | ||||
assert best_rev is not None | ||||
best_node = changelog.node(best_rev) | ||||
Bernhard Leiner
|
r6858 | return ([best_node], tot, good) | ||
Alexander Solovyov
|
r7227 | |||
def load_state(repo): | ||||
state = {'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 state: | ||||
for node in state[kind]: | ||||
f.write("%s %s\n" % (kind, hex(node))) | ||||
f.rename() | ||||
finally: | ||||
Ronny Pfannschmidt
|
r8109 | wlock.release() | ||
Alexander Solovyov
|
r7227 | |||