hgext/rebase.py
changeset 42583 b9bc47211cf5
parent 42533 0231032729c4
child 42613 35ebdbb38efb
--- a/hgext/rebase.py	Sun Jun 23 22:31:31 2019 +0530
+++ b/hgext/rebase.py	Sun Jun 23 23:11:35 2019 +0530
@@ -1923,6 +1923,11 @@
         obsoleteextinctsuccessors,
     )
 
+def abortrebase(ui, repo):
+    with repo.wlock(), repo.lock():
+        rbsrt = rebaseruntime(repo, ui)
+        rbsrt._prepareabortorcontinue(isabort=True)
+
 def summaryhook(ui, repo):
     if not repo.vfs.exists('rebasestate'):
         return
@@ -1951,4 +1956,4 @@
                      _("specify merge tool for rebase")))
     cmdutil.summaryhooks.add('rebase', summaryhook)
     statemod.addunfinished('rebase', fname='rebasestate', stopflag=True,
-                            continueflag=True)
+                            continueflag=True, abortfunc=abortrebase)