##// END OF EJS Templates
context: simplify parents code
context: simplify parents code

File last commit:

r6762:f67d1468 default
r6772:84b53eef default
Show More
hbisect.py
105 lines | 3.3 KiB | text/x-python | PythonLexer
Matt Mackall
bisect: make bisect a built-in command
r5775 # changelog bisection for mercurial
#
# Copyright 2007 Matt Mackall
# Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# 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, incorporated herein by reference.
from i18n import _
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 from node import short
import util
Matt Mackall
bisect: make bisect a built-in command
r5775
def bisect(changelog, state):
clparents = changelog.parentrevs
skip = dict.fromkeys([changelog.rev(n) for n in state['skip']])
Matt Mackall
bisect: handle search for bad to good transitions...
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]
# build ancestors array
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 ancestors = [[]] * (len(changelog) + 1) # an extra for [-1]
Matt Mackall
bisect: make bisect a built-in command
r5775
Matt Mackall
bisect: handle search for bad to good transitions...
r5776 # clear good revs from array
for node in goodrevs:
ancestors[node] = None
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 for rev in xrange(len(changelog), -1, -1):
Matt Mackall
bisect: handle search for bad to good transitions...
r5776 if ancestors[rev] is None:
for prev in clparents(rev):
ancestors[prev] = None
Matt Mackall
bisect: make bisect a built-in command
r5775
Matt Mackall
bisect: handle search for bad to good transitions...
r5776 if ancestors[badrev] is None:
Matt Mackall
bisect: improve tests...
r5777 return badrev, None
Matt Mackall
bisect: handle search for bad to good transitions...
r5776 return badrev, ancestors
good = 0
badrev, ancestors = buildancestors(state['bad'], state['good'])
if not ancestors: # looking for bad to good transition?
good = 1
badrev, ancestors = buildancestors(state['good'], state['bad'])
Matt Mackall
bisect: improve tests...
r5777 bad = changelog.node(badrev)
Matt Mackall
bisect: handle search for bad to good transitions...
r5776 if not ancestors: # now we're confused
Matt Mackall
bisect: make bisect a built-in command
r5775 raise util.Abort(_("Inconsistent state, %s:%s is good and bad")
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 % (badrev, short(bad)))
Matt Mackall
bisect: make bisect a built-in command
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)
# have we narrowed it down to one entry?
tot = len(candidates)
if tot == 1:
Matt Mackall
bisect: handle search for bad to good transitions...
r5776 return (bad, 0, good)
Matt Mackall
bisect: make bisect a built-in command
r5775 perfect = tot / 2
# find the best node to test
best_rev = None
best_len = -1
poison = {}
Matt Mackall
util: add sort helper
r6762 for rev in util.sort(candidates):
Matt Mackall
bisect: make bisect a built-in command
r5775 if rev in poison:
for c in children.get(rev, []):
poison[c] = True # poison children
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: # all downhill from here?
Dirkjan Ochtman
merge incorporation of graph into paper style
r6694 for c in children.get(rev, []):
poison[c] = True # poison children
continue
Matt Mackall
bisect: make bisect a built-in command
r5775
for c in children.get(rev, []):
if ancestors[c]:
ancestors[c] = dict.fromkeys(ancestors[c] + a).keys()
else:
ancestors[c] = a + [c]
assert best_rev is not None
best_node = changelog.node(best_rev)
Matt Mackall
bisect: handle search for bad to good transitions...
r5776 return (best_node, tot, good)