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.
This commit is contained in:
Matt Mackall 2012-01-30 15:56:35 -06:00
parent 41ed50006e
commit 1c8e8627b0
4 changed files with 6 additions and 1 deletions

View File

@ -4451,7 +4451,6 @@ def push(ui, repo, dest=None, **opts):
ui.warn(_('updating bookmark %s failed!\n') % b)
if not result:
result = 2
result = 0
return result

View File

@ -58,6 +58,7 @@ export bookmark by name
searching for changes
no changes found
exporting bookmark W
[1]
$ hg -R ../a bookmarks
W -1:000000000000
X 0:4e3505fd9583
@ -72,6 +73,7 @@ delete a remote bookmark
searching for changes
no changes found
deleting remote bookmark W
[1]
push/pull name that doesn't exist
@ -169,6 +171,7 @@ hgweb
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/

View File

@ -181,6 +181,7 @@ pushkey hook
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

View File

@ -177,6 +177,7 @@ test pushkeys and bookmarks
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 @@ test pushkeys and bookmarks
searching for changes
no changes found
deleting remote bookmark foo
[1]
a bad, evil hook that prints to stdout