This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1497

hbisect: pass repo into hbisect.bisect
ClosedPublic

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

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGfd8b6b183073: hbisect: pass repo into hbisect.bisect
Summary

Pass repo into the bisect function to get more flexibility in what we can call.
This will allow us to use revsets to rewrite parts of the ancestor and children
calculation in later patches.

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

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 rHGfd8b6b183073: hbisect: pass repo into hbisect.bisect (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/commands.py (4 lines)
Mmercurial/hbisect.py (3 lines)

Diff 3856

mercurial/commands.py

raise error.Abort(_("%s killed") % command) raise error.Abort(_("%s killed") % command)
else: else:
transition = "bad" transition = "bad"
state[transition].append(node) state[transition].append(node)
ctx = repo[node] ctx = repo[node]
ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
hbisect.checkstate(state) hbisect.checkstate(state)
# bisect # bisect
nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) nodes, changesets, bgood = hbisect.bisect(repo, state)
# update to next check # update to next check
node = nodes[0] node = nodes[0]
mayupdate(repo, node, show_stats=False) mayupdate(repo, node, show_stats=False)
finally: finally:
state['current'] = [node] state['current'] = [node]
hbisect.save_state(repo, state) hbisect.save_state(repo, state)
hbisect.printresult(ui, repo, state, displayer, nodes, bgood) hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
return return
hbisect.checkstate(state) hbisect.checkstate(state)
# actually bisect # actually bisect
nodes, changesets, good = hbisect.bisect(repo.changelog, state) nodes, changesets, good = hbisect.bisect(repo, state)
if extend: if extend:
if not changesets: if not changesets:
extendnode = hbisect.extendrange(repo, state, nodes, good) extendnode = hbisect.extendrange(repo, state, nodes, good)
if extendnode is not None: if extendnode is not None:
ui.write(_("Extending search to changeset %d:%s\n") ui.write(_("Extending search to changeset %d:%s\n")
% (extendnode.rev(), extendnode)) % (extendnode.rev(), extendnode))
state['current'] = [extendnode.node()] state['current'] = [extendnode.node()]
hbisect.save_state(repo, state) hbisect.save_state(repo, state)

mercurial/hbisect.py

from .node import ( from .node import (
hex, hex,
short, short,
) )
from . import ( from . import (
error, error,
) )
def bisect(changelog, state): def bisect(repo, state):
"""find the next node (if any) for testing during a bisect search. """find the next node (if any) for testing during a bisect search.
returns a (nodes, number, good) tuple. returns a (nodes, number, good) tuple.
'nodes' is the final result of the bisect if 'number' is 0. 'nodes' is the final result of the bisect if 'number' is 0.
Otherwise 'number' indicates the remaining possible candidates for Otherwise 'number' indicates the remaining possible candidates for
the search and 'nodes' contains the next bisect target. the search and 'nodes' contains the next bisect target.
'good' is True if bisect is searching for a first good changeset, False 'good' is True if bisect is searching for a first good changeset, False
if searching for a first bad one. if searching for a first bad one.
""" """
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 # 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] goodrevs = [changelog.rev(n) for n in good]
goodrev = min(goodrevs) goodrev = min(goodrevs)