mercurial-scm/hg-stable: mercurial/cmdutil.py comparison

comparison mercurial/cmdutil.py @ 33792:96f43981c1c4

morestatus: move fb extension to core by plugging to `hg status --verbose` morestatus extension in fbext use to show more context about the state of the repo like the repository is in a unfinished merge state, or a rebase is going on, or histedit is going on, listing the files which need to be resolved and also suggesting ways to handle the situation. This patch moves the extension directly to core by plugging it into the --verbose flag of the status command. So now if you are in any unfinished state and you do hg status -v, it will show you details and help related to the state. The extension in fbext also shows context about unfinished update state which is not ported to core as that plug in hooks to update command which need to be tackled somewhat differently. The following configuration will turn the behaviour on by default [commands] status.verbose = 1 You can also skip considering some states like bisect as follows: [commands] status.skipstates=bisect This patch also adds test for the feature. .. feature:: ``hg status -v`` can now show unfinished state. For example, when in an unfinished rebase state, ``hg status -v`` might show:: # The repository is in an unfinished *rebase* state. # No unresolved merge conflicts. # To continue: hg rebase --continue # To abort: hg rebase --abort Differential Revision: https://phab.mercurial-scm.org/D219

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Thu, 03 Aug 2017 05:12:35 +0530
parents	02a745c20121
children	3821dfee2cfc

comparison

equal deleted inserted replaced

-:119e1c6be1ce
+:96f43981c1c4
 for x in xrange(len(indexes)):
 if not finalrs[x]:
 finalrs[x] = statlist[x]
 return finalrs
+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 _conflictsmsg(repo):
+# avoid merge cycle
+from . import merge as mergemod
+mergestate = mergemod.mergestate.read(repo)
+if not mergestate.active():
+return
+m = scmutil.match(repo[None])
+unresolvedlist = [f for f in mergestate if m(f) and mergestate[f] == 'u']
+if unresolvedlist:
+mergeliststr = '\n'.join(
+['    %s' % os.path.relpath(
+os.path.join(repo.root, path),
+pycompat.getcwd()) for path in unresolvedlist])
+msg = _('''Unresolved merge conflicts:
+%s
+To mark files as resolved:  hg resolve --mark FILE''') % mergeliststr
+else:
+msg = _('No unresolved merge conflicts.')
+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 _updatecleanmsg(dest=None):
+warning = _('warning: this will discard uncommitted changes')
+return 'hg update --clean %s    (%s)' % (dest or '.', warning)
+def _graftmsg():
+# tweakdefaults requires `update` to have a rev hence the `.`
+return _helpmessage('hg graft --continue', _updatecleanmsg())
+def _mergemsg():
+# tweakdefaults requires `update` to have a rev hence the `.`
+return _helpmessage('hg commit', _updatecleanmsg())
+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('unshelverebasestate'), _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):
+statetuple = _getrepostate(repo)
+label = 'status.morestatus'
+if statetuple:
+fm.startitem()
+state, statedetectionpredicate, helpfulmsg = statetuple
+statemsg = _('The repository is in an unfinished *%s* state.') % state
+fm.write('statemsg', '%s\n',  _commentlines(statemsg), label=label)
+conmsg = _conflictsmsg(repo)
+fm.write('conflictsmsg', '%s\n', conmsg, label=label)
+if helpfulmsg:
+helpmsg = helpfulmsg()
+fm.write('helpmsg', '%s\n', helpmsg, label=label)
 def findpossible(cmd, table, strict=False):
 """
 Return cmd -> (aliases, command table entry)
 for each matching command.

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 33792:96f43981c1c4