bundle: display info about secret changets while no sharable changeset found stable
authorAlain Leufroy <alain.leufroyATgmailMYDOTcom>
Wed, 25 Jan 2012 19:05:16 +0100
branchstable
changeset 15991 85ec8036d0b9
parent 15990 76630fbbf4fa
child 15992 963c8a553524
bundle: display info about secret changets while no sharable changeset found
mercurial/commands.py
tests/test-bundle.t
--- a/mercurial/commands.py	Mon Jan 23 12:26:01 2012 -0600
+++ b/mercurial/commands.py	Wed Jan 25 19:05:16 2012 +0100
@@ -994,7 +994,11 @@
                                                 force=opts.get('force'))
         cg = repo.getlocalbundle('bundle', outgoing)
     if not cg:
-        ui.status(_("no changes found\n"))
+        if 'outgoing' in locals() and outgoing.excluded:
+            repo.ui.status(_("no changes found but %i secret changesets\n")
+                           % len(outgoing.excluded))
+        else:
+            ui.status(_("no changes found\n"))
         return 1
 
     bundletype = opts.get('type', 'bzip2').lower()
--- a/tests/test-bundle.t	Mon Jan 23 12:26:01 2012 -0600
+++ b/tests/test-bundle.t	Wed Jan 25 19:05:16 2012 +0100
@@ -39,6 +39,15 @@
   $ cd ..
   $ hg init empty
 
+Bundle and phase
+
+  $ hg -R test phase --force --secret 0
+  $ hg -R test bundle phase.hg empty
+  searching for changes
+  no changes found but 9 secret changesets
+  [1]
+  $ hg -R test phase --draft -r 'head()'
+
 Bundle --all
 
   $ hg -R test bundle --all all.hg