This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6502

state: moved cmdutil.STATES and utilities to state.py
ClosedPublic

Authored by taapas1128 on Jun 8 2019, 4:57 PM.

Details

Reviewers
pulkit
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG5bddd2244814: state: moved cmdutil.STATES and utilities to state.py
Summary

This commit moves cmdutil.STATES and adjoining functions to
state.py. The existing users are updated accordingly.

Tests remain unchanged.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jun 8 2019, 4:57 PM
martinvonz added a subscriber: martinvonz.Jun 8 2019, 6:15 PM
martinvonz added inline comments.
mercurial/state.py
126

Nit: This should be moved to the patch that introduced the bad formatting.

185

This feels a lot like morestatus functionality and should perhaps have been left in cmdutil.py.

taapas1128 updated this revision to Diff 15401.Jun 9 2019, 8:31 AM
taapas1128 updated this revision to Diff 15404.Jun 9 2019, 8:53 AM
taapas1128 added inline comments.Jun 9 2019, 8:58 AM
mercurial/state.py
185

morestatus functionality is left in cmdutil.py only the place where it checks for unfinished states that is _morestatus has been moved here.

185

_getrepostate not more status

taapas1128 updated this revision to Diff 15425.Jun 10 2019, 1:54 PM
taapas1128 updated this revision to Diff 15439.Jun 11 2019, 9:48 AM
taapas1128 updated this revision to Diff 15515.Jun 14 2019, 3:28 PM
pulkit accepted this revision as: pulkit.Jun 14 2019, 6:48 PM
taapas1128 updated this revision to Diff 15528.Jun 15 2019, 6:39 AM
taapas1128 updated this revision to Diff 15536.Jun 17 2019, 7:36 AM
taapas1128 updated this revision to Diff 15552.Jun 17 2019, 2:08 PM
martinvonz added inline comments.Jun 18 2019, 11:29 AM
mercurial/cmdutil.py
623

Should drop the _ from _getrepostate since it's no longer private.

taapas1128 marked an inline comment as done.Jun 18 2019, 11:46 AM
taapas1128 updated this revision to Diff 15579.
martinvonz accepted this revision.Jun 18 2019, 11:48 AM
This revision is now accepted and ready to land.Jun 18 2019, 11:48 AM
taapas1128 updated this revision to Diff 15583.Jun 18 2019, 1:05 PM
taapas1128 updated this revision to Diff 15640.Jun 24 2019, 5:33 AM
taapas1128 added a commit: rHG5bddd2244814: state: moved cmdutil.STATES and utilities to state.py.Jun 27 2019, 12:53 PM
Closed by commit rHG5bddd2244814: state: moved cmdutil.STATES and utilities to state.py (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (57 lines)
Mmercurial/state.py (63 lines)

Diff 15394

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)
martinvonzUnsubmitted
Done

Should drop the _ from _getrepostate since it's no longer private.

martinvonz: Should drop the `_` from `_getrepostate` since it's no longer private.
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)

mercurial/state.py

if self.cmdname == 'graft': if self.cmdname == 'graft':
msg = _("use 'hg graft --continue' or 'hg graft --stop' to stop") msg = _("use 'hg graft --continue' or 'hg graft --stop' to stop")
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 = _("use 'hg transplant --continue' or 'hg update' to abort") msg = _("use 'hg transplant --continue' or 'hg update' to abort")
else: else:
msg = (_("use 'hg %s --continue' or 'hg %s --abort'") % msg = (_("use 'hg %s --continue' or 'hg %s --abort'") %
(self.cmdname,self.cmdname)) (self.cmdname, self.cmdname))
martinvonzUnsubmitted
Not Done

Nit: This should be moved to the patch that introduced the bad formatting.

martinvonz: Nit: This should be moved to the patch that introduced the bad formatting.
return msg return msg
def msg(self): def msg(self):
"""returns the status message corresponding to the command""" """returns the status message corresponding to the command"""
if self.cmdname == 'update': if self.cmdname == 'update':
return _('last update was interrupted') return _('last update was interrupted')
elif self.cmdname == 'unshelve': elif self.cmdname == 'unshelve':
return _('unshelve already in progress') return _('unshelve already in progress')
''' '''
for state in unfinishedstates: for state in unfinishedstates:
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 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 _commentlines(raw):
martinvonzUnsubmitted
Not Done

This feels a lot like morestatus functionality and should perhaps have been left in cmdutil.py.

martinvonz: This feels a lot like morestatus functionality and should perhaps have been left in cmdutil.py.
taapas1128AuthorUnsubmitted
Not Done

morestatus functionality is left in cmdutil.py only the place where it checks for unfinished states that is _morestatus has been moved here.

taapas1128: `morestatus` functionality is left in `cmdutil.py` only the place where it checks for…
taapas1128AuthorUnsubmitted
Not Done

_getrepostate not more status

taapas1128: `_getrepostate` not more status
'''Surround lineswith a comment char and a new line'''
lines = raw.splitlines()
commentedlines = ['# %s' % line for line in lines]
return '\n'.join(commentedlines) + '\n'
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)