##// 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
Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default
r39595:07b58266 default
Show More
test-merge10.t
54 lines | 1.4 KiB | text/troff | Tads3Lexer
/ tests / test-merge10.t
History | Source | Raw |Copy content |Copy permalink
Pradeepkumar Gayam
tests: unify test-merge10
 r11983 Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
(merge correctly when all the files in a directory are moved
but then local changes are added in the same directory)
$ hg init a
$ cd a
$ mkdir -p testdir
$ echo a > testdir/a
$ hg add testdir/a
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg commit -m a
Pradeepkumar Gayam
tests: unify test-merge10
 r11983 $ cd ..
$ hg clone a b
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd a
$ echo alpha > testdir/a
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg commit -m remote-change
Pradeepkumar Gayam
tests: unify test-merge10
 r11983 $ cd ..
$ cd b
$ mkdir testdir/subdir
$ hg mv testdir/a testdir/subdir/a
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg commit -m move
Pradeepkumar Gayam
tests: unify test-merge10
 r11983 $ mkdir newdir
$ echo beta > newdir/beta
$ hg add newdir/beta
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg commit -m local-addition
Pradeepkumar Gayam
tests: unify test-merge10
 r11983 $ hg pull ../a
pulling from ../a
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 cc7000b01af9
Pradeepkumar Gayam
tests: unify test-merge10
 r11983 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up -C 2
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge
merging testdir/subdir/a and testdir/a to testdir/subdir/a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg stat
M testdir/subdir/a
$ hg diff --nodates
Martin Geisler
tests: remove unneeded -d flags...
 r12156 diff -r bc21c9773bfa testdir/subdir/a
Pradeepkumar Gayam
tests: unify test-merge10
 r11983 --- a/testdir/subdir/a
+++ b/testdir/subdir/a
@@ -1,1 +1,1 @@
-a
+alpha
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913
$ cd ..