wireproto: port keep command to wire protocol v2
This is pretty straightforward.
Differential Revision: https://phab.mercurial-scm.org/D3180
--- a/mercurial/help/internals/wireprotocol.txt Wed Mar 28 14:55:13 2018 -0700
+++ b/mercurial/help/internals/wireprotocol.txt Wed Mar 28 15:44:47 2018 -0700
@@ -1686,3 +1686,19 @@
changesets satisfied the request.
TODO consider exposing phase of heads in response
+
+known
+-----
+
+Determine whether a series of changeset nodes is known to the server.
+
+The command accepts the following arguments:
+
+nodes
+ (array of bytestrings) List of changeset nodes whose presence to
+ query.
+
+The response is a bytestring where each byte contains a 0 or 1 for the
+corresponding requested node at the same index.
+
+TODO use a bit array for even more compact response
--- a/mercurial/wireproto.py Wed Mar 28 14:55:13 2018 -0700
+++ b/mercurial/wireproto.py Wed Mar 28 15:44:47 2018 -0700
@@ -1041,7 +1041,8 @@
success = 0
return wireprototypes.bytesresponse('%d %s\n' % (success, r))
-@wireprotocommand('known', 'nodes *', permission='pull')
+@wireprotocommand('known', 'nodes *', permission='pull',
+ transportpolicy=POLICY_V1_ONLY)
def known(repo, proto, nodes, others):
v = ''.join(b and '1' or '0' for b in repo.known(decodelist(nodes)))
return wireprototypes.bytesresponse(v)
@@ -1215,3 +1216,10 @@
repo = repo.filtered('immutable')
return wireprototypes.cborresponse(repo.heads())
+
+@wireprotocommand('known', 'nodes', permission='pull',
+ transportpolicy=POLICY_V2_ONLY)
+def knownv2(repo, proto, nodes=None):
+ nodes = nodes or []
+ result = b''.join(b'1' if n else b'0' for n in repo.known(nodes))
+ return wireprototypes.cborresponse(result)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-wireproto-command-known.t Wed Mar 28 15:44:47 2018 -0700
@@ -0,0 +1,121 @@
+ $ . $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
+ s> POST /api/exp-http-v2-0001/ro/known HTTP/1.1\r\n
+ s> Accept-Encoding: identity\r\n
+ s> accept: application/mercurial-exp-framing-0003\r\n
+ s> content-type: application/mercurial-exp-framing-0003\r\n
+ 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
+ s> Content-Type: application/mercurial-exp-framing-0003\r\n
+ s> Transfer-Encoding: chunked\r\n
+ s> \r\n
+ s> 9\r\n
+ s> \x01\x00\x00\x01\x00\x02\x01F
+ s> @
+ s> \r\n
+ received frame(size=1; request=1; stream=2; streamflags=stream-begin; type=bytes-response; flags=eos|cbor)
+ s> 0\r\n
+ s> \r\n
+ response: []
+
+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
+ s> POST /api/exp-http-v2-0001/ro/known HTTP/1.1\r\n
+ s> Accept-Encoding: identity\r\n
+ s> accept: application/mercurial-exp-framing-0003\r\n
+ s> content-type: application/mercurial-exp-framing-0003\r\n
+ 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
+ s> Content-Type: application/mercurial-exp-framing-0003\r\n
+ s> Transfer-Encoding: chunked\r\n
+ s> \r\n
+ s> a\r\n
+ s> \x02\x00\x00\x01\x00\x02\x01F
+ s> A1
+ s> \r\n
+ received frame(size=2; request=1; stream=2; streamflags=stream-begin; type=bytes-response; flags=eos|cbor)
+ s> 0\r\n
+ s> \r\n
+ response: [b'1']
+
+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
+ s> POST /api/exp-http-v2-0001/ro/known HTTP/1.1\r\n
+ s> Accept-Encoding: identity\r\n
+ s> accept: application/mercurial-exp-framing-0003\r\n
+ s> content-type: application/mercurial-exp-framing-0003\r\n
+ 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
+ s> Content-Type: application/mercurial-exp-framing-0003\r\n
+ s> Transfer-Encoding: chunked\r\n
+ s> \r\n
+ s> c\r\n
+ s> \x04\x00\x00\x01\x00\x02\x01F
+ s> C101
+ s> \r\n
+ received frame(size=4; request=1; stream=2; streamflags=stream-begin; type=bytes-response; flags=eos|cbor)
+ s> 0\r\n
+ s> \r\n
+ response: [b'101']
+
+ $ cat error.log