Mercurial > hg-stable

changeset 16038:dad96e752079 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: don't treat bookmark as a found change Treating bookmarks as a found change results in confusing documentation or output and is less useful for scripting.
author Matt Mackall <mpm@selenic.com>
date Mon, 30 Jan 2012 15:56:35 -0600
parents 9232fa4fd1ba
children 093b75c7b44b
files mercurial/commands.py tests/test-bookmarks-pushpull.t tests/test-hook.t tests/test-ssh.t
diffstat 4 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Jan 30 14:44:01 2012 -0600
+++ b/mercurial/commands.py	Mon Jan 30 15:56:35 2012 -0600
@@ -4451,7 +4451,6 @@
                 ui.warn(_('updating bookmark %s failed!\n') % b)
                 if not result:
                     result = 2
-            result = 0
 
     return result
 
--- a/tests/test-bookmarks-pushpull.t	Mon Jan 30 14:44:01 2012 -0600
+++ b/tests/test-bookmarks-pushpull.t	Mon Jan 30 15:56:35 2012 -0600
@@ -58,6 +58,7 @@
   searching for changes
   no changes found
   exporting bookmark W
+  [1]
   $ hg -R ../a bookmarks
      W                         -1:000000000000
      X                         0:4e3505fd9583
@@ -72,6 +73,7 @@
   searching for changes
   no changes found
   deleting remote bookmark W
+  [1]
 
 push/pull name that doesn't exist
 
@@ -169,6 +171,7 @@
   searching for changes
   no changes found
   exporting bookmark Z
+  [1]
   $ hg book -d Z
   $ hg in -B http://localhost:$HGPORT/
   comparing with http://localhost:$HGPORT/
--- a/tests/test-hook.t	Mon Jan 30 14:44:01 2012 -0600
+++ b/tests/test-hook.t	Mon Jan 30 15:56:35 2012 -0600
@@ -181,6 +181,7 @@
   no changes found
   exporting bookmark foo
   pushkey hook: HG_KEY=foo HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_RET=1 
+  [1]
   $ cd ../a
 
 listkeys hook
--- a/tests/test-ssh.t	Mon Jan 30 14:44:01 2012 -0600
+++ b/tests/test-ssh.t	Mon Jan 30 15:56:35 2012 -0600
@@ -177,6 +177,7 @@
   searching for changes
   no changes found
   exporting bookmark foo
+  [1]
   $ hg debugpushkey --config ui.ssh="python $TESTDIR/dummyssh" ssh://user@dummy/remote bookmarks
   foo	1160648e36cec0054048a7edc4110c6f84fde594
   $ hg book -f foo
@@ -203,6 +204,7 @@
   searching for changes
   no changes found
   deleting remote bookmark foo
+  [1]
 
 a bad, evil hook that prints to stdout