##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

wireprotov2: implement commands as a generator of objects...
wireprotov2: implement commands as a generator of objects Previously, wire protocol version 2 inherited version 1's model of having separate types to represent the results of different wire protocol commands. As I implemented more powerful commands in future commits, I found I was using a common pattern of returning a special type to hold a generator. This meant the command function required a closure to do most of the work. That made logic flow more difficult to follow. I also noticed that many commands were effectively a sequence of objects to be CBOR encoded. I think it makes sense to define version 2 commands as generators. This way, commands can simply emit the data structures they wish to send to the client. This eliminates the need for a closure in command functions and removes encoding from the bodies of commands. As part of this commit, the handling of response objects has been moved into the serverreactor class. This puts the reactor in the driver's seat with regards to CBOR encoding and error handling. Having error handling in the function that emits frames is particularly important because exceptions in that function can lead to things getting in a bad state: I'm fairly certain that uncaught exceptions in the frame generator were causing deadlocks. I also introduced a dedicated error type for explicit error reporting in command handlers. This will be used in subsequent commits. There's still a bit of work to be done here, especially around formalizing the error handling "protocol." I've added yet another TODO to track this so we don't forget. Test output changed because we're using generators and no longer know we are at the end of the data until we hit the end of the generator. This means we can't emit the end-of-stream flag until we've exhausted the generator. Hence the introduction of 0-sized end-of-stream frames. Differential Revision: https://phab.mercurial-scm.org/D4472
Boris Feld - - Load All Authors

File last commit:

r38268:d0abd794 @34 default
r39595:07b58266 default
Show More
test-pull-update.t
248 lines | 6.1 KiB | text/troff | Tads3Lexer
/ tests / test-pull-update.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
combine tests
 r12279 $ hg init t
$ cd t
$ echo 1 > foo
$ hg ci -Am m
adding foo
$ cd ..
$ hg clone t tt
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd tt
$ echo 1.1 > foo
$ hg ci -Am m
$ cd ../t
$ echo 1.2 > foo
$ hg ci -Am m
Martin von Zweigbergk
update: add experimental config for default way of handling dirty wdir...
 r31167 Should respect config to disable dirty update
$ hg co -qC 0
$ echo 2 > foo
Augie Fackler
config: graduate experimental.updatecheck to commands.update.check...
 r34706 $ hg --config commands.update.check=abort pull -u ../tt
Martin von Zweigbergk
update: add experimental config for default way of handling dirty wdir...
 r31167 pulling from ../tt
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
 r34662 new changesets 107cefe13e42
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
Martin von Zweigbergk
update: add experimental config for default way of handling dirty wdir...
 r31167 abort: uncommitted changes
[255]
$ hg --config extensions.strip= strip --no-backup tip
$ hg co -qC tip
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 Should not update to the other topological branch:
Adrian Buehlmann
combine tests
 r12279
$ hg pull -u ../tt
pulling from ../tt
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
 r34662 new changesets 107cefe13e42
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Pulkit Goyal
update: show the commit to which we updated in case of multiple heads (BC)...
 r32698 updated to "800c91d5bfc1: m"
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 1 other heads for branch "default"
Adrian Buehlmann
combine tests
 r12279
$ cd ../tt
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 Should not update to the other branch:
Adrian Buehlmann
combine tests
 r12279
$ hg pull -u ../t
pulling from ../t
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
 r34662 new changesets 800c91d5bfc1
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Pulkit Goyal
update: show the commit to which we updated in case of multiple heads (BC)...
 r32698 updated to "107cefe13e42: m"
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
 r28065 1 other heads for branch "default"
Adrian Buehlmann
combine tests
 r12279
$ HGMERGE=true hg merge
merging foo
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -mm
$ cd ../t
Should work:
$ hg pull -u ../tt
pulling from ../tt
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (-1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
 r34662 new changesets 483b76ad4309
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
Adrian Buehlmann
combine tests
 r12279 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 Similarity between "hg update" and "hg pull -u" in handling bookmark
====================================================================
Test that updating activates the bookmark, which matches with the
explicit destination of the update.
$ echo 4 >> foo
$ hg commit -m "#4"
$ hg bookmark active-after-pull
$ cd ../tt
(1) activating by --rev BOOKMARK
$ hg bookmark -f active-before-pull
$ hg bookmarks
* active-before-pull 3:483b76ad4309
$ hg pull -u -r active-after-pull
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/t
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
adding remote bookmark active-after-pull
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
 r34662 new changesets f815b3da6163
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark active-after-pull)
$ hg parents -q
4:f815b3da6163
$ hg bookmarks
* active-after-pull 4:f815b3da6163
active-before-pull 3:483b76ad4309
(discard pulled changes)
$ hg update -q 483b76ad4309
$ hg rollback -q
(2) activating by URL#BOOKMARK
$ hg bookmark -f active-before-pull
$ hg bookmarks
* active-before-pull 3:483b76ad4309
$ hg pull -u $TESTTMP/t#active-after-pull
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/t
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
adding remote bookmark active-after-pull
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
 r34662 new changesets f815b3da6163
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
FUJIWARA Katsunori
pull: activate a bookmark matching with the destination of the update (BC)...
 r28273 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark active-after-pull)
$ hg parents -q
4:f815b3da6163
$ hg bookmarks
* active-after-pull 4:f815b3da6163
active-before-pull 3:483b76ad4309
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 (discard pulled changes)
$ hg update -q 483b76ad4309
$ hg rollback -q
Test that updating deactivates current active bookmark, if the
destination of the update is explicitly specified, and it doesn't
Mads Kiilerich
spelling: fixes of non-dictionary words
 r30332 match with the name of any existing bookmarks.
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274
$ cd ../t
$ hg bookmark -d active-after-pull
$ hg branch bar -q
$ hg commit -m "#5 (bar #1)"
$ cd ../tt
(1) deactivating by --rev REV
$ hg bookmark -f active-before-pull
$ hg bookmarks
* active-before-pull 3:483b76ad4309
$ hg pull -u -r b5e4babfaaa7
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/t
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
 r34662 new changesets f815b3da6163:b5e4babfaaa7
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark active-before-pull)
$ hg parents -q
5:b5e4babfaaa7
$ hg bookmarks
active-before-pull 3:483b76ad4309
(discard pulled changes)
$ hg update -q 483b76ad4309
$ hg rollback -q
(2) deactivating by --branch BRANCH
$ hg bookmark -f active-before-pull
$ hg bookmarks
* active-before-pull 3:483b76ad4309
$ hg pull -u -b bar
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/t
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
 r34662 new changesets f815b3da6163:b5e4babfaaa7
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark active-before-pull)
$ hg parents -q
5:b5e4babfaaa7
$ hg bookmarks
active-before-pull 3:483b76ad4309
(discard pulled changes)
$ hg update -q 483b76ad4309
$ hg rollback -q
(3) deactivating by URL#ANOTHER-BRANCH
$ hg bookmark -f active-before-pull
$ hg bookmarks
* active-before-pull 3:483b76ad4309
$ hg pull -u $TESTTMP/t#bar
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/t
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
 r34662 new changesets f815b3da6163:b5e4babfaaa7
Boris Feld
phases: use "published" in the phase movement message...
 r38268 1 local changesets published
FUJIWARA Katsunori
pull: deactivate a bookmark not matching with the destination of the update...
 r28274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark active-before-pull)
$ hg parents -q
5:b5e4babfaaa7
$ hg bookmarks
active-before-pull 3:483b76ad4309
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913 $ cd ..