##// 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:

r29873:80ba176b default
r39595:07b58266 default
Show More
test-gpg.t
56 lines | 1.1 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: replace exit 80 with #require
r22046 #require gpg
Matt Mackall
tests: unify test-gpg
r12428 Test the GPG extension
$ cat <<EOF >> $HGRCPATH
> [extensions]
> gpg=
>
> [gpg]
Yuya Nishihara
test-gpg: make temporary copy of GNUPGHOME...
r29789 > cmd=gpg --no-permission-warning --no-secmem-warning --no-auto-check-trustdb
Matt Mackall
tests: unify test-gpg
r12428 > EOF
Yuya Nishihara
test-gpg: make temporary copy of GNUPGHOME...
r29789 $ GNUPGHOME="$TESTTMP/gpg"; export GNUPGHOME
$ cp -R "$TESTDIR/gpg" "$GNUPGHOME"
Yuya Nishihara
test-gpg: start gpg-agent by gpg-connect-agent only if GnuPG v2.1+ detected...
r29873 Start gpg-agent, which is required by GnuPG v2
#if gpg21
$ gpg-connect-agent -q --subst /serverpid '/echo ${get serverpid}' /bye \
> >> $DAEMON_PIDS
#endif
and migrate secret keys
Yuya Nishihara
test-gpg: start gpg-agent under control of the test runner...
r29790
#if gpg2
Yuya Nishihara
test-gpg: run migration of v1 secret keys beforehand...
r29791 $ gpg --no-permission-warning --no-secmem-warning --list-secret-keys \
> > /dev/null 2>&1
Yuya Nishihara
test-gpg: start gpg-agent under control of the test runner...
r29790 #endif
Matt Mackall
tests: unify test-gpg
r12428 $ hg init r
$ cd r
$ echo foo > foo
$ hg ci -Amfoo
adding foo
$ hg sigs
FUJIWARA Katsunori
gpg: accept '--edit' like other commands creating new changeset...
r21711 $ HGEDITOR=cat hg sign -e 0
Martin Geisler
gpg: lowercase messages
r16927 signing 0:e63c23eaa88a
FUJIWARA Katsunori
gpg: accept '--edit' like other commands creating new changeset...
r21711 Added signature for changeset e63c23eaa88a
HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit.
HG: --
HG: user: test
HG: branch 'default'
HG: added .hgsigs
Matt Mackall
tests: unify test-gpg
r12428
$ hg sigs
hgtest 0:e63c23eaa88ae77967edcf4ea194d31167c478b0
$ hg sigcheck 0
e63c23eaa88a is signed by:
hgtest
Greg Ward
test-gpg: make sure gpg does not modify the trustdb.gpg file...
r16289
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..