Mercurial > hg
comparison tests/test-hook.t @ 22651:b901645a8784
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 |
comparison
equal
deleted
inserted
replaced
22650:36952c91e6c3 | 22651:b901645a8784 |
---|---|
181 $ hg bookmark -r null foo | 181 $ hg bookmark -r null foo |
182 $ hg push -B foo ../a | 182 $ hg push -B foo ../a |
183 pushing to ../a | 183 pushing to ../a |
184 searching for changes | 184 searching for changes |
185 no changes found | 185 no changes found |
186 pushkey hook: HG_KEY=foo HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_RET=1 | |
186 exporting bookmark foo | 187 exporting bookmark foo |
187 pushkey hook: HG_KEY=foo HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_RET=1 | |
188 [1] | 188 [1] |
189 $ cd ../a | 189 $ cd ../a |
190 | 190 |
191 listkeys hook | 191 listkeys hook |
192 | 192 |
213 searching for changes | 213 searching for changes |
214 listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'} | 214 listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'} |
215 listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'} | 215 listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'} |
216 no changes found | 216 no changes found |
217 listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'} | 217 listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'} |
218 listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'} | |
219 exporting bookmark baz | |
220 prepushkey.forbid hook: HG_KEY=baz HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 | 218 prepushkey.forbid hook: HG_KEY=baz HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 |
221 abort: prepushkey hook exited with status 1 | 219 abort: prepushkey hook exited with status 1 |
222 [255] | 220 [255] |
223 $ cd ../a | 221 $ cd ../a |
224 | 222 |