Mercurial > hg
comparison tests/test-bookmarks-pushpull.t @ 41051:bad05a6afdc8
pull: fix inconsistent view of bookmarks during pull (issue4700)
I had a share where a pull apparently pulled a bookmark but not the
revision pointed to by the bookmark, which I suspect is due to this
(and if not, we might as well remove known issues in this area).
I do this by combining doing all the queries that could read the
bookmarks in one round trip.
I had to change the handling of the case where the server doesn't
support the lookup query, because if it fails, it would otherwise make
fremotebookmark.result() block forever. This is due to
wireprotov1peer.peerexecutor.sendcommands's behavior (it fills a
single future if any query fails synchronously and leaves all other
futures unchanged), but I don't know if the fix is to cancel all other
futures, or to keep going with the other queries.
Differential Revision: https://phab.mercurial-scm.org/D5449
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Thu, 20 Dec 2018 22:28:39 -0500 |
| parents | c236a491ab7b |
| children | cf9dbc7377de |
comparison
equal
deleted
inserted
replaced
| 41050:6faaf3a1c6ec | 41051:bad05a6afdc8 |
|---|---|
| 671 searching for changes | 671 searching for changes |
| 672 adding changesets | 672 adding changesets |
| 673 adding manifests | 673 adding manifests |
| 674 adding file changes | 674 adding file changes |
| 675 added 1 changesets with 1 changes to 1 files | 675 added 1 changesets with 1 changes to 1 files |
| 676 updating bookmark Y | |
| 676 new changesets 0d60821d2197 (1 drafts) | 677 new changesets 0d60821d2197 (1 drafts) |
| 677 (run 'hg update' to get a working copy) | 678 (run 'hg update' to get a working copy) |
| 678 $ hg book | 679 $ hg book |
| 679 @ 1:0d2164f0ce0d | 680 @ 1:0d2164f0ce0d |
| 680 X 1:0d2164f0ce0d | 681 X 1:0d2164f0ce0d |
| 681 * Y 5:35d1ef0a8d1b | 682 * Y 6:0d60821d2197 |
| 682 Z 1:0d2164f0ce0d | 683 Z 1:0d2164f0ce0d |
| 683 $ hg -R $TESTTMP/pull-race book | 684 $ hg -R $TESTTMP/pull-race book |
| 684 @ 1:0d2164f0ce0d | 685 @ 1:0d2164f0ce0d |
| 685 X 1:0d2164f0ce0d | 686 X 1:0d2164f0ce0d |
| 686 * Y 7:714424d9e8b8 | 687 * Y 7:714424d9e8b8 |