Mercurial > hg

diff tests/test-hook.t @ 22651:b901645a8784

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: gather all bookmark decisions together The discovery phases for bookmarks now use the list of explicitly pushed bookmarks to do addition, removal and overwriting. Tests are impacted because this reduces the amount of listkeys calls issued, removes some duplicated messages and improves the accuracy of some messages.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 27 Sep 2014 20:51:53 -0700
parents 6e431e1635b6
children 798185707833
line wrap: on
line diff
--- a/tests/test-hook.t	Fri Sep 26 18:33:11 2014 -0700
+++ b/tests/test-hook.t	Sat Sep 27 20:51:53 2014 -0700
@@ -183,8 +183,8 @@
   pushing to ../a
   searching for changes
   no changes found
+  pushkey hook: HG_KEY=foo HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_RET=1
   exporting bookmark foo
-  pushkey hook: HG_KEY=foo HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_RET=1
   [1]
   $ cd ../a
 
@@ -215,8 +215,6 @@
   listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
   no changes found
   listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'}
-  listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
-  exporting bookmark baz
   prepushkey.forbid hook: HG_KEY=baz HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000
   abort: prepushkey hook exited with status 1
   [255]