comparison tests/test-bookmarks-pushpull.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 7a9cbb315d84
children 798185707833
comparison
equal deleted inserted replaced
22650:36952c91e6c3 22651:b901645a8784
97 push/pull name that doesn't exist 97 push/pull name that doesn't exist
98 98
99 $ hg push -B badname ../a 99 $ hg push -B badname ../a
100 pushing to ../a 100 pushing to ../a
101 searching for changes 101 searching for changes
102 no changes found
103 bookmark badname does not exist on the local or remote repository! 102 bookmark badname does not exist on the local or remote repository!
103 no changes found
104 [2] 104 [2]
105 $ hg pull -B anotherbadname ../a 105 $ hg pull -B anotherbadname ../a
106 pulling from ../a 106 pulling from ../a
107 abort: remote bookmark anotherbadname not found! 107 abort: remote bookmark anotherbadname not found!
108 [255] 108 [255]
354 [1] 354 [1]
355 $ hg push -B Z http://localhost:$HGPORT/ 355 $ hg push -B Z http://localhost:$HGPORT/
356 pushing to http://localhost:$HGPORT/ 356 pushing to http://localhost:$HGPORT/
357 searching for changes 357 searching for changes
358 no changes found 358 no changes found
359 exporting bookmark Z 359 updating bookmark Z
360 [1] 360 [1]
361 $ hg book -d Z 361 $ hg book -d Z
362 $ hg in -B http://localhost:$HGPORT/ 362 $ hg in -B http://localhost:$HGPORT/
363 comparing with http://localhost:$HGPORT/ 363 comparing with http://localhost:$HGPORT/
364 searching for changed bookmarks 364 searching for changed bookmarks