##// 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
Matt Mackall - - Load All Authors

File last commit:

r25295:701df761 default
r39595:07b58266 default
Show More
test-convert-datesort.t
211 lines | 3.5 KiB | text/troff | Tads3Lexer
/ tests / test-convert-datesort.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
tests: unify test-convert-datesort
 r12528
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert=
> EOF
$ hg init t
$ cd t
$ echo a >> a
$ hg ci -Am a0 -d '1 0'
adding a
$ hg branch brancha
marked working directory as branch brancha
Matt Mackall
branch: warn on branching
 r15615 (branches are permanent and global, did you want a bookmark?)
Matt Mackall
tests: unify test-convert-datesort
 r12528 $ echo a >> a
$ hg ci -m a1 -d '2 0'
$ echo a >> a
$ hg ci -m a2 -d '3 0'
$ echo a >> a
$ hg ci -m a3 -d '4 0'
$ hg up -C 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branch branchb
marked working directory as branch branchb
$ echo b >> b
$ hg ci -Am b0 -d '6 0'
adding b
$ hg up -C brancha
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo a >> a
$ hg ci -m a4 -d '5 0'
$ echo a >> a
$ hg ci -m a5 -d '7 0'
$ echo a >> a
$ hg ci -m a6 -d '8 0'
$ hg up -C branchb
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b >> b
$ hg ci -m b1 -d '9 0'
Constantine Linnick
convert: add closesort algorithm to mercurial sources...
 r18819 $ hg up -C 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo c >> c
$ hg branch branchc
marked working directory as branch branchc
$ hg ci -Am c0 -d '10 0'
adding c
$ hg up -C brancha
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg ci --close-branch -m a7x -d '11 0'
$ hg up -C branchb
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg ci --close-branch -m b2x -d '12 0'
$ hg up -C branchc
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge branchb
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m c1 -d '13 0'
Matt Mackall
tests: unify test-convert-datesort
 r12528 $ cd ..
convert with datesort
$ hg convert --datesort t t-datesort
initializing destination t-datesort repository
scanning source...
sorting...
converting...
Constantine Linnick
convert: add closesort algorithm to mercurial sources...
 r18819 12 a0
11 a1
10 a2
9 a3
8 a4
7 b0
6 a5
5 a6
4 b1
3 c0
2 a7x
1 b2x
0 c1
Matt Mackall
tests: unify test-convert-datesort
 r12528
graph converted repo
Martin Geisler
tests: don't load unnecessary graphlog extension...
 r20117 $ hg -R t-datesort log -G --template '{rev} "{desc}"\n'
Constantine Linnick
convert: add closesort algorithm to mercurial sources...
 r18819 o 12 "c1"
|\
Jordi Gutiérrez Hermoso
log: display closing-branch nodes as "_" (BC)...
 r24216 | _ 11 "b2x"
Matt Mackall
tests: unify test-convert-datesort
 r12528 | |
Jordi Gutiérrez Hermoso
log: display closing-branch nodes as "_" (BC)...
 r24216 | | _ 10 "a7x"
Constantine Linnick
convert: add closesort algorithm to mercurial sources...
 r18819 | | |
o | | 9 "c0"
| | |
| o | 8 "b1"
| | |
| | o 7 "a6"
| | |
| | o 6 "a5"
| | |
| o | 5 "b0"
|/ /
Matt Mackall
tests: unify test-convert-datesort
 r12528 | o 4 "a4"
| |
| o 3 "a3"
| |
| o 2 "a2"
| |
| o 1 "a1"
|/
o 0 "a0"
convert with datesort (default mode)
$ hg convert t t-sourcesort
initializing destination t-sourcesort repository
scanning source...
sorting...
converting...
Constantine Linnick
convert: add closesort algorithm to mercurial sources...
 r18819 12 a0
11 a1
10 a2
9 a3
8 b0
7 a4
6 a5
5 a6
4 b1
3 c0
2 a7x
1 b2x
0 c1
Matt Mackall
tests: unify test-convert-datesort
 r12528
graph converted repo
Martin Geisler
tests: don't load unnecessary graphlog extension...
 r20117 $ hg -R t-sourcesort log -G --template '{rev} "{desc}"\n'
Constantine Linnick
convert: add closesort algorithm to mercurial sources...
 r18819 o 12 "c1"
|\
Jordi Gutiérrez Hermoso
log: display closing-branch nodes as "_" (BC)...
 r24216 | _ 11 "b2x"
Matt Mackall
tests: unify test-convert-datesort
 r12528 | |
Jordi Gutiérrez Hermoso
log: display closing-branch nodes as "_" (BC)...
 r24216 | | _ 10 "a7x"
Constantine Linnick
convert: add closesort algorithm to mercurial sources...
 r18819 | | |
o | | 9 "c0"
| | |
| o | 8 "b1"
| | |
| | o 7 "a6"
| | |
| | o 6 "a5"
| | |
| | o 5 "a4"
| | |
| o | 4 "b0"
|/ /
Matt Mackall
tests: unify test-convert-datesort
 r12528 | o 3 "a3"
| |
| o 2 "a2"
| |
| o 1 "a1"
|/
o 0 "a0"
Constantine Linnick
convert: add closesort algorithm to mercurial sources...
 r18819
convert with closesort
$ hg convert --closesort t t-closesort
initializing destination t-closesort repository
scanning source...
sorting...
converting...
12 a0
11 a1
10 a2
9 a3
8 b0
7 a4
6 a5
5 a6
4 a7x
3 b1
2 b2x
1 c0
0 c1
graph converted repo
Martin Geisler
tests: don't load unnecessary graphlog extension...
 r20117 $ hg -R t-closesort log -G --template '{rev} "{desc}"\n'
Constantine Linnick
convert: add closesort algorithm to mercurial sources...
 r18819 o 12 "c1"
|\
| o 11 "c0"
| |
Jordi Gutiérrez Hermoso
log: display closing-branch nodes as "_" (BC)...
 r24216 _ | 10 "b2x"
Constantine Linnick
convert: add closesort algorithm to mercurial sources...
 r18819 | |
o | 9 "b1"
| |
Jordi Gutiérrez Hermoso
log: display closing-branch nodes as "_" (BC)...
 r24216 | | _ 8 "a7x"
Constantine Linnick
convert: add closesort algorithm to mercurial sources...
 r18819 | | |
| | o 7 "a6"
| | |
| | o 6 "a5"
| | |
| | o 5 "a4"
| | |
o | | 4 "b0"
|/ /
| o 3 "a3"
| |
| o 2 "a2"
| |
| o 1 "a1"
|/
o 0 "a0"