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
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

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
3303

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

3322

Here too.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (6 lines)
Mhgext/rebase.py (5 lines)
Mhgext/shelve.py (5 lines)
Mmercurial/cmdutil.py (13 lines)
Mmercurial/state.py (14 lines)

Diff 15685

hgext/histedit.py

if state.actions: if state.actions:
# 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( continueflag=True)
['histedit-state', _('hg histedit --continue')])

hgext/rebase.py

def uisetup(ui): def uisetup(ui):
#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( continueflag=True)
['rebasestate', _('hg rebase --continue')])

hgext/shelve.py

return listcmd(ui, repo, pats, opts) return listcmd(ui, repo, pats, opts)
elif checkopt('patch') or checkopt('stat'): elif checkopt('patch') or checkopt('stat'):
return patchcmds(ui, repo, pats, opts) return patchcmds(ui, repo, pats, opts)
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, continueflag=True,
cmdmsg=_('unshelve already in progress') cmdmsg=_('unshelve already in progress')
) )
cmdutil.afterresolvedstates.append(
[shelvedstate._filename, _('hg unshelve --continue')])

mercurial/cmdutil.py

raise error.Abort(state.msg(), hint=state.hint()) raise error.Abort(state.msg(), hint=state.hint())
for s in statemod._unfinishedstates: for s in statemod._unfinishedstates:
if s._opname == 'merge' or state._reportonly: if s._opname == 'merge' or state._reportonly:
continue continue
if s._clearable and s.isunfinished(repo): if s._clearable and s.isunfinished(repo):
util.unlink(repo.vfs.join(s._fname)) util.unlink(repo.vfs.join(s._fname))
afterresolvedstates = [
('graftstate',
_('hg graft --continue')),
]
def howtocontinue(repo): def howtocontinue(repo):
'''Check for an unfinished operation and return the command to finish '''Check for an unfinished operation and return the command to finish
it. it.
afterresolvedstates tuples define a .hg/{file} and the corresponding afterresolvedstates tuples define a .hg/{file} and the corresponding
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.
command needed to finish it. command needed to finish it.
Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
a boolean. a boolean.
''' '''
contmsg = _("continue: %s") contmsg = _("continue: %s")
for f, msg in afterresolvedstates: for state in statemod._unfinishedstates:
if repo.vfs.exists(f): if not state._continueflag:
return contmsg % msg, True continue
if state.isunfinished(repo):
return contmsg % state.continuemsg(), True
if repo[None].dirty(missing=True, merge=False, branch=False): if repo[None].dirty(missing=True, merge=False, branch=False):
return contmsg % _("hg commit"), False return contmsg % _("hg commit"), False
return None, None return None, None
def checkafterresolved(repo): def checkafterresolved(repo):
'''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 = 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)

mercurial/state.py

histedit, bisect, update etc and check whether such commands histedit, bisect, update etc and check whether such commands
are in an unfinished conditition or not and return appropriate message are in an unfinished conditition or not and return appropriate message
and hint. and hint.
It also has the ability to register and determine the states of any new It also has the ability to register and determine the states of any new
multistep operation or multistep command extension. multistep operation or multistep command extension.
""" """
def __init__(self, opname, fname, clearable=False, allowcommit=False, def __init__(self, opname, fname, clearable=False, allowcommit=False,
reportonly=False, stopflag=False, cmdmsg="", cmdhint="", reportonly=False, continueflag=False, stopflag=False ,
statushint=""): cmdmsg="", cmdhint="", statushint=""):
"""opname is the name the command or operation """opname is the name the command or operation
fname is the file name in which data should be stored in .hg directory. fname is the file name in which data should be stored in .hg directory.
It is None for merge command. It is None for merge command.
clearable boolean determines whether or not interrupted states can be clearable boolean determines whether or not interrupted states can be
cleared by running `hg update -C .` which in turn deletes the cleared by running `hg update -C .` which in turn deletes the
state file. state file.
allowcommit boolean decides whether commit is allowed during interrupted allowcommit boolean decides whether commit is allowed during interrupted
state or not. state or not.
reportonly flag is used for operations like bisect where we just reportonly flag is used for operations like bisect where we just
need to detect the operation using 'hg status --verbose' need to detect the operation using 'hg status --verbose'
continueflag is a boolean determines whether or not a command supports
`--continue` option or not.
stopflag is a boolean that determines whether or not a command supports stopflag is a boolean that determines whether or not a command supports
--stop flag --stop flag
cmdmsg is used to pass a different status message in case standard cmdmsg is used to pass a different status message in case standard
message of the format "abort: cmdname in progress" is not desired. message of the format "abort: cmdname in progress" is not desired.
cmdhint is used to pass a different hint message in case standard cmdhint is used to pass a different hint message in case standard
message of the format "To continue: hg cmdname --continue message of the format "To continue: hg cmdname --continue
To abort: hg cmdname --abort" is not desired. To abort: hg cmdname --abort" is not desired.
statushint is used to pass a different status message in case standard statushint is used to pass a different status message in case standard
message of the format ('To continue: hg cmdname --continue' message of the format ('To continue: hg cmdname --continue'
'To abort: hg cmdname --abort') is not desired 'To abort: hg cmdname --abort') is not desired
""" """
self._opname = opname self._opname = opname
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
self._continueflag = continueflag
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,
return self._cmdhint return self._cmdhint
def msg(self): def msg(self):
"""returns the status message corresponding to the command""" """returns the status message corresponding to the command"""
if not self._cmdmsg: if not self._cmdmsg:
return _('%s in progress') % (self._opname) return _('%s in progress') % (self._opname)
return self._cmdmsg return self._cmdmsg
def continuemsg(self):
""" returns appropriate continue message corresponding to command"""
return _('hg %s --continue') % (self._opname)
def isunfinished(self, repo): def isunfinished(self, repo):
"""determines whether a multi-step operation is in progress """determines whether a multi-step operation is in progress
or not or not
""" """
if self._opname == 'merge': if self._opname == 'merge':
return len(repo[None].parents()) > 1 return len(repo[None].parents()) > 1
else: else:
return repo.vfs.exists(self._fname) return repo.vfs.exists(self._fname)
# A list of statecheck objects for multistep operations like graft. # A list of statecheck objects for multistep operations like graft.
_unfinishedstates = [] _unfinishedstates = []
def addunfinished(opname, **kwargs): def addunfinished(opname, **kwargs):
"""this registers a new command or operation to unfinishedstates """this registers a new command or operation to unfinishedstates
""" """
statecheckobj = _statecheck(opname, **kwargs) statecheckobj = _statecheck(opname, **kwargs)
if opname == 'merge': if opname == 'merge':
_unfinishedstates.append(statecheckobj) _unfinishedstates.append(statecheckobj)
else: else:
_unfinishedstates.insert(0, statecheckobj) _unfinishedstates.insert(0, statecheckobj)
addunfinished( addunfinished(
'graft', fname='graftstate', clearable=True, stopflag=True, 'graft', fname='graftstate', clearable=True, stopflag=True,
cmdhint=_("use 'hg graft --continue' or 'hg graft --stop' to stop"), continueflag=True,
cmdhint=_("use 'hg graft --continue' or 'hg graft --stop' to stop")
) )
addunfinished( addunfinished(
'update', fname='updatestate', clearable=True, 'update', fname='updatestate', clearable=True,
cmdmsg=_('last update was interrupted'), cmdmsg=_('last update was interrupted'),
cmdhint=_("use 'hg update' to get a consistent checkout"), cmdhint=_("use 'hg update' to get a consistent checkout"),
statushint=_("To continue: hg update") statushint=_("To continue: hg update")
) )
addunfinished( addunfinished(