wireproto: port listkeys commands to wire protocol v2
Differential Revision: https://phab.mercurial-scm.org/D3181
--- a/mercurial/help/internals/wireprotocol.txt Wed Mar 28 15:44:47 2018 -0700
+++ b/mercurial/help/internals/wireprotocol.txt Wed Mar 28 16:00:02 2018 -0700
@@ -1702,3 +1702,17 @@
corresponding requested node at the same index.
TODO use a bit array for even more compact response
+
+listkeys
+--------
+
+List values in a specified ``pushkey`` namespace.
+
+The command receives the following arguments:
+
+namespace
+ (bytestring) Pushkey namespace to query.
+
+The response is a map with bytestring keys and values.
+
+TODO consider using binary to represent nodes in certain pushkey namespaces.
--- a/mercurial/wireproto.py Wed Mar 28 15:44:47 2018 -0700
+++ b/mercurial/wireproto.py Wed Mar 28 16:00:02 2018 -0700
@@ -1024,7 +1024,8 @@
caps = capabilities(repo, proto).data
return wireprototypes.bytesresponse('capabilities: %s\n' % caps)
-@wireprotocommand('listkeys', 'namespace', permission='pull')
+@wireprotocommand('listkeys', 'namespace', permission='pull',
+ transportpolicy=POLICY_V1_ONLY)
def listkeys(repo, proto, namespace):
d = sorted(repo.listkeys(encoding.tolocal(namespace)).items())
return wireprototypes.bytesresponse(pushkeymod.encodekeys(d))
@@ -1223,3 +1224,12 @@
nodes = nodes or []
result = b''.join(b'1' if n else b'0' for n in repo.known(nodes))
return wireprototypes.cborresponse(result)
+
+@wireprotocommand('listkeys', 'namespace', permission='pull',
+ transportpolicy=POLICY_V2_ONLY)
+def listkeysv2(repo, proto, namespace=None):
+ keys = repo.listkeys(encoding.tolocal(namespace))
+ keys = {encoding.fromlocal(k): encoding.fromlocal(v)
+ for k, v in keys.iteritems()}
+
+ return wireprototypes.cborresponse(keys)
--- a/tests/test-http-api-httpv2.t Wed Mar 28 15:44:47 2018 -0700
+++ b/tests/test-http-api-httpv2.t Wed Mar 28 16:00:02 2018 -0700
@@ -509,13 +509,11 @@
s> Content-Type: application/mercurial-exp-framing-0003\r\n
s> Transfer-Encoding: chunked\r\n
s> \r\n
- s> 26\r\n
- s> \x1e\x00\x00\x03\x00\x02\x01Bbookmarks\t\n
- s> namespaces\t\n
- s> phases\t
+ s> 28\r\n
+ s> \x00\x00\x03\x00\x02\x01F\xa3Fphases@Ibookmarks@Jnamespaces@
s> \r\n
- s> 8\r\n
- s> \x00\x00\x00\x01\x00\x02\x00B
+ s> 9\r\n
+ s> \x01\x00\x00\x01\x00\x02\x00F\xa0
s> \r\n
s> 0\r\n
s> \r\n
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-wireproto-command-listkeys.t Wed Mar 28 16:00:02 2018 -0700
@@ -0,0 +1,125 @@
+ $ . $TESTDIR/wireprotohelpers.sh
+
+ $ hg init server
+ $ enablehttpv2 server
+ $ cd server
+ $ hg debugdrawdag << EOF
+ > C D
+ > |/
+ > B
+ > |
+ > A
+ > EOF
+
+ $ hg phase --public -r C
+ $ hg book -r C @
+
+ $ 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
+
+Request for namespaces works
+
+ $ sendhttpv2peer << EOF
+ > command listkeys
+ > namespace namespaces
+ > EOF
+ creating http peer for wire protocol version 2
+ sending listkeys command
+ s> POST /api/exp-http-v2-0001/ro/listkeys 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: 50\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\xa1InamespaceJnamespacesDnameHlistkeys
+ 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> 28\r\n
+ s> \x00\x00\x01\x00\x02\x01F
+ s> \xa3Fphases@Ibookmarks@Jnamespaces@
+ s> \r\n
+ received frame(size=32; request=1; stream=2; streamflags=stream-begin; type=bytes-response; flags=eos|cbor)
+ s> 0\r\n
+ s> \r\n
+ response: [{b'bookmarks': b'', b'namespaces': b'', b'phases': b''}]
+
+Request for phases works
+
+ $ sendhttpv2peer << EOF
+ > command listkeys
+ > namespace phases
+ > EOF
+ creating http peer for wire protocol version 2
+ sending listkeys command
+ s> POST /api/exp-http-v2-0001/ro/listkeys 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: 46\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\xa1InamespaceFphasesDnameHlistkeys
+ 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> 45\r\n
+ s> =\x00\x00\x01\x00\x02\x01F
+ s> \xa2JpublishingDTrueX(be0ef73c17ade3fc89dc41701eb9fc3a91b58282A1
+ s> \r\n
+ received frame(size=61; request=1; stream=2; streamflags=stream-begin; type=bytes-response; flags=eos|cbor)
+ s> 0\r\n
+ s> \r\n
+ response: [{b'be0ef73c17ade3fc89dc41701eb9fc3a91b58282': b'1', b'publishing': b'True'}]
+
+Request for bookmarks works
+
+ $ sendhttpv2peer << EOF
+ > command listkeys
+ > namespace bookmarks
+ > EOF
+ creating http peer for wire protocol version 2
+ sending listkeys command
+ s> POST /api/exp-http-v2-0001/ro/listkeys 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: 49\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\xa1InamespaceIbookmarksDnameHlistkeys
+ 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> 35\r\n
+ s> -\x00\x00\x01\x00\x02\x01F
+ s> \xa1A@X(26805aba1e600a82e93661149f2313866a221a7b
+ s> \r\n
+ received frame(size=45; request=1; stream=2; streamflags=stream-begin; type=bytes-response; flags=eos|cbor)
+ s> 0\r\n
+ s> \r\n
+ response: [{b'@': b'26805aba1e600a82e93661149f2313866a221a7b'}]
+
+ $ cat error.log