This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6551

statecheck: added support for cmdutil.afterresolvedstates
ClosedPublic

Authored by taapas1128 on Jun 20 2019, 2:12 AM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG0231032729c4: statecheck: added support for cmdutil.afterresolvedstates
Summary

This removes afterresolvedstates from cmdutil and adds
support for it in _statecheck class.

A new flag continueflag is added to the class to check whether an
operation supports --continue option or not.

Tests remain unchanged.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jun 20 2019, 2:12 AM
taapas1128 retitled this revision from state: moved cmdutil.afterresolvedstates to statemod to statecheck: added support for cmdutil.afterresolvedstates.Jun 24 2019, 5:38 AM
taapas1128 edited the summary of this revision. (Show Details)
taapas1128 added a child revision: D6557: relnotes: added description about statemod._statecheck.
taapas1128 updated this revision to Diff 15644.
taapas1128 updated this revision to Diff 15645.Jun 24 2019, 5:43 AM
taapas1128 added a commit: rHG0231032729c4: statecheck: added support for cmdutil.afterresolvedstates.Jun 27 2019, 1:02 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG0231032729c4: statecheck: added support for cmdutil.afterresolvedstates (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added inline comments.Jun 27 2019, 1:02 PM
mercurial/state.py
135

I'll move this up two lines in flight so it's consistent with the order above

martinvonz added inline comments.Jun 27 2019, 1:03 PM
mercurial/state.py
135

Oh, it still won't be consistent... Can you send a follow-up to reorder these assignments to be consistent?

taapas1128 added inline comments.Jun 27 2019, 3:39 PM
mercurial/state.py
135

sure.

taapas1128 added inline comments.Jun 27 2019, 5:49 PM
mercurial/state.py
135

resolved in D6583

av6 added a subscriber: av6.Jul 2 2019, 9:34 PM
av6 added inline comments.
mercurial/cmdutil.py
3260–3261

Now that afterresolvedstates has been removed, you need to update this docstring.

3264

Here too.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (2 lines)
Mhgext/rebase.py (2 lines)
Mhgext/shelve.py (2 lines)
Mmercurial/cmdutil.py (27 lines)
Mmercurial/state.py (23 lines)

Diff 15611

hgext/histedit.py

# i18n: column positioning for "hg summary" # i18n: column positioning for "hg summary"
ui.write(_('hist: %s (histedit --continue)\n') % ui.write(_('hist: %s (histedit --continue)\n') %
(ui.label(_('%d remaining'), 'histedit.remaining') % (ui.label(_('%d remaining'), 'histedit.remaining') %
len(state.actions))) len(state.actions)))
def extsetup(ui): def extsetup(ui):
cmdutil.summaryhooks.add('histedit', summaryhook) cmdutil.summaryhooks.add('histedit', summaryhook)
statemod.addunfinished('histedit', fname='histedit-state', allowcommit=True) statemod.addunfinished('histedit', fname='histedit-state', allowcommit=True)
cmdutil.afterresolvedstates.append( statemod.afterresolvedstates.append(
['histedit-state', _('hg histedit --continue')]) ['histedit-state', _('hg histedit --continue')])

hgext/rebase.py

#Replace pull with a decorator to provide --rebase option #Replace pull with a decorator to provide --rebase option
entry = extensions.wrapcommand(commands.table, 'pull', pullrebase) entry = extensions.wrapcommand(commands.table, 'pull', pullrebase)
entry[1].append(('', 'rebase', None, entry[1].append(('', 'rebase', None,
_("rebase working directory to branch head"))) _("rebase working directory to branch head")))
entry[1].append(('t', 'tool', '', entry[1].append(('t', 'tool', '',
_("specify merge tool for rebase"))) _("specify merge tool for rebase")))
cmdutil.summaryhooks.add('rebase', summaryhook) cmdutil.summaryhooks.add('rebase', summaryhook)
statemod.addunfinished('rebase', fname='rebasestate', stopflag=True) statemod.addunfinished('rebase', fname='rebasestate', stopflag=True)
cmdutil.afterresolvedstates.append( statemod.afterresolvedstates.append(
['rebasestate', _('hg rebase --continue')]) ['rebasestate', _('hg rebase --continue')])

hgext/shelve.py

else: else:
return createcmd(ui, repo, pats, opts) return createcmd(ui, repo, pats, opts)
def extsetup(ui): def extsetup(ui):
statemod.addunfinished( statemod.addunfinished(
'unshelve', fname=shelvedstate._filename, 'unshelve', fname=shelvedstate._filename,
cmdmsg=_('unshelve already in progress') cmdmsg=_('unshelve already in progress')
) )
cmdutil.afterresolvedstates.append( statemod.afterresolvedstates.append(
[shelvedstate._filename, _('hg unshelve --continue')]) [shelvedstate._filename, _('hg unshelve --continue')])

mercurial/cmdutil.py

# #
# functions should return tuple of booleans below, if 'changes' is None: # functions should return tuple of booleans below, if 'changes' is None:
# (whether-incomings-are-needed, whether-outgoings-are-needed) # (whether-incomings-are-needed, whether-outgoings-are-needed)
# #
# otherwise, 'changes' is a tuple of tuples below: # otherwise, 'changes' is a tuple of tuples below:
# - (sourceurl, sourcebranch, sourcepeer, incoming) # - (sourceurl, sourcebranch, sourcepeer, incoming)
# - (desturl, destbranch, destpeer, outgoing) # - (desturl, destbranch, destpeer, outgoing)
summaryremotehooks = util.hooks() summaryremotehooks = util.hooks()
afterresolvedstates = [
('graftstate',
_('hg graft --continue')),
]
def howtocontinue(repo):
'''Check for an unfinished operation and return the command to finish
it.
afterresolvedstates tuples define a .hg/{file} and the corresponding
command needed to finish it.
Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
a boolean.
'''
contmsg = _("continue: %s")
for f, msg in afterresolvedstates:
if repo.vfs.exists(f):
return contmsg % msg, True
if repo[None].dirty(missing=True, merge=False, branch=False):
return contmsg % _("hg commit"), False
return None, None
def checkafterresolved(repo): def checkafterresolved(repo):
av6Unsubmitted
Not Done

Now that afterresolvedstates has been removed, you need to update this docstring.

av6: Now that afterresolvedstates has been removed, you need to update this docstring.
'''Inform the user about the next action after completing hg resolve '''Inform the user about the next action after completing hg resolve
If there's a matching afterresolvedstates, howtocontinue will yield If there's a matching afterresolvedstates, howtocontinue will yield
av6Unsubmitted
Not Done

Here too.

av6: Here too.
repo.ui.warn as the reporter. repo.ui.warn as the reporter.
Otherwise, it will yield repo.ui.note. Otherwise, it will yield repo.ui.note.
''' '''
msg, warning = howtocontinue(repo) msg, warning = statemod.howtocontinue(repo)
if msg is not None: if msg is not None:
if warning: if warning:
repo.ui.warn("%s\n" % msg) repo.ui.warn("%s\n" % msg)
else: else:
repo.ui.note("%s\n" % msg) repo.ui.note("%s\n" % msg)
def wrongtooltocontinue(repo, task): def wrongtooltocontinue(repo, task):
'''Raise an abort suggesting how to properly continue if there is an '''Raise an abort suggesting how to properly continue if there is an
active task. active task.
Uses howtocontinue() to find the active task. Uses howtocontinue() to find the active task.
If there's no task (repo.ui.note for 'hg commit'), it does not offer If there's no task (repo.ui.note for 'hg commit'), it does not offer
a hint. a hint.
''' '''
after = howtocontinue(repo) after = statemod.howtocontinue(repo)
hint = None hint = None
if after[1]: if after[1]:
hint = after[0] hint = after[0]
raise error.Abort(_('no %s in progress') % task, hint=hint) raise error.Abort(_('no %s in progress') % task, hint=hint)

mercurial/state.py

self._fname = fname self._fname = fname
self._clearable = clearable self._clearable = clearable
self._allowcommit = allowcommit self._allowcommit = allowcommit
self._cmdhint = cmdhint self._cmdhint = cmdhint
self._statushint = statushint self._statushint = statushint
self._cmdmsg = cmdmsg self._cmdmsg = cmdmsg
self._stopflag = stopflag self._stopflag = stopflag
self._reportonly = reportonly self._reportonly = reportonly
martinvonzUnsubmitted
Not Done

I'll move this up two lines in flight so it's consistent with the order above

martinvonz: I'll move this up two lines in flight so it's consistent with the order above
martinvonzUnsubmitted
Not Done

Oh, it still won't be consistent... Can you send a follow-up to reorder these assignments to be consistent?

martinvonz: Oh, it still won't be consistent... Can you send a follow-up to reorder these assignments to be…
taapas1128AuthorUnsubmitted
Not Done

sure.

taapas1128: sure.
taapas1128AuthorUnsubmitted
Done

resolved in D6583

taapas1128: resolved in D6583
def statusmsg(self): def statusmsg(self):
"""returns the hint message corresponding to the command for """returns the hint message corresponding to the command for
hg status --verbose hg status --verbose
""" """
if not self._statushint: if not self._statushint:
hint = (_('To continue: hg %s --continue\n' hint = (_('To continue: hg %s --continue\n'
'To abort: hg %s --abort') % (self._opname, 'To abort: hg %s --abort') % (self._opname,
self._opname)) self._opname))
def getrepostate(repo): def getrepostate(repo):
# experimental config: commands.status.skipstates # experimental config: commands.status.skipstates
skip = set(repo.ui.configlist('commands', 'status.skipstates')) skip = set(repo.ui.configlist('commands', 'status.skipstates'))
for state in _unfinishedstates: for state in _unfinishedstates:
if state._opname in skip: if state._opname in skip:
continue continue
if state.isunfinished(repo): if state.isunfinished(repo):
return (state._opname, state.statusmsg()) return (state._opname, state.statusmsg())
afterresolvedstates = [
('graftstate',
_('hg graft --continue')),
]
def howtocontinue(repo):
'''Check for an unfinished operation and return the command to finish
it.
afterresolvedstates tuples define a .hg/{file} and the corresponding
command needed to finish it.
Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
a boolean.
'''
contmsg = _("continue: %s")
for f, msg in afterresolvedstates:
if repo.vfs.exists(f):
return contmsg % msg, True
if repo[None].dirty(missing=True, merge=False, branch=False):
return contmsg % _("hg commit"), False
return None, None