This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6495

statecheck: added functionality for cmdutil.STATES
AbandonedPublic

Authored by taapas1128 on Jun 7 2019, 3:41 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This extends the statecheck class functionality by adding
functionality for cmdutil.STATES. After this STATES list will
not be required and hence is removed. statecheck class can now
deal with the functionalities of both APIs.

The work of STATES is taken by statemod.unfinishedstates which
is a list of the objects from statecheck class.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (60 lines)
Mmercurial/state.py (42 lines)
Mtests/test-graft.t (1 line)

Diff 15391

mercurial/cmdutil.py

%s %s
To mark files as resolved: hg resolve --mark FILE''') % mergeliststr To mark files as resolved: hg resolve --mark FILE''') % mergeliststr
else: else:
msg = _('No unresolved merge conflicts.') msg = _('No unresolved merge conflicts.')
return _commentlines(msg) return _commentlines(msg)
def _helpmessage(continuecmd, abortcmd):
msg = _('To continue: %s\n'
'To abort: %s') % (continuecmd, abortcmd)
return _commentlines(msg)
def _rebasemsg():
return _helpmessage('hg rebase --continue', 'hg rebase --abort')
def _histeditmsg():
return _helpmessage('hg histedit --continue', 'hg histedit --abort')
def _unshelvemsg():
return _helpmessage('hg unshelve --continue', 'hg unshelve --abort')
def _graftmsg():
return _helpmessage('hg graft --continue', 'hg graft --abort')
def _mergemsg():
return _helpmessage('hg commit', 'hg merge --abort')
def _bisectmsg():
msg = _('To mark the changeset good: hg bisect --good\n'
'To mark the changeset bad: hg bisect --bad\n'
'To abort: hg bisect --reset\n')
return _commentlines(msg)
def fileexistspredicate(filename):
return lambda repo: repo.vfs.exists(filename)
def _mergepredicate(repo):
return len(repo[None].parents()) > 1
STATES = (
# (state, predicate to detect states, helpful message function)
('histedit', fileexistspredicate('histedit-state'), _histeditmsg),
('bisect', fileexistspredicate('bisect.state'), _bisectmsg),
('graft', fileexistspredicate('graftstate'), _graftmsg),
('unshelve', fileexistspredicate('shelvedstate'), _unshelvemsg),
('rebase', fileexistspredicate('rebasestate'), _rebasemsg),
# The merge state is part of a list that will be iterated over.
# They need to be last because some of the other unfinished states may also
# be in a merge or update state (eg. rebase, histedit, graft, etc).
# We want those to have priority.
('merge', _mergepredicate, _mergemsg),
)
def _getrepostate(repo):
# experimental config: commands.status.skipstates
skip = set(repo.ui.configlist('commands', 'status.skipstates'))
for state, statedetectionpredicate, msgfn in STATES:
if state in skip:
continue
if statedetectionpredicate(repo):
return (state, statedetectionpredicate, msgfn)
def morestatus(repo, fm): def morestatus(repo, fm):
statetuple = _getrepostate(repo) statetuple = statemod.getrepostate(repo)
label = 'status.morestatus' label = 'status.morestatus'
if statetuple: if statetuple:
state, statedetectionpredicate, helpfulmsg = statetuple state, statedetectionpredicate, helpfulmsg = statetuple
statemsg = _('The repository is in an unfinished *%s* state.') % state statemsg = _('The repository is in an unfinished *%s* state.') % state
fm.plain('%s\n' % _commentlines(statemsg), label=label) fm.plain('%s\n' % _commentlines(statemsg), label=label)
conmsg = _conflictsmsg(repo) conmsg = _conflictsmsg(repo)
if conmsg: if conmsg:
fm.plain('%s\n' % conmsg, label=label) fm.plain('%s\n' % conmsg, label=label)
if helpfulmsg: if helpfulmsg:
helpmsg = helpfulmsg() fm.plain('%s\n' % _commentlines(helpfulmsg), label=label)
fm.plain('%s\n' % helpmsg, label=label)
def findpossible(cmd, table, strict=False): def findpossible(cmd, table, strict=False):
""" """
Return cmd -> (aliases, command table entry) Return cmd -> (aliases, command table entry)
for each matching command. for each matching command.
Return debug commands (or their aliases) only if no normal command matches. Return debug commands (or their aliases) only if no normal command matches.
""" """
choice = {} choice = {}

mercurial/state.py

msg = _('To mark the changeset good: hg bisect --good\n' msg = _('To mark the changeset good: hg bisect --good\n'
'To mark the changeset bad: hg bisect --bad\n' 'To mark the changeset bad: hg bisect --bad\n'
'To abort: hg bisect --reset\n') 'To abort: hg bisect --reset\n')
elif self.cmdname == 'update': elif self.cmdname == 'update':
msg = _("use 'hg update' to get a consistent checkout") msg = _("use 'hg update' to get a consistent checkout")
elif self.cmdname == 'transplant': elif self.cmdname == 'transplant':
msg = _('To continue: hg %s --continue\n' msg = _('To continue: hg %s --continue\n'
'To abort: hg update') % (self.cmdname) 'To abort: hg update') % (self.cmdname)
elif self.cmdname == 'merge':
msg = _('To continue: hg commit\n'
'To abort: hg %s --abort') % (self.cmdname)
else: else:
msg = (_('To continue: hg %s --continue\n' msg = (_('To continue: hg %s --continue\n'
'To abort: hg %s --abort') % (self.cmdname, 'To abort: hg %s --abort') % (self.cmdname,
self.cmdname)) self.cmdname))
if self.stopflag: if self.stopflag:
msg = msg + (_('\nTo stop: hg %s --stop') % msg = msg + (_('\nTo stop: hg %s --stop') %
(self.cmdname)) (self.cmdname))
return msg return msg
mergecheck flag helps in determining state specifically for merge mergecheck flag helps in determining state specifically for merge
""" """
if self.cmdname == 'merge' or mergecheck: if self.cmdname == 'merge' or mergecheck:
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)
unfinishedstates=[] unfinishedstates=[]
unfinishedstates.append(statecheck('graft','graftstate', clearable=True, unfinishedstates.append(statecheck('graft', 'graftstate', clearable=True,
allowcommit=False, stopflag=True)) allowcommit=False, stopflag=True))
unfinishedstates.append(statecheck('bisect', 'bisect.state', clearable=False,
allowcommit=True, stopflag=False))
unfinishedstates.append(statecheck('update', 'updatestate', clearable=True, unfinishedstates.append(statecheck('update', 'updatestate', clearable=True,
allowcommit=False, stopflag=False)) allowcommit=False, stopflag=False))
unfinishedstates.append(statecheck('merge', 'None', clearable=False,
allowcommit=False, stopflag=False))
def checkunfinished(repo, commit=False): def checkunfinished(repo, commit=False):
'''Look for an unfinished multistep operation, like graft, and abort '''Look for an unfinished multistep operation, like graft, and abort
if found. It's probably good to check this right before if found. It's probably good to check this right before
bailifchanged(). bailifchanged().
''' '''
# Check for non-clearable states first, so things like rebase will take # Check for non-clearable states first, so things like rebase will take
# precedence over update. # precedence over update.
for state in unfinishedstates: for state in unfinishedstates:
if state.clearable or (commit and state.allowcommit): if (state.clearable or (commit and state.allowcommit)
or state.cmdname == 'merge'or state.cmdname == 'bisect'):
continue continue
if state.isunfinished(repo): if state.isunfinished(repo):
raise error.Abort(state.msg(), hint=state.hint()) raise error.Abort(state.msg(), hint=state.hint())
for s in unfinishedstates: for s in unfinishedstates:
if not s.clearable or (commit and s.allowcommit): if (not s.clearable or (commit and s.allowcommit)
or s.cmdname == 'merge' or s.cmdname == 'bisect'):
continue continue
if s.isunfinished(repo): if s.isunfinished(repo):
raise error.Abort(s.msg(), hint=s.hint()) raise error.Abort(s.msg(), hint=s.hint())
def clearunfinished(repo): def clearunfinished(repo):
'''Check for unfinished operations (as above), and clear the ones '''Check for unfinished operations (as above), and clear the ones
that are clearable. that are clearable.
''' '''
for state in unfinishedstates: for state in unfinishedstates:
if (state.cmdname == 'merge' or state.cmdname == 'bisect'):
continue
if not state.clearable and state.isunfinished(repo): if not state.clearable and state.isunfinished(repo):
raise error.Abort(state.msg(), hint=state.hint()) raise error.Abort(state.msg(), hint=state.hint())
for s in unfinishedstates: for s in unfinishedstates:
if (state.cmdname == 'merge' or state.cmdname == 'bisect'):
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))
def getrepostate(repo):
# experimental config: commands.status.skipstates
skip = set(repo.ui.configlist('commands', 'status.skipstates'))
for state in unfinishedstates:
if (state.cmdname == 'merge' or state.cmdname == 'update' or
state.cmdname in skip):
continue
if state.isunfinished(repo):
return (state.cmdname, state.isunfinished(repo),
state.hint())
for s in unfinishedstates:
if s.cmdname in skip:
continue
if s.cmdname == 'update' and s.isunfinished(repo):
return (s.cmdname, s.isunfinished(repo),
s.hint())
if s.cmdname == 'merge' and s.isunfinished(repo):
return (s.cmdname, s.isunfinished(repo),
s.hint())

tests/test-graft.t

# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# e # e
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# To continue: hg graft --continue # To continue: hg graft --continue
# To abort: hg graft --abort # To abort: hg graft --abort
# To stop: hg graft --stop
Commit while interrupted should fail: Commit while interrupted should fail:
$ hg ci -m 'commit interrupted graft' $ hg ci -m 'commit interrupted graft'
abort: graft in progress abort: graft in progress
(To continue: hg graft --continue (To continue: hg graft --continue
To abort: hg graft --abort To abort: hg graft --abort