Mercurial > hg-stable

changeset 27422:67eeb7421d8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle: fix error for --all with destination Before it complained about --base
author timeless <timeless@mozdev.org>
date Thu, 17 Dec 2015 15:03:45 +0000
parents 930f529b0d5f
children c953e26f3734
files mercurial/commands.py tests/test-bundle-r.t
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Dec 17 14:59:11 2015 +0000
+++ b/mercurial/commands.py	Thu Dec 17 15:03:45 2015 +0000
@@ -1344,6 +1344,9 @@
                           hint=_('use "hg debugcreatestreamclonebundle"'))
 
     if opts.get('all'):
+        if dest:
+            raise error.Abort(_("--all is incompatible with specifying "
+                                "a destination"))
         base = ['null']
     else:
         base = scmutil.revrange(repo, opts.get('base'))
--- a/tests/test-bundle-r.t	Thu Dec 17 14:59:11 2015 +0000
+++ b/tests/test-bundle-r.t	Thu Dec 17 15:03:45 2015 +0000
@@ -161,6 +161,9 @@
   $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3
   abort: --base is incompatible with specifying a destination
   [255]
+  $ hg -R test bundle -a -r tip test-bundle-branch1.hg test-3
+  abort: --all is incompatible with specifying a destination
+  [255]
   $ hg -R test bundle -r tip test-bundle-branch1.hg
   abort: repository default-push not found!
   [255]