Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: unnest --stop case
authorYuya Nishihara <yuya@tcha.org>
Sat, 17 Aug 2019 15:43:41 +0900
changeset 42765 0770e221d24b
parent 42764 798b7d4b463e
child 42766 e94c8f584ee2
transplant: unnest --stop case It should be aligned with --continue.
hgext/transplant.py file | annotate | diff | comparison | revisions 
--- 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)
Mercurial