[PATCH 4 of 6] rebase: allow destination-free continue and abort (issue5513)

Ryan McElroy rm at fb.com
Tue Mar 28 17:31:13 EDT 2017


# HG changeset patch
# User Ryan McElroy <rmcelroy at fb.com>
# Date 1490735056 25200
#      Tue Mar 28 14:04:16 2017 -0700
# Node ID ac6634fab80b59ba48958ca03289c4434e9483c4
# Parent  409a87200f6b079c9bfe1e85fd0715822346c402
rebase: allow destination-free continue and abort (issue5513)

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -705,7 +705,7 @@ def rebase(ui, repo, **opts):
             raise error.Abort(msg)
 
         if ui.configbool('commands', 'rebase.requiredest'):
-            if not destf:
+            if not contf and not abortf and not destf:
                 raise error.Abort(_('you must specify a destination'),
                                   hint=_('use: hg rebase -d REV'))
 
diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t
--- a/tests/test-rebase-dest.t
+++ b/tests/test-rebase-dest.t
@@ -55,6 +55,5 @@ Requiring dest should not break continue
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  abort: you must specify a destination
-  (use: hg rebase -d REV)
-  [255]
+  rebasing 3:0537f6b50def "dc" (tip)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob)


More information about the Mercurial-devel mailing list