diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -620,7 +620,7 @@ return _commentlines(msg) def morestatus(repo, fm): - statetuple = statemod._getrepostate(repo) + statetuple = statemod.getrepostate(repo) label = 'status.morestatus' if statetuple: state, statedetectionpredicate, helpfulmsg = statetuple @@ -630,8 +630,7 @@ 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): """ diff --git a/mercurial/state.py b/mercurial/state.py --- a/mercurial/state.py +++ b/mercurial/state.py @@ -132,18 +132,33 @@ 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) 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"))) +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 @@ -153,13 +168,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()) @@ -169,70 +186,34 @@ 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 (state.cmdname == 'merge' or state.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.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()) 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/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-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-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