This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9372

bisect: refactor to work on a list of revspecs
ClosedPublic

Authored by SimonSapin on Nov 23 2020, 12:17 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc3d0b3c29ec4: bisect: refactor to work on a list of revspecs
Summary

This will allow adding a --rev flag that can be passed more than once.

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

SimonSapin created this revision.Nov 23 2020, 12:17 PM
Alphare accepted this revision.Nov 24 2020, 6:03 AM
mharbison72 added a subscriber: mharbison72.Nov 25 2020, 12:31 AM
mharbison72 added inline comments.
mercurial/commands.py
1085

Should this raise above when the lookup is first done, before it potentially saves state in if good or bad or skip around line 1053?

marmoute added a subscriber: marmoute.Nov 27 2020, 12:28 PM
marmoute added inline comments.
mercurial/commands.py
1085

This raise is here to match the revsingle behavior. So we did not raise anything earlier before and I don't think we need to raise it sooner now (or at lieast not in that topic).

pulkit added a subscriber: pulkit.Nov 29 2020, 2:23 PM
pulkit added inline comments.
mercurial/commands.py
1085

I agree with both @mharbison72 and @marmoute here. @SimonSapin since you are here editing this code, can you make sure we do this check sooner and send a followup if possible?

pulkit accepted this revision.Nov 29 2020, 2:23 PM
This revision is now accepted and ready to land.Nov 29 2020, 2:23 PM
SimonSapin added a commit: rHGc3d0b3c29ec4: bisect: refactor to work on a list of revspecs.Nov 29 2020, 2:56 PM
Closed by commit rHGc3d0b3c29ec4: bisect: refactor to work on a list of revspecs (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (27 lines)

Diff 23863

mercurial/commands.py

(b'U', b'noupdate', False, _(b'do not update to target')), (b'U', b'noupdate', False, _(b'do not update to target')),
], ],
_(b"[-gbsr] [-U] [-c CMD] [REV]"), _(b"[-gbsr] [-U] [-c CMD] [REV]"),
helpcategory=command.CATEGORY_CHANGE_NAVIGATION, helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
) )
def bisect( def bisect(
ui, ui,
repo, repo,
rev=None, positional_1=None,
extra=None, positional_2=None,
command=None, command=None,
reset=None, reset=None,
good=None, good=None,
bad=None, bad=None,
skip=None, skip=None,
extend=None, extend=None,
noupdate=None, noupdate=None,
): ):
- you can even get a nice graph:: - you can even get a nice graph::
hg log --graph -r "bisect(range)" hg log --graph -r "bisect(range)"
See :hg:`help revisions.bisect` for more about the `bisect()` predicate. See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
Returns 0 on success. Returns 0 on success.
""" """
rev = []
# backward compatibility # backward compatibility
if rev in (b"good", b"bad", b"reset", b"init"): if positional_1 in (b"good", b"bad", b"reset", b"init"):
ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n")) ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
cmd, rev, extra = rev, extra, None cmd = positional_1
rev.append(positional_2)
if cmd == b"good": if cmd == b"good":
good = True good = True
elif cmd == b"bad": elif cmd == b"bad":
bad = True bad = True
else: else:
reset = True reset = True
elif extra: elif positional_2:
raise error.InputError(_(b'incompatible arguments')) raise error.InputError(_(b'incompatible arguments'))
elif positional_1 is not None:
rev.append(positional_1)
incompatibles = { incompatibles = {
b'--bad': bad, b'--bad': bad,
b'--command': bool(command), b'--command': bool(command),
b'--extend': extend, b'--extend': extend,
b'--good': good, b'--good': good,
b'--reset': reset, b'--reset': reset,
b'--skip': skip, b'--skip': skip,
} }
enabled = [x for x in incompatibles if incompatibles[x]] enabled = [x for x in incompatibles if incompatibles[x]]
if len(enabled) > 1: if len(enabled) > 1:
raise error.InputError( raise error.InputError(
_(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2]) _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
) )
if reset: if reset:
hbisect.resetstate(repo) hbisect.resetstate(repo)
return return
state = hbisect.load_state(repo) state = hbisect.load_state(repo)
# update state
if good or bad or skip:
if rev: if rev:
nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])] nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
else: else:
nodes = [repo.lookup(b'.')] nodes = [repo.lookup(b'.')]
# update state
if good or bad or skip:
if good: if good:
state[b'good'] += nodes state[b'good'] += nodes
elif bad: elif bad:
state[b'bad'] += nodes state[b'bad'] += nodes
elif skip: elif skip:
state[b'skip'] += nodes state[b'skip'] += nodes
hbisect.save_state(repo, state) hbisect.save_state(repo, state)
if not (state[b'good'] and state[b'bad']): if not (state[b'good'] and state[b'bad']):
b'start a new bisect to fix' b'start a new bisect to fix'
) )
) )
else: else:
node, p2 = repo.dirstate.parents() node, p2 = repo.dirstate.parents()
if p2 != nullid: if p2 != nullid:
raise error.StateError(_(b'current bisect revision is a merge')) raise error.StateError(_(b'current bisect revision is a merge'))
if rev: if rev:
node = repo[scmutil.revsingle(repo, rev, node)].node() if not nodes:
raise error.Abort(_(b'empty revision set'))
mharbison72Unsubmitted
Not Done

Should this raise above when the lookup is first done, before it potentially saves state in if good or bad or skip around line 1053?

mharbison72: Should this raise above when the lookup is first done, before it potentially saves state in `if…
marmouteUnsubmitted
Not Done

This raise is here to match the revsingle behavior. So we did not raise anything earlier before and I don't think we need to raise it sooner now (or at lieast not in that topic).

marmoute: This raise is here to match the `revsingle` behavior. So we did not raise anything earlier…
pulkitUnsubmitted
Not Done

I agree with both @mharbison72 and @marmoute here. @SimonSapin since you are here editing this code, can you make sure we do this check sooner and send a followup if possible?

pulkit: I agree with both @mharbison72 and @marmoute here. @SimonSapin since you are here editing…
node = repo[nodes.last()].node()
with hbisect.restore_state(repo, state, node): with hbisect.restore_state(repo, state, node):
while changesets: while changesets:
# update state # update state
state[b'current'] = [node] state[b'current'] = [node]
hbisect.save_state(repo, state) hbisect.save_state(repo, state)
status = ui.system( status = ui.system(
command, command,
environ={b'HG_NODE': hex(node)}, environ={b'HG_NODE': hex(node)},