##// END OF EJS Templates
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

File last commit:

r36101:dc014846 default
r39595:07b58266 default
Show More
test-narrow-merge.t
104 lines | 2.9 KiB | text/troff | Tads3Lexer
#testcases flat tree
$ . "$TESTDIR/narrow-library.sh"
#if tree
$ cat << EOF >> $HGRCPATH
> [experimental]
> treemanifest = 1
> EOF
#endif
create full repo
$ hg init master
$ cd master
$ cat >> .hg/hgrc <<EOF
> [narrow]
> serveellipses=True
> EOF
$ mkdir inside
$ echo inside1 > inside/f1
$ echo inside2 > inside/f2
$ mkdir outside
$ echo outside1 > outside/f1
$ echo outside2 > outside/f2
$ hg ci -Aqm 'initial'
$ echo modified > inside/f1
$ hg ci -qm 'modify inside/f1'
$ hg update -q 0
$ echo modified > inside/f2
$ hg ci -qm 'modify inside/f2'
$ hg update -q 0
$ echo modified2 > inside/f1
$ hg ci -qm 'conflicting inside/f1'
$ hg update -q 0
$ echo modified > outside/f1
$ hg ci -qm 'modify outside/f1'
$ hg update -q 0
$ echo modified2 > outside/f1
$ hg ci -qm 'conflicting outside/f1'
$ cd ..
$ hg clone --narrow ssh://user@dummy/master narrow --include inside
requesting all changes
adding changesets
adding manifests
adding file changes
added 6 changesets with 5 changes to 2 files (+4 heads)
new changesets *:* (glob)
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow
$ hg update -q 0
Can merge in when no files outside narrow spec are involved
$ hg update -q 'desc("modify inside/f1")'
$ hg merge 'desc("modify inside/f2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg commit -m 'merge inside changes'
Can merge conflicting changes inside narrow spec
$ hg update -q 'desc("modify inside/f1")'
$ hg merge 'desc("conflicting inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)'
merging inside/f1
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
$ echo modified3 > inside/f1
$ hg resolve -m
(no more unresolved files)
$ hg commit -m 'merge inside/f1'
TODO: Can merge non-conflicting changes outside narrow spec
$ hg update -q 'desc("modify inside/f1")'
$ hg merge 'desc("modify outside/f1")'
abort: merge affects file 'outside/f1' outside narrow, which is not yet supported (flat !)
abort: merge affects file 'outside/' outside narrow, which is not yet supported (tree !)
(merging in the other direction may work)
[255]
$ hg update -q 'desc("modify outside/f1")'
$ hg merge 'desc("modify inside/f1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'merge from inside to outside'
Refuses merge of conflicting outside changes
$ hg update -q 'desc("modify outside/f1")'
$ hg merge 'desc("conflicting outside/f1")'
abort: conflict in file 'outside/f1' is outside narrow clone (flat !)
abort: conflict in file 'outside/' is outside narrow clone (tree !)
[255]