Mercurial > public > mercurial-scm > hg-stable

diff hgext/transplant.py @ 42781:0770e221d24b
transplant: unnest --stop case It should be aligned with --continue.
author: Yuya Nishihara <yuya@tcha.org>
date: Sat, 17 Aug 2019 15:43:41 +0900
parents: ac6121a24f27
children: 2372284d9457
--- a/hgext/transplant.py	Fri Aug 16 18:34:05 2019 +0900
+++ b/hgext/transplant.py	Sat Aug 17 15:43:41 2019 +0900
@@ -692,11 +692,11 @@
     if opts.get('continue'):
         if not tp.canresume():
             raise error.Abort(_('no transplant to continue'))
+    elif opts.get('stop'):
+        if not tp.canresume():
+            raise error.Abort(_('no interrupted transplant found'))
+        return tp.stop(ui, repo)
     else:
-        if opts.get('stop'):
-            if not tp.canresume():
-                raise error.Abort(_('no interrupted transplant found'))
-            return tp.stop(ui, repo)
         cmdutil.checkunfinished(repo)
         cmdutil.bailifchanged(repo)