D6503: statecheck: added support for STATES
taapas1128 (Taapas Agrawal)
phabricator at mercurial-scm.org
Tue Jun 11 09:49:50 EDT 2019
taapas1128 updated this revision to Diff 15440.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6503?vs=15428&id=15440
REVISION DETAIL
https://phab.mercurial-scm.org/D6503
AFFECTED FILES
mercurial/cmdutil.py
mercurial/state.py
tests/test-graft.t
tests/test-histedit-fold.t
tests/test-rebase-conflicts.t
tests/test-shelve.t
CHANGE DETAILS
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -375,8 +375,7 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # To continue: hg unshelve --continue
- # To abort: hg unshelve --abort
+ # use 'hg unshelve --continue' or 'hg unshelve --abort'
ensure that we have a merge with unresolved conflicts
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -80,8 +80,7 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # To continue: hg rebase --continue
- # To abort: hg rebase --abort
+ # use 'hg rebase --continue' or 'hg rebase --abort'
Try to continue without solving the conflict:
diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t
+++ b/tests/test-histedit-fold.t
@@ -306,8 +306,7 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # To continue: hg histedit --continue
- # To abort: hg histedit --abort
+ # use 'hg histedit --continue' or 'hg histedit --abort'
$ hg resolve -l
U file
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -278,8 +278,7 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # To continue: hg graft --continue
- # To abort: hg graft --abort
+ # use 'hg graft --continue' or 'hg graft --stop' to stop
Commit while interrupted should fail:
diff --git a/mercurial/state.py b/mercurial/state.py
--- a/mercurial/state.py
+++ b/mercurial/state.py
@@ -133,19 +133,34 @@
return _('%s in progress') % (self._cmdname)
return self._cmdmsg
- def isunfinished(self, repo):
- """determines whether a multi-step operation is in progress or not"""
- return repo.vfs.exists(self._fname)
+ def isunfinished(self, repo, mergecheck=False):
+ """determines whether a multi-step operation is in progress
+ or not
+ mergecheck flag helps in determining state specifically for merge
+ """
+ if self._cmdname == 'merge' or mergecheck:
+ return len(repo[None].parents()) > 1
+ else:
+ return repo.vfs.exists(self._fname)
# A list of statecheck objects for multistep operations like graft.
unfinishedstates = []
unfinishedstates.append(
statecheck('graft', 'graftstate', clearable=True, allowcommit=False,
cmdhint=_("use 'hg graft --continue' or 'hg graft --stop' to stop")))
unfinishedstates.append(
+ statecheck('bisect', 'bisect.state', clearable=False, allowcommit=True,
+ cmdhint=_('To mark the changeset good: hg bisect --good\n'
+ 'To mark the changeset bad: hg bisect --bad\n'
+ 'To abort: hg bisect --reset\n')))
+unfinishedstates.append(
statecheck('update', 'updatestate', clearable=True, allowcommit=False,
- cmdmsg=_('last update was interrupted'),
- cmdhint=_("use 'hg update' to get a consistent checkout")))
+ cmdmsg=_('last update was interrupted'),
+ cmdhint=_("use 'hg update' to get a consistent checkout")))
+unfinishedstates.append(
+ statecheck('merge', 'None', clearable=True, allowcommit=False,
+ cmdhint=_('To continue: hg commit\n'
+ 'To abort: hg merge --abort')))
def checkunfinished(repo, commit=False):
'''Look for an unfinished multistep operation, like graft, and abort
@@ -155,13 +170,15 @@
# Check for non-clearable states first, so things like rebase will take
# precedence over update.
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
if state.isunfinished(repo):
raise error.Abort(state.msg(), hint=state.hint())
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
if s.isunfinished(repo):
raise error.Abort(s.msg(), hint=s.hint())
@@ -171,70 +188,31 @@
that are clearable.
'''
for state in unfinishedstates:
+ if (state._cmdname == 'merge' or state._cmdname == 'bisect'):
+ continue
if not state._clearable and state.isunfinished(repo):
raise error.Abort(state.msg(), hint=state.hint())
for s in unfinishedstates:
+ if (s._cmdname == 'merge' or s._cmdname == 'bisect'):
+ continue
if s._clearable and s.isunfinished(repo):
util.unlink(repo.vfs.join(s._fname))
-def _commentlines(raw):
- '''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):
+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)
+ 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.hint())
+
+ for s in unfinishedstates:
+ if s._cmdname in skip:
+ continue
+ if s._cmdname == 'update' and s.isunfinished(repo):
+ return (s._cmdname, s.hint())
+ if s._cmdname == 'merge' and s.isunfinished(repo):
+ return (s._cmdname, s.hint())
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -620,18 +620,17 @@
return _commentlines(msg)
def morestatus(repo, fm):
- statetuple = statemod._getrepostate(repo)
+ statetuple = statemod.getrepostate(repo)
label = 'status.morestatus'
if statetuple:
- state, statedetectionpredicate, helpfulmsg = statetuple
+ state, helpfulmsg = statetuple
statemsg = _('The repository is in an unfinished *%s* state.') % state
fm.plain('%s\n' % _commentlines(statemsg), label=label)
conmsg = _conflictsmsg(repo)
if conmsg:
fm.plain('%s\n' % conmsg, label=label)
if helpfulmsg:
- helpmsg = helpfulmsg()
- fm.plain('%s\n' % helpmsg, label=label)
+ fm.plain('%s\n' % _commentlines(helpfulmsg), label=label)
def findpossible(cmd, table, strict=False):
"""
To: taapas1128, durin42, #hg-reviewers
Cc: martinvonz, pulkit, mercurial-devel
More information about the Mercurial-devel
mailing list