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

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

wireprotov2: allow multiple fields to follow revision maps...
wireprotov2: allow multiple fields to follow revision maps The *data wire protocol commands emit a series of CBOR values. Because revision/delta data may be large, their data is emitted outside the map as a top-level bytestring value. Before this commit, we'd emit a single optional bytestring value after the revision descriptor map. This got the job done. But it was limiting in that we could only send a single field. And, it required the consumer to know that the presence of a key in the map implied the existence of a following bytestring value. This commit changes the encoding strategy so top-level bytestring values in the stream are explicitly denoted in a "fieldsfollowing" key. This key contains an array defining what fields that follow and the expected size of each field. By defining things this way, we can easily send N bytestring values without any ambiguity about their order. In addition, clients only need to know how to parse ``fieldsfollowing`` to know if extra values are present. Because this breaks backwards compatibility, we've bumped the version number of the wire protocol version 2 API endpoint. Differential Revision: https://phab.mercurial-scm.org/D4620
Gregory Szorc - - Load All Authors

File last commit:

r39839:d059cb66 default
r39839:d059cb66 default
Show More
test-wireproto-command-known.t
154 lines | 5.2 KiB | text/troff | Tads3Lexer
/ tests / test-wireproto-command-known.t
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 $ . $TESTDIR/wireprotohelpers.sh
$ hg init server
$ enablehttpv2 server
$ cd server
$ hg debugdrawdag << EOF
> C D
> |/
> B
> |
> A
> EOF
$ hg log -T '{rev}:{node} {desc}\n'
3:be0ef73c17ade3fc89dc41701eb9fc3a91b58282 D
2:26805aba1e600a82e93661149f2313866a221a7b C
1:112478962961147124edd43549aedd1a335e44bf B
0:426bada5c67598ca65036d57d9e4b64b0c1ce7a0 A
$ hg serve -p $HGPORT -d --pid-file hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS
No arguments returns something reasonable
$ sendhttpv2peer << EOF
> command known
> EOF
creating http peer for wire protocol version 2
sending known command
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
 r39839 s> POST /api/exp-http-v2-0002/ro/known HTTP/1.1\r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> Accept-Encoding: identity\r\n
Gregory Szorc
wireprotov2: change command response protocol to include a leading map...
 r37743 s> accept: application/mercurial-exp-framing-0005\r\n
s> content-type: application/mercurial-exp-framing-0005\r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> content-length: 20\r\n
s> host: $LOCALIP:$HGPORT\r\n (glob)
s> user-agent: Mercurial debugwireproto\r\n
s> \r\n
s> \x0c\x00\x00\x01\x00\x01\x01\x11\xa1DnameEknown
s> makefile('rb', None)
s> HTTP/1.1 200 OK\r\n
s> Server: testing stub value\r\n
s> Date: $HTTP_DATE$\r\n
Gregory Szorc
wireprotov2: change command response protocol to include a leading map...
 r37743 s> Content-Type: application/mercurial-exp-framing-0005\r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> Transfer-Encoding: chunked\r\n
s> \r\n
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
 r39595 s> 13\r\n
s> \x0b\x00\x00\x01\x00\x02\x011
s> \xa1FstatusBok
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> \r\n
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
 r39595 received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation)
s> 9\r\n
s> \x01\x00\x00\x01\x00\x02\x001
s> @
s> \r\n
received frame(size=1; request=1; stream=2; streamflags=; type=command-response; flags=continuation)
s> 8\r\n
s> \x00\x00\x00\x01\x00\x02\x002
s> \r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> 0\r\n
s> \r\n
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
 r39595 received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
Gregory Szorc
wireprotov2: decode responses to their expected types...
 r37739 response: []
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504
Single known node works
$ sendhttpv2peer << EOF
> command known
> nodes eval:[b'\x42\x6b\xad\xa5\xc6\x75\x98\xca\x65\x03\x6d\x57\xd9\xe4\xb6\x4b\x0c\x1c\xe7\xa0']
> EOF
creating http peer for wire protocol version 2
sending known command
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
 r39839 s> POST /api/exp-http-v2-0002/ro/known HTTP/1.1\r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> Accept-Encoding: identity\r\n
Gregory Szorc
wireprotov2: change command response protocol to include a leading map...
 r37743 s> accept: application/mercurial-exp-framing-0005\r\n
s> content-type: application/mercurial-exp-framing-0005\r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> content-length: 54\r\n
s> host: $LOCALIP:$HGPORT\r\n (glob)
s> user-agent: Mercurial debugwireproto\r\n
s> \r\n
s> .\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1Enodes\x81TBk\xad\xa5\xc6u\x98\xcae\x03mW\xd9\xe4\xb6K\x0c\x1c\xe7\xa0DnameEknown
s> makefile('rb', None)
s> HTTP/1.1 200 OK\r\n
s> Server: testing stub value\r\n
s> Date: $HTTP_DATE$\r\n
Gregory Szorc
wireprotov2: change command response protocol to include a leading map...
 r37743 s> Content-Type: application/mercurial-exp-framing-0005\r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> Transfer-Encoding: chunked\r\n
s> \r\n
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
 r39595 s> 13\r\n
s> \x0b\x00\x00\x01\x00\x02\x011
s> \xa1FstatusBok
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> \r\n
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
 r39595 received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation)
s> a\r\n
s> \x02\x00\x00\x01\x00\x02\x001
s> A1
s> \r\n
received frame(size=2; request=1; stream=2; streamflags=; type=command-response; flags=continuation)
s> 8\r\n
s> \x00\x00\x00\x01\x00\x02\x002
s> \r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> 0\r\n
s> \r\n
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
 r39595 received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
Gregory Szorc
stringutil: teach pprint() to indent...
 r39414 response: [
True
]
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504
Multiple nodes works
$ sendhttpv2peer << EOF
> command known
> nodes eval:[b'\x42\x6b\xad\xa5\xc6\x75\x98\xca\x65\x03\x6d\x57\xd9\xe4\xb6\x4b\x0c\x1c\xe7\xa0', b'00000000000000000000', b'\x11\x24\x78\x96\x29\x61\x14\x71\x24\xed\xd4\x35\x49\xae\xdd\x1a\x33\x5e\x44\xbf']
> EOF
creating http peer for wire protocol version 2
sending known command
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
 r39839 s> POST /api/exp-http-v2-0002/ro/known HTTP/1.1\r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> Accept-Encoding: identity\r\n
Gregory Szorc
wireprotov2: change command response protocol to include a leading map...
 r37743 s> accept: application/mercurial-exp-framing-0005\r\n
s> content-type: application/mercurial-exp-framing-0005\r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> content-length: 96\r\n
s> host: $LOCALIP:$HGPORT\r\n (glob)
s> user-agent: Mercurial debugwireproto\r\n
s> \r\n
s> X\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1Enodes\x83TBk\xad\xa5\xc6u\x98\xcae\x03mW\xd9\xe4\xb6K\x0c\x1c\xe7\xa0T00000000000000000000T\x11$x\x96)a\x14q$\xed\xd45I\xae\xdd\x1a3^D\xbfDnameEknown
s> makefile('rb', None)
s> HTTP/1.1 200 OK\r\n
s> Server: testing stub value\r\n
s> Date: $HTTP_DATE$\r\n
Gregory Szorc
wireprotov2: change command response protocol to include a leading map...
 r37743 s> Content-Type: application/mercurial-exp-framing-0005\r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> Transfer-Encoding: chunked\r\n
s> \r\n
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
 r39595 s> 13\r\n
s> \x0b\x00\x00\x01\x00\x02\x011
s> \xa1FstatusBok
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> \r\n
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
 r39595 received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation)
s> c\r\n
s> \x04\x00\x00\x01\x00\x02\x001
s> C101
s> \r\n
received frame(size=4; request=1; stream=2; streamflags=; type=command-response; flags=continuation)
s> 8\r\n
s> \x00\x00\x00\x01\x00\x02\x002
s> \r\n
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504 s> 0\r\n
s> \r\n
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
 r39595 received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
Gregory Szorc
stringutil: teach pprint() to indent...
 r39414 response: [
True,
False,
True
]
Gregory Szorc
wireproto: port keep command to wire protocol v2...
 r37504
$ cat error.log