This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7430

bisect: replace try:/finally: by a "restore_state" context manager
ClosedPublic

Authored by dlax on Nov 15 2019, 5:13 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf37da59a36d9: bisect: replace try:/finally: by a "restore_state" context manager
Summary

This should help pytype to not consider "bgood" variable as NameError.
See https://phab.mercurial-scm.org/D7384 for context.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

dlax created this revision.Nov 15 2019, 5:13 AM
dlax added a commit: rHGf37da59a36d9: bisect: replace try:/finally: by a "restore_state" context manager.Nov 15 2019, 12:24 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf37da59a36d9: bisect: replace try:/finally: by a "restore_state" context manager (authored by dlax). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (5 lines)
Mmercurial/hbisect.py (10 lines)

Diff 18156

mercurial/commands.py

) )
) )
else: else:
node, p2 = repo.dirstate.parents() node, p2 = repo.dirstate.parents()
if p2 != nullid: if p2 != nullid:
raise error.Abort(_(b'current bisect revision is a merge')) raise error.Abort(_(b'current bisect revision is a merge'))
if rev: if rev:
node = repo[scmutil.revsingle(repo, rev, node)].node() node = repo[scmutil.revsingle(repo, rev, node)].node()
try: 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)},
blockedtag=b'bisect_check', blockedtag=b'bisect_check',
_(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition) _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
) )
hbisect.checkstate(state) hbisect.checkstate(state)
# bisect # bisect
nodes, changesets, bgood = hbisect.bisect(repo, 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:
state[b'current'] = [node]
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, state) nodes, changesets, good = hbisect.bisect(repo, state)
if extend: if extend:

mercurial/hbisect.py

# changelog bisection for mercurial # changelog bisection for mercurial
# #
# Copyright 2007 Matt Mackall # Copyright 2007 Matt Mackall
# Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org> # Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# #
# Inspired by git bisect, extension skeleton taken from mq.py. # Inspired by git bisect, extension skeleton taken from mq.py.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import contextlib
from .i18n import _ from .i18n import _
from .node import ( from .node import (
hex, hex,
short, short,
) )
from . import error from . import error
if state[b'good'] and state[b'bad']: if state[b'good'] and state[b'bad']:
return True return True
if not state[b'good']: if not state[b'good']:
raise error.Abort(_(b'cannot bisect (no known good revisions)')) raise error.Abort(_(b'cannot bisect (no known good revisions)'))
else: else:
raise error.Abort(_(b'cannot bisect (no known bad revisions)')) raise error.Abort(_(b'cannot bisect (no known bad revisions)'))
@contextlib.contextmanager
def restore_state(repo, state, node):
try:
yield
finally:
state[b'current'] = [node]
save_state(repo, state)
def get(repo, status): def get(repo, status):
""" """
Return a list of revision(s) that match the given status: Return a list of revision(s) that match the given status:
- ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip
- ``goods``, ``bads`` : csets topologically good/bad - ``goods``, ``bads`` : csets topologically good/bad
- ``range`` : csets taking part in the bisection - ``range`` : csets taking part in the bisection
- ``pruned`` : csets that are goods, bads or skipped - ``pruned`` : csets that are goods, bads or skipped