This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1498

hbisect: use a revset for ancestor calculation
ClosedPublic

Authored by dsp on Nov 23 2017, 5:24 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGec25c8275cfa: hbisect: use a revset for ancestor calculation
Summary

Since we have revsets we can be more concise in doing the ancestor calulcation.
Significant commits are all descendent of the topmost good commits.

Test Plan
python run-tests.py test-bisect*

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

dsp created this revision.Nov 23 2017, 5:24 PM
yuja accepted this revision.Nov 24 2017, 10:38 PM
This revision is now accepted and ready to land.Nov 24 2017, 10:38 PM
Closed by commit rHGec25c8275cfa: hbisect: use a revset for ancestor calculation (authored by dsp). · Explain WhyNov 24 2017, 11:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hbisect.py (23 lines)

Diff 3804

mercurial/hbisect.py

if searching for a first bad one. if searching for a first bad one.
""" """
changelog = repo.changelog changelog = repo.changelog
clparents = changelog.parentrevs clparents = changelog.parentrevs
skip = set([changelog.rev(n) for n in state['skip']]) skip = set([changelog.rev(n) for n in state['skip']])
def buildancestors(bad, good): def buildancestors(bad, good):
# only the earliest bad revision matters
badrev = min([changelog.rev(n) for n in bad]) badrev = min([changelog.rev(n) for n in bad])
goodrevs = [changelog.rev(n) for n in good] ancestors = [None] * (len(changelog) + 1)
goodrev = min(goodrevs) for rev in repo.revs("descendants(%ln) - ancestors(%ln)", good, good):
# 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 changelog.revs(goodrev + 1):
for prev in clparents(rev):
if ancestors[prev] == []:
ancestors[rev] = [] ancestors[rev] = []
# clear good revs from array
for rev in goodrevs:
ancestors[rev] = None
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: if ancestors[badrev] is None:
return badrev, None return badrev, None
return badrev, ancestors return badrev, ancestors
good = False good = False
badrev, ancestors = buildancestors(state['bad'], state['good']) badrev, ancestors = buildancestors(state['bad'], state['good'])
if not ancestors: # looking for bad to good transition? if not ancestors: # looking for bad to good transition?
good = True good = True