Mercurial > public > mercurial-scm > hg-stable

diff mercurial/state.py @ 42612:3c16b9c0b099

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
continue: added logic for hg continue This is part of GSoC19 project `Implement abort and continue commands`. This patch is part of the continue plan. This adds the basic logic for hg continue. This command aborts an multistep operation like graft, histedit, rebase, transplant and unshelve if they are in an unfinished state. The first part of the logic is determining the unfinished operation from the state detection API under statemod. This API is extended to support hg continue by adding a method to register the abort logic as a function (here continuefunc). Once the unfinished operation is determined the registered logic is used to resume the command in case it is interrupted. The benefit of this kind of framework is that any new extension developed can support hg continue by registering the command and logic under statedetection API. hg continue currently supports --dry-run/-n flag only. It is used to dry run hg abort Differential Revision: https://phab.mercurial-scm.org/D6645
author Taapas Agrawal <taapas2897@gmail.com>
date Mon, 15 Jul 2019 22:23:31 +0530
parents 3bc400ccbf99
children 8c4f32b907e6
line wrap: on
line diff
--- a/mercurial/state.py	Wed Jul 17 18:15:51 2019 +0200
+++ b/mercurial/state.py	Mon Jul 15 22:23:31 2019 +0530
@@ -99,7 +99,7 @@
 
     def __init__(self, opname, fname, clearable, allowcommit, reportonly,
                  continueflag, stopflag, cmdmsg, cmdhint, statushint,
-                 abortfunc):
+                 abortfunc, continuefunc):
         self._opname = opname
         self._fname = fname
         self._clearable = clearable
@@ -111,6 +111,7 @@
         self._cmdhint = cmdhint
         self._statushint = statushint
         self.abortfunc = abortfunc
+        self.continuefunc = continuefunc
 
     def statusmsg(self):
         """returns the hint message corresponding to the command for
@@ -159,7 +160,8 @@
 
 def addunfinished(opname, fname, clearable=False, allowcommit=False,
                   reportonly=False, continueflag=False, stopflag=False,
-                  cmdmsg="", cmdhint="", statushint="", abortfunc=None):
+                  cmdmsg="", cmdhint="", statushint="", abortfunc=None,
+                  continuefunc=None):
     """this registers a new command or operation to unfinishedstates
     opname is the name the command or operation
     fname is the file name in which data should be stored in .hg directory.
@@ -184,10 +186,12 @@
     message of the format ('To continue:    hg cmdname --continue'
     'To abort:       hg cmdname --abort') is not desired
     abortfunc stores the function required to abort an unfinished state.
+    continuefunc stores the function required to finish an interrupted
+    operation.
     """
     statecheckobj = _statecheck(opname, fname, clearable, allowcommit,
                                 reportonly, continueflag, stopflag, cmdmsg,
-                                cmdhint, statushint, abortfunc)
+                                cmdhint, statushint, abortfunc, continuefunc)
     if opname == 'merge':
         _unfinishedstates.append(statecheckobj)
     else: