Mercurial > public > mercurial-scm > hg

diff mercurial/state.py @ 42582:5171937ad0f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
abort: added support for graft This adds support of `graft` to `hg abort` plan. The patch creates a seperate function `cmdutil.hgabortgraft` so that abort logic for graft can be called independently. This logic is registered to the statedetection API as `abortfunc`. Results are shown as tests. Differential Revision: https://phab.mercurial-scm.org/D6567
author Taapas Agrawal <taapas2897@gmail.com>
date Sun, 23 Jun 2019 22:31:31 +0530
parents bb135a784b70
children 3fb0493812c0
line wrap: on
line diff
--- a/mercurial/state.py	Sun Jun 23 20:58:01 2019 +0530
+++ b/mercurial/state.py	Sun Jun 23 22:31:31 2019 +0530
@@ -194,11 +194,6 @@
         _unfinishedstates.insert(0, statecheckobj)
 
 addunfinished(
-    'graft', fname='graftstate', clearable=True, stopflag=True,
-    continueflag=True,
-    cmdhint=_("use 'hg graft --continue' or 'hg graft --stop' to stop")
-)
-addunfinished(
     'unshelve', fname='shelvedstate', continueflag=True,
     cmdmsg=_('unshelve already in progress')
 )