Patchwork D6696: abort: added support for transplant

login
register
mail settings
Submitter phabricator
Date Aug. 8, 2019, 4:12 p.m.
Message ID <f48c4237bdbae8ce8525a499fcdaa4a0@localhost.localdomain>
Download mbox | patch
Permalink /patch/41228/
State Not Applicable
Headers show

Comments

phabricator - Aug. 8, 2019, 4:12 p.m.
taapas1128 marked an inline comment as done.
taapas1128 updated this revision to Diff 16160.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6696?vs=16070&id=16160

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6696/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6696

AFFECTED FILES
  hgext/transplant.py
  tests/test-transplant.t

CHANGE DETAILS




To: taapas1128, #hg-reviewers
Cc: pulkit, mercurial-devel

Patch

diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -1,10 +1,17 @@ 
-#testcases commandmode continueflag
+#testcases commandmode abortflag continueflag
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > transplant=
   > graphlog=
   > EOF
 
+#if abortflag
+  $ cat >> $HGRCPATH <<EOF
+  > [alias]
+  > abort = transplant --abort
+  > EOF
+#endif
+
 #if continueflag
   $ cat >> $HGRCPATH <<EOF
   > [alias]
@@ -460,7 +467,7 @@ 
   abort: fix up the working directory and run hg transplant --continue
   [255]
 
-  $ hg transplant --abort
+  $ hg abort
   transplant aborted
   working directory is now at e8643552fde5
 Repo log after abort
@@ -514,8 +521,9 @@ 
   abort: no transplant to continue (continueflag !)
   abort: no operation in progress (no-continueflag !)
   [255]
-  $ hg transplant --abort
-  abort: no transplant to abort
+  $ hg abort
+  abort: no transplant to abort (abortflag !)
+  abort: no operation in progress (no-abortflag !)
   [255]
   $ hg transplant 1
   applying 46ae92138f3c
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -762,6 +762,13 @@ 
         tp = transplanter(ui, repo, {})
         return tp.resume(repo, repo, {})
 
+def aborttransplant(ui, repo):
+    """logic to abort a transplnat in progress using
+    'hg abort'"""
+    with repo.wlock():
+        tp = transplanter(ui, repo, {})
+        return tp.abort(ui, repo)
+
 revsetpredicate = registrar.revsetpredicate()
 
 @revsetpredicate('transplanted([set])')
@@ -788,7 +795,7 @@ 
 def extsetup(ui):
     statemod.addunfinished (
         'transplant', fname='transplant/journal', clearable=True,
-        continuefunc=continuetransplant,
+        continuefunc=continuetransplant, abortfunc=aborttransplant,
     )
 
 # tell hggettext to extract docstrings from these functions: