diff --git a/tests/test-http-api-httpv2.t b/tests/test-http-api-httpv2.t --- a/tests/test-http-api-httpv2.t +++ b/tests/test-http-api-httpv2.t @@ -188,7 +188,7 @@ s> 0\r\n s> \r\n - $ sendhttpv2peer << EOF + $ sendhttpv2peerverbose << EOF > command customreadonly > EOF creating http peer for wire protocol version 2 diff --git a/tests/test-wireproto-caching.t b/tests/test-wireproto-caching.t --- a/tests/test-wireproto-caching.t +++ b/tests/test-wireproto-caching.t @@ -55,38 +55,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 83\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> K\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x81GparentsEnodes\x81T\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&ADtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 63\r\n - s> [\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2DnodeT\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&AGparents\x82T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 - s> \r\n - received frame(size=91; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -99,7 +67,6 @@ ] } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ sendhttpv2peer << EOF > command manifestdata @@ -109,38 +76,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 83\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> K\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x81GparentsEnodes\x81T\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&ADtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 63\r\n - s> [\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2DnodeT\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&AGparents\x82T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 - s> \r\n - received frame(size=91; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -153,7 +88,6 @@ ] } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Sending different request doesn't yield cache hit. @@ -165,38 +99,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 104\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\xa3Ffields\x81GparentsEnodes\x82T\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&AT\xa9\x88\xfbCX>\x87\x1d\x1e\xd5u\x0e\xe0t\xc6\xd8@\xbb\xbf\xc8Dtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> b1\r\n - s> \xa9\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x02\xa2DnodeT\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&AGparents\x82T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa2DnodeT\xa9\x88\xfbCX>\x87\x1d\x1e\xd5u\x0e\xe0t\xc6\xd8@\xbb\xbf\xc8Gparents\x82T\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&AT\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 - s> \r\n - received frame(size=169; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 2 @@ -216,7 +118,6 @@ ] } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat .hg/blackbox.log *> cacher constructed for manifestdata (glob) @@ -251,38 +152,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 83\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> K\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x81GparentsEnodes\x81T\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&ADtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 63\r\n - s> [\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2DnodeT\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&AGparents\x82T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 - s> \r\n - received frame(size=91; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -295,7 +164,6 @@ ] } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ sendhttpv2peer << EOF > command manifestdata @@ -305,38 +173,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 83\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> K\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x81GparentsEnodes\x81T\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&ADtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 63\r\n - s> [\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2DnodeT\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&AGparents\x82T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 - s> \r\n - received frame(size=91; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -349,7 +185,6 @@ ] } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat .hg/blackbox.log *> cacher constructed for manifestdata (glob) @@ -372,38 +207,6 @@ > EOF creating http peer for wire protocol version 2 sending capabilities command - s> POST /api/exp-http-v2-0002/ro/capabilities HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 27\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> \x13\x00\x00\x01\x00\x01\x01\x11\xa1DnameLcapabilities - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 52b\r\n - s> #\x05\x00\x01\x00\x02\x001 - s> \xa5Hcommands\xaaIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullMchangesetdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84IbookmarksGparentsEphaseHrevisionInoderange\xa3Gdefault\xf6Hrequired\xf4DtypeDlistEnodes\xa3Gdefault\xf6Hrequired\xf4DtypeDlistJnodesdepth\xa3Gdefault\xf6Hrequired\xf4DtypeCintKpermissions\x81DpullHfiledata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDpath\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullEheads\xa2Dargs\xa1Jpubliconly\xa3Gdefault\xf4Hrequired\xf4DtypeDboolKpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\xa3Gdefault\x80Hrequired\xf4DtypeDlistKpermissions\x81DpullHlistkeys\xa2Dargs\xa1Inamespace\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullFlookup\xa2Dargs\xa1Ckey\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullLmanifestdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDtree\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullGpushkey\xa2Dargs\xa4Ckey\xa2Hrequired\xf5DtypeEbytesInamespace\xa2Hrequired\xf5DtypeEbytesCnew\xa2Hrequired\xf5DtypeEbytesCold\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpushKcompression\x82\xa1DnameDzstd\xa1DnameDzlibQframingmediatypes\x81X&application/mercurial-exp-framing-0005Rpathfilterprefixes\xd9\x01\x02\x82Epath:Lrootfilesin:Nrawrepoformats\x82LgeneraldeltaHrevlogv1 - s> \r\n - received frame(size=1315; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'commands': { @@ -601,7 +404,6 @@ ] } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ test -f .hg/blackbox.log [1] @@ -616,29 +418,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 83\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> K\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x81GparentsEnodes\x81T\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaaDtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 51\r\n - s> I\x00\x00\x01\x00\x02\x012 - s> \xa2Eerror\xa2Dargs\x81T\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaaGmessagePunknown node: %sFstatusEerror - s> \r\n - received frame(size=73; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) - s> 0\r\n - s> \r\n abort: unknown node: \xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa! (esc) [255] diff --git a/tests/test-wireproto-command-branchmap.t b/tests/test-wireproto-command-branchmap.t --- a/tests/test-wireproto-command-branchmap.t +++ b/tests/test-wireproto-command-branchmap.t @@ -43,39 +43,6 @@ > EOF creating http peer for wire protocol version 2 sending branchmap command - s> POST /api/exp-http-v2-0002/ro/branchmap HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 24\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> \x10\x00\x00\x01\x00\x01\x01\x11\xa1DnameIbranchmap - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 78\r\n - s> p\x00\x00\x01\x00\x02\x001 - s> \xa3Gbranch1\x81T\xb5\xfa\xac\xdf\xd2c7h\xcb1R3l\xc0\x953\x81&f\x88Gbranch2\x81T"Aa\xc7X\x9a\xa4\x8f\xa8:H\xfe\xff^\x95\xb5j\xe3\'\xfcGdefault\x82T&\x80Z\xba\x1e`\n - s> \x82\xe96a\x14\x9f#\x13\x86j"\x1a{T\xbe\x0e\xf7<\x17\xad\xe3\xfc\x89\xdcAp\x1e\xb9\xfc:\x91\xb5\x82\x82 - s> \r\n - received frame(size=112; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: { b'branch1': [ b'\xb5\xfa\xac\xdf\xd2c7h\xcb1R3l\xc0\x953\x81&f\x88' @@ -88,6 +55,5 @@ b'\xbe\x0e\xf7<\x17\xad\xe3\xfc\x89\xdcAp\x1e\xb9\xfc:\x91\xb5\x82\x82' ] } - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat error.log diff --git a/tests/test-wireproto-command-changesetdata.t b/tests/test-wireproto-command-changesetdata.t --- a/tests/test-wireproto-command-changesetdata.t +++ b/tests/test-wireproto-command-changesetdata.t @@ -44,29 +44,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 28\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> \x14\x00\x00\x01\x00\x01\x01\x11\xa1DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 49\r\n - s> A\x00\x00\x01\x00\x02\x012 - s> \xa2Eerror\xa1GmessageX"noderange or nodes must be definedFstatusEerror - s> \r\n - received frame(size=65; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) - s> 0\r\n - s> \r\n abort: noderange or nodes must be defined! [255] @@ -78,29 +55,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 47\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\xa1Inoderange\x82\x80\x80DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 51\r\n - s> I\x00\x00\x01\x00\x02\x012 - s> \xa2Eerror\xa1GmessageX*heads in noderange request cannot be emptyFstatusEerror - s> \r\n - received frame(size=73; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) - s> 0\r\n - s> \r\n abort: heads in noderange request cannot be empty! [255] @@ -113,29 +67,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 69\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\xa2Inoderange\x82\x80\x81GignoredJnodesdepthB42DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 4d\r\n - s> E\x00\x00\x01\x00\x02\x012 - s> \xa2Eerror\xa1GmessageX&nodesdepth requires the nodes argumentFstatusEerror - s> \r\n - received frame(size=69; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) - s> 0\r\n - s> \r\n abort: nodesdepth requires the nodes argument! [255] @@ -147,38 +78,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 89\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> Q\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1Inoderange\x82\x80\x82T\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 81\r\n - s> y\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x04\xa1DnodeT3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:\xa1DnodeTu\x92\x91~\x1c>\x82g|\xb0\xa4\xbcq\\\xa2]\xd1-(\xc1\xa1DnodeT\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xdd\xa1DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11 - s> \r\n - received frame(size=121; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 4 @@ -196,7 +95,6 @@ b'node': b'\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Sending root nodes limits what data is sent @@ -206,38 +104,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 89\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> Q\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1Inoderange\x82\x81T3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:\x81T\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddDnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 4b\r\n - s> C\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x02\xa1DnodeTu\x92\x91~\x1c>\x82g|\xb0\xa4\xbcq\\\xa2]\xd1-(\xc1\xa1DnodeT\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xdd - s> \r\n - received frame(size=67; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 2 @@ -249,7 +115,6 @@ b'node': b'\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xdd' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Requesting data on a single node by node works @@ -259,38 +124,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 62\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> 6\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1Enodes\x81T3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 30\r\n - s> (\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa1DnodeT3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01: - s> \r\n - received frame(size=40; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -299,7 +132,6 @@ b'node': b'3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Specifying a noderange and nodes takes union @@ -310,38 +142,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 117\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> m\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Inoderange\x82\x81Tu\x92\x91~\x1c>\x82g|\xb0\xa4\xbcq\\\xa2]\xd1-(\xc1\x81T\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddEnodes\x81T\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 4b\r\n - s> C\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x02\xa1DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11\xa1DnodeT\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xdd - s> \r\n - received frame(size=67; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 2 @@ -353,7 +153,6 @@ b'node': b'\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xdd' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) nodesdepth of 1 limits to exactly requested nodes @@ -364,38 +163,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 74\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> B\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Enodes\x81T\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11Jnodesdepth\x01DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 30\r\n - s> (\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa1DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11 - s> \r\n - received frame(size=40; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -404,7 +171,6 @@ b'node': b'\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) nodesdepth of 2 limits to first ancestor @@ -415,38 +181,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 74\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> B\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Enodes\x81T\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11Jnodesdepth\x02DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 4b\r\n - s> C\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x02\xa1DnodeT3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:\xa1DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11 - s> \r\n - received frame(size=67; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 2 @@ -458,7 +192,6 @@ b'node': b'\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) nodesdepth with multiple nodes @@ -469,38 +202,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 95\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> W\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Enodes\x82T\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11T\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddJnodesdepth\x02DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 81\r\n - s> y\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x04\xa1DnodeT3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:\xa1DnodeTu\x92\x91~\x1c>\x82g|\xb0\xa4\xbcq\\\xa2]\xd1-(\xc1\xa1DnodeT\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xdd\xa1DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11 - s> \r\n - received frame(size=121; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 4 @@ -518,7 +219,6 @@ b'node': b'\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Parents data is transferred upon request @@ -529,38 +229,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 78\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> F\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Ffields\x81GparentsEnodes\x81T\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 63\r\n - s> [\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11Gparents\x82T3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 - s> \r\n - received frame(size=91; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -573,7 +241,6 @@ ] } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Phase data is transferred upon request @@ -584,38 +251,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 76\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> D\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Ffields\x81EphaseEnodes\x81T\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddDnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 3d\r\n - s> 5\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2DnodeT\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddEphaseFpublic - s> \r\n - received frame(size=53; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -625,7 +260,6 @@ b'phase': b'public' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Revision data is transferred upon request @@ -636,43 +270,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 79\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> G\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Ffields\x81HrevisionEnodes\x81T\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 8c\r\n - s> \x84\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2Ofieldsfollowing\x81\x82Hrevision\x18=DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11X=1b74476799ec8318045db759b1b4bcc9b839d0aa\n - s> test\n - s> 0 0\n - s> a\n - s> \n - s> commit 3 - s> \r\n - received frame(size=132; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -688,7 +285,6 @@ }, b'1b74476799ec8318045db759b1b4bcc9b839d0aa\ntest\n0 0\na\n\ncommit 3' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Bookmarks key isn't present if no bookmarks data @@ -699,38 +295,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 107\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> c\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Ffields\x81IbookmarksInoderange\x82\x80\x82T\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 81\r\n - s> y\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x04\xa1DnodeT3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:\xa1DnodeTu\x92\x91~\x1c>\x82g|\xb0\xa4\xbcq\\\xa2]\xd1-(\xc1\xa1DnodeT\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xdd\xa1DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11 - s> \r\n - received frame(size=121; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 4 @@ -748,7 +312,6 @@ b'node': b'\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Bookmarks are sent when requested @@ -763,38 +326,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 107\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> c\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Ffields\x81IbookmarksInoderange\x82\x80\x82T\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> ac\r\n - s> \xa4\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x04\xa1DnodeT3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:\xa1DnodeTu\x92\x91~\x1c>\x82g|\xb0\xa4\xbcq\\\xa2]\xd1-(\xc1\xa2Ibookmarks\x81Fbook-1DnodeT\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xdd\xa2Ibookmarks\x82Fbook-2Fbook-3DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11 - s> \r\n - received frame(size=164; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 4 @@ -819,7 +350,6 @@ b'node': b'\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Bookmarks are sent when we make a no-new-revisions request @@ -830,49 +360,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 137\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> \x81\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Ffields\x82IbookmarksHrevisionInoderange\x82\x81T\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11\x82T\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 14b\r\n - s> C\x01\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x02\xa2Ofieldsfollowing\x81\x82Hrevision\x18?DnodeTu\x92\x91~\x1c>\x82g|\xb0\xa4\xbcq\\\xa2]\xd1-(\xc1X?7f144aea0ba742713887b564d57e9d12f12ff382\n - s> test\n - s> 0 0\n - s> a\n - s> b\n - s> \n - s> commit 1\xa3Ibookmarks\x81Fbook-1Ofieldsfollowing\x81\x82Hrevision\x18=DnodeT\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddX=37f0a2d1c28ffe4b879109a7d1bbf8f07b3c763b\n - s> test\n - s> 0 0\n - s> b\n - s> \n - s> commit 2\xa2Ibookmarks\x82Fbook-2Fbook-3DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11 - s> \r\n - received frame(size=323; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 2 @@ -908,7 +395,6 @@ b'node': b'\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Multiple fields can be transferred @@ -919,43 +405,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 87\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> O\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Ffields\x82GparentsHrevisionEnodes\x81T\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> bf\r\n - s> \xb7\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa3Ofieldsfollowing\x81\x82Hrevision\x18=DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11Gparents\x82T3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00X=1b74476799ec8318045db759b1b4bcc9b839d0aa\n - s> test\n - s> 0 0\n - s> a\n - s> \n - s> commit 3 - s> \r\n - received frame(size=183; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -975,7 +424,6 @@ }, b'1b74476799ec8318045db759b1b4bcc9b839d0aa\ntest\n0 0\na\n\ncommit 3' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Base nodes have just their metadata (e.g. phase) transferred @@ -986,54 +434,6 @@ > EOF creating http peer for wire protocol version 2 sending changesetdata command - s> POST /api/exp-http-v2-0002/ro/changesetdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 141\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> \x85\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Ffields\x83EphaseGparentsHrevisionInoderange\x82\x81T3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:\x82T\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11DnameMchangesetdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 263\r\n - s> [\x02\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x03\xa2DnodeT3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:EphaseFpublic\xa4Ofieldsfollowing\x81\x82Hrevision\x18?DnodeTu\x92\x91~\x1c>\x82g|\xb0\xa4\xbcq\\\xa2]\xd1-(\xc1Gparents\x82T3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00EphaseFpublicX?7f144aea0ba742713887b564d57e9d12f12ff382\n - s> test\n - s> 0 0\n - s> a\n - s> b\n - s> \n - s> commit 1\xa4Ofieldsfollowing\x81\x82Hrevision\x18=DnodeT\x0b\xb8\xad\x89J\x15\xb1S\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f*K(\xddGparents\x82Tu\x92\x91~\x1c>\x82g|\xb0\xa4\xbcq\\\xa2]\xd1-(\xc1T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00EphaseFpublicX=37f0a2d1c28ffe4b879109a7d1bbf8f07b3c763b\n - s> test\n - s> 0 0\n - s> b\n - s> \n - s> commit 2\xa4Ofieldsfollowing\x81\x82Hrevision\x18=DnodeT\xea\xe5\xf8,.b#h\xd2}\xae\xcbv\xb7\xe3\x93\xd0\xf2B\x11Gparents\x82T3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00EphaseEdraftX=1b74476799ec8318045db759b1b4bcc9b839d0aa\n - s> test\n - s> 0 0\n - s> a\n - s> \n - s> commit 3 - s> \r\n - received frame(size=603; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 3 @@ -1088,6 +488,5 @@ }, b'1b74476799ec8318045db759b1b4bcc9b839d0aa\ntest\n0 0\na\n\ncommit 3' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat error.log diff --git a/tests/test-wireproto-command-filedata.t b/tests/test-wireproto-command-filedata.t --- a/tests/test-wireproto-command-filedata.t +++ b/tests/test-wireproto-command-filedata.t @@ -57,29 +57,6 @@ > EOF creating http peer for wire protocol version 2 sending filedata command - s> POST /api/exp-http-v2-0002/ro/filedata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 23\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> \x0f\x00\x00\x01\x00\x01\x01\x11\xa1DnameHfiledata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 4e\r\n - s> F\x00\x00\x01\x00\x02\x012 - s> \xa2Eerror\xa1GmessageX\'missing required arguments: nodes, pathFstatusEerror - s> \r\n - received frame(size=70; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) - s> 0\r\n - s> \r\n abort: missing required arguments: nodes, path! [255] @@ -89,29 +66,6 @@ > EOF creating http peer for wire protocol version 2 sending filedata command - s> POST /api/exp-http-v2-0002/ro/filedata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 36\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> \x1c\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1Enodes\x80DnameHfiledata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 47\r\n - s> ?\x00\x00\x01\x00\x02\x012 - s> \xa2Eerror\xa1GmessageX missing required arguments: pathFstatusEerror - s> \r\n - received frame(size=63; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) - s> 0\r\n - s> \r\n abort: missing required arguments: path! [255] @@ -124,29 +78,6 @@ > EOF creating http peer for wire protocol version 2 sending filedata command - s> POST /api/exp-http-v2-0002/ro/filedata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 64\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> 8\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Enodes\x81T\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaaDpathAaDnameHfiledata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 6b\r\n - s> c\x00\x00\x01\x00\x02\x012 - s> \xa2Eerror\xa2Dargs\x81X(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGmessageUunknown file node: %sFstatusEerror - s> \r\n - received frame(size=99; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) - s> 0\r\n - s> \r\n abort: unknown file node: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! [255] @@ -159,40 +90,6 @@ > EOF creating http peer for wire protocol version 2 sending filedata command - s> POST /api/exp-http-v2-0002/ro/filedata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 64\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> 8\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa2Enodes\x81T\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11DpathAaDnameHfiledata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 30\r\n - s> (\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa1DnodeT\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11 - s> \r\n - received frame(size=40; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -201,7 +98,6 @@ b'node': b'\n\x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Requesting parents works @@ -213,40 +109,6 @@ > EOF creating http peer for wire protocol version 2 sending filedata command - s> POST /api/exp-http-v2-0002/ro/filedata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 80\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> H\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x81GparentsEnodes\x81T\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11DpathAaDnameHfiledata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 63\r\n - s> [\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2DnodeT\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11Gparents\x82Td\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 - s> \r\n - received frame(size=91; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -259,7 +121,6 @@ ] } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Requesting revision data works (haveparents defaults to False, so fulltext is emitted) @@ -272,43 +133,6 @@ > EOF creating http peer for wire protocol version 2 sending filedata command - s> POST /api/exp-http-v2-0002/ro/filedata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 81\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> I\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x81HrevisionEnodes\x81T\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11DpathAaDnameHfiledata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> a3\r\n - s> \x9b\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2Ofieldsfollowing\x81\x82Hrevision\x18TDnodeT\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11XTa0\n - s> 00000000000000000000000000000000000000\n - s> 11111111111111111111111111111111111111\n - s> a1\n - s> \r\n - received frame(size=155; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -324,7 +148,6 @@ }, b'a0\n00000000000000000000000000000000000000\n11111111111111111111111111111111111111\na1\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) haveparents=False should be same as above @@ -337,43 +160,6 @@ > EOF creating http peer for wire protocol version 2 sending filedata command - s> POST /api/exp-http-v2-0002/ro/filedata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 94\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> V\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa4Ffields\x81HrevisionKhaveparents\xf4Enodes\x81T\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11DpathAaDnameHfiledata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> a3\r\n - s> \x9b\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2Ofieldsfollowing\x81\x82Hrevision\x18TDnodeT\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11XTa0\n - s> 00000000000000000000000000000000000000\n - s> 11111111111111111111111111111111111111\n - s> a1\n - s> \r\n - received frame(size=155; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -389,7 +175,6 @@ }, b'a0\n00000000000000000000000000000000000000\n11111111111111111111111111111111111111\na1\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) haveparents=True should emit a delta @@ -402,40 +187,6 @@ > EOF creating http peer for wire protocol version 2 sending filedata command - s> POST /api/exp-http-v2-0002/ro/filedata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 94\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> V\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa4Ffields\x81HrevisionKhaveparents\xf5Enodes\x81T\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11DpathAaDnameHfiledata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 7c\r\n - s> t\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa3MdeltabasenodeTd\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9Ofieldsfollowing\x81\x82Edelta\x0fDnodeT\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11O\x00\x00\x00Q\x00\x00\x00Q\x00\x00\x00\x03a1\n - s> \r\n - received frame(size=116; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -452,7 +203,6 @@ }, b'\x00\x00\x00Q\x00\x00\x00Q\x00\x00\x00\x03a1\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Requesting multiple revisions works (first revision is a fulltext since haveparents=False by default) @@ -465,43 +215,6 @@ > EOF creating http peer for wire protocol version 2 sending filedata command - s> POST /api/exp-http-v2-0002/ro/filedata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 102\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\xa3Ffields\x81HrevisionEnodes\x82Td\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9T\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11DpathAaDnameHfiledata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 107\r\n - s> \xff\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x02\xa2Ofieldsfollowing\x81\x82Hrevision\x18QDnodeTd\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9XQa0\n - s> 00000000000000000000000000000000000000\n - s> 11111111111111111111111111111111111111\n - s> \xa3MdeltabasenodeTd\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9Ofieldsfollowing\x81\x82Edelta\x0fDnodeT\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11O\x00\x00\x00Q\x00\x00\x00Q\x00\x00\x00\x03a1\n - s> \r\n - received frame(size=255; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 2 @@ -528,7 +241,6 @@ }, b'\x00\x00\x00Q\x00\x00\x00Q\x00\x00\x00\x03a1\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Revisions are sorted by DAG order, parents first @@ -540,43 +252,6 @@ > EOF creating http peer for wire protocol version 2 sending filedata command - s> POST /api/exp-http-v2-0002/ro/filedata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 102\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\xa3Ffields\x81HrevisionEnodes\x82T\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11Td\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9DpathAaDnameHfiledata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 107\r\n - s> \xff\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x02\xa2Ofieldsfollowing\x81\x82Hrevision\x18QDnodeTd\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9XQa0\n - s> 00000000000000000000000000000000000000\n - s> 11111111111111111111111111111111111111\n - s> \xa3MdeltabasenodeTd\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9Ofieldsfollowing\x81\x82Edelta\x0fDnodeT\n - s> \x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11O\x00\x00\x00Q\x00\x00\x00Q\x00\x00\x00\x03a1\n - s> \r\n - received frame(size=255; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 2 @@ -603,7 +278,6 @@ }, b'\x00\x00\x00Q\x00\x00\x00Q\x00\x00\x00\x03a1\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Requesting parents and revision data works @@ -615,41 +289,6 @@ > EOF creating http peer for wire protocol version 2 sending filedata command - s> POST /api/exp-http-v2-0002/ro/filedata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 89\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> Q\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x82GparentsHrevisionEnodes\x81T~X\x01\xb6\xd5\xf0:ZT\xf3\xc4{X?ug\xaa\xd4>[DpathAaDnameHfiledata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> d6\r\n - s> \xce\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa3Ofieldsfollowing\x81\x82Hrevision\x18TDnodeT~X\x01\xb6\xd5\xf0:ZT\xf3\xc4{X?ug\xaa\xd4>[Gparents\x82Td\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00XTa0\n - s> 00000000000000000000000000000000000000\n - s> 11111111111111111111111111111111111111\n - s> a2\n - s> \r\n - received frame(size=206; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -669,6 +308,5 @@ }, b'a0\n00000000000000000000000000000000000000\n11111111111111111111111111111111111111\na2\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat error.log diff --git a/tests/test-wireproto-command-heads.t b/tests/test-wireproto-command-heads.t --- a/tests/test-wireproto-command-heads.t +++ b/tests/test-wireproto-command-heads.t @@ -35,44 +35,11 @@ > EOF creating http peer for wire protocol version 2 sending heads command - s> POST /api/exp-http-v2-0002/ro/heads HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\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\xa1DnameEheads - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 48\r\n - s> @\x00\x00\x01\x00\x02\x001 - s> \x83T\x1dok\x91\xd4J\xab\xa6\xd5\xe5\x80\xbc0\xa9\x94\x850\xdb\xe0\x0bT\xaeI.6\xb0\xc83\x9f\xfa\xf3(\xd0\x0b\x85\xb4R]\xe1\x16^T)Dm-\xc5A\x9c_\x97Dz\x8b\xc0b\xe4\xcc2\x8b\xf2A - s> \r\n - received frame(size=64; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: [ b'\x1dok\x91\xd4J\xab\xa6\xd5\xe5\x80\xbc0\xa9\x94\x850\xdb\xe0\x0b', b'\xaeI.6\xb0\xc83\x9f\xfa\xf3(\xd0\x0b\x85\xb4R]\xe1\x16^', b')Dm-\xc5A\x9c_\x97Dz\x8b\xc0b\xe4\xcc2\x8b\xf2A' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Requesting just the public heads works @@ -82,41 +49,8 @@ > EOF creating http peer for wire protocol version 2 sending heads command - s> POST /api/exp-http-v2-0002/ro/heads HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 39\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> \x1f\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1JpubliconlyA1DnameEheads - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 1e\r\n - s> \x16\x00\x00\x01\x00\x02\x001 - s> \x81Tx\xd2\xdc\xa46\xb2\xf5\xb1\x88\xac&~)\xb8\x1e\x07&m8\xfc - s> \r\n - received frame(size=22; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: [ b'x\xd2\xdc\xa46\xb2\xf5\xb1\x88\xac&~)\xb8\x1e\x07&m8\xfc' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat error.log diff --git a/tests/test-wireproto-command-known.t b/tests/test-wireproto-command-known.t --- a/tests/test-wireproto-command-known.t +++ b/tests/test-wireproto-command-known.t @@ -27,40 +27,7 @@ > EOF creating http peer for wire protocol version 2 sending known command - s> POST /api/exp-http-v2-0002/ro/known HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: [] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Single known node works @@ -70,42 +37,9 @@ > EOF creating http peer for wire protocol version 2 sending known command - s> POST /api/exp-http-v2-0002/ro/known HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: [ True ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Multiple nodes works @@ -115,43 +49,10 @@ > EOF creating http peer for wire protocol version 2 sending known command - s> POST /api/exp-http-v2-0002/ro/known HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: [ True, False, True ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat error.log diff --git a/tests/test-wireproto-command-listkeys.t b/tests/test-wireproto-command-listkeys.t --- a/tests/test-wireproto-command-listkeys.t +++ b/tests/test-wireproto-command-listkeys.t @@ -31,44 +31,11 @@ > EOF creating http peer for wire protocol version 2 sending listkeys command - s> POST /api/exp-http-v2-0002/ro/listkeys HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 28\r\n - s> \x00\x00\x01\x00\x02\x001 - s> \xa3Ibookmarks@Jnamespaces@Fphases@ - s> \r\n - received frame(size=32; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: { b'bookmarks': b'', b'namespaces': b'', b'phases': b'' } - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Request for phases works @@ -78,43 +45,10 @@ > EOF creating http peer for wire protocol version 2 sending listkeys command - s> POST /api/exp-http-v2-0002/ro/listkeys HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 45\r\n - s> =\x00\x00\x01\x00\x02\x001 - s> \xa2X(be0ef73c17ade3fc89dc41701eb9fc3a91b58282A1JpublishingDTrue - s> \r\n - received frame(size=61; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: { b'be0ef73c17ade3fc89dc41701eb9fc3a91b58282': b'1', b'publishing': b'True' } - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Request for bookmarks works @@ -124,41 +58,8 @@ > EOF creating http peer for wire protocol version 2 sending listkeys command - s> POST /api/exp-http-v2-0002/ro/listkeys HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 35\r\n - s> -\x00\x00\x01\x00\x02\x001 - s> \xa1A@X(26805aba1e600a82e93661149f2313866a221a7b - s> \r\n - received frame(size=45; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: { b'@': b'26805aba1e600a82e93661149f2313866a221a7b' } - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat error.log diff --git a/tests/test-wireproto-command-lookup.t b/tests/test-wireproto-command-lookup.t --- a/tests/test-wireproto-command-lookup.t +++ b/tests/test-wireproto-command-lookup.t @@ -27,39 +27,6 @@ > EOF creating http peer for wire protocol version 2 sending lookup command - s> *\r\n (glob) - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 73\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> A\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa1CkeyX(426bada5c67598ca65036d57d9e4b64b0c1ce7a0DnameFlookup - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 1d\r\n - s> \x15\x00\x00\x01\x00\x02\x001 - s> TBk\xad\xa5\xc6u\x98\xcae\x03mW\xd9\xe4\xb6K\x0c\x1c\xe7\xa0 - s> \r\n - received frame(size=21; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: b'Bk\xad\xa5\xc6u\x98\xcae\x03mW\xd9\xe4\xb6K\x0c\x1c\xe7\xa0' - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat error.log diff --git a/tests/test-wireproto-command-manifestdata.t b/tests/test-wireproto-command-manifestdata.t --- a/tests/test-wireproto-command-manifestdata.t +++ b/tests/test-wireproto-command-manifestdata.t @@ -49,29 +49,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 27\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> \x13\x00\x00\x01\x00\x01\x01\x11\xa1DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 4e\r\n - s> F\x00\x00\x01\x00\x02\x012 - s> \xa2Eerror\xa1GmessageX\'missing required arguments: nodes, treeFstatusEerror - s> \r\n - received frame(size=70; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) - s> 0\r\n - s> \r\n abort: missing required arguments: nodes, tree! [255] @@ -81,29 +58,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 40\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\x80DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 47\r\n - s> ?\x00\x00\x01\x00\x02\x012 - s> \xa2Eerror\xa1GmessageX missing required arguments: treeFstatusEerror - s> \r\n - received frame(size=63; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) - s> 0\r\n - s> \r\n abort: missing required arguments: tree! [255] @@ -116,29 +70,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 67\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\xa2Enodes\x81T\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaaDtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 51\r\n - s> I\x00\x00\x01\x00\x02\x012 - s> \xa2Eerror\xa2Dargs\x81T\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaaGmessagePunknown node: %sFstatusEerror - s> \r\n - received frame(size=73; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) - s> 0\r\n - s> \r\n abort: unknown node: \xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa! (esc) [255] @@ -151,38 +82,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 67\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\xa2Enodes\x81TF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Dtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 30\r\n - s> (\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa1DnodeTF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0 - s> \r\n - received frame(size=40; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -191,7 +90,6 @@ b'node': b'F\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0' } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Requesting parents works @@ -203,38 +101,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 83\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> K\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x81GparentsEnodes\x81TF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Dtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 63\r\n - s> [\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2DnodeTF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Gparents\x82T\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 - s> \r\n - received frame(size=91; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -247,7 +113,6 @@ ] } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Requesting revision data works (haveparents defaults to false, so fulltext is emitted) @@ -260,43 +125,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 84\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> L\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x81HrevisionEnodes\x81TF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Dtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 175\r\n - s> m\x01\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2Ofieldsfollowing\x81\x82Hrevision\x19\x01$DnodeTF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Y\x01$a\x000879345e39377229634b420c639454156726c6b6\n - s> b\x00819e258d31a5e1606629f365bb902a1b21ee4216\n - s> dir0/c\x00914445346a0ca0629bd47ceb5dfe07e4d4cf2501\n - s> dir0/child0/e\x00bbba6c06b30f443d34ff841bc985c4d0827c6be4\n - s> dir0/child1/f\x0012fc7dcd773b5a0a929ce195228083c6ddc9cec4\n - s> dir0/d\x00538206dc971e521540d6843abfe6d16032f6d426\n - s> \r\n - received frame(size=365; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -312,7 +140,6 @@ }, b'a\x000879345e39377229634b420c639454156726c6b6\nb\x00819e258d31a5e1606629f365bb902a1b21ee4216\ndir0/c\x00914445346a0ca0629bd47ceb5dfe07e4d4cf2501\ndir0/child0/e\x00bbba6c06b30f443d34ff841bc985c4d0827c6be4\ndir0/child1/f\x0012fc7dcd773b5a0a929ce195228083c6ddc9cec4\ndir0/d\x00538206dc971e521540d6843abfe6d16032f6d426\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) haveparents=False yields same output @@ -325,43 +152,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 97\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> Y\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa4Ffields\x81HrevisionKhaveparents\xf4Enodes\x81TF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Dtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 175\r\n - s> m\x01\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2Ofieldsfollowing\x81\x82Hrevision\x19\x01$DnodeTF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Y\x01$a\x000879345e39377229634b420c639454156726c6b6\n - s> b\x00819e258d31a5e1606629f365bb902a1b21ee4216\n - s> dir0/c\x00914445346a0ca0629bd47ceb5dfe07e4d4cf2501\n - s> dir0/child0/e\x00bbba6c06b30f443d34ff841bc985c4d0827c6be4\n - s> dir0/child1/f\x0012fc7dcd773b5a0a929ce195228083c6ddc9cec4\n - s> dir0/d\x00538206dc971e521540d6843abfe6d16032f6d426\n - s> \r\n - received frame(size=365; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -377,7 +167,6 @@ }, b'a\x000879345e39377229634b420c639454156726c6b6\nb\x00819e258d31a5e1606629f365bb902a1b21ee4216\ndir0/c\x00914445346a0ca0629bd47ceb5dfe07e4d4cf2501\ndir0/child0/e\x00bbba6c06b30f443d34ff841bc985c4d0827c6be4\ndir0/child1/f\x0012fc7dcd773b5a0a929ce195228083c6ddc9cec4\ndir0/d\x00538206dc971e521540d6843abfe6d16032f6d426\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) haveparents=True will emit delta @@ -390,38 +179,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 97\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> Y\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa4Ffields\x81HrevisionKhaveparents\xf5Enodes\x81TF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Dtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> a6\r\n - s> \x9e\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa3MdeltabasenodeT\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4Ofieldsfollowing\x81\x82Edelta\x187DnodeTF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0X7\x00\x00\x00\x00\x00\x00\x00+\x00\x00\x00+a\x000879345e39377229634b420c639454156726c6b6\n - s> \r\n - received frame(size=158; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -438,7 +195,6 @@ }, b'\x00\x00\x00\x00\x00\x00\x00+\x00\x00\x00+a\x000879345e39377229634b420c639454156726c6b6\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Requesting multiple revisions works (haveparents defaults to false, so fulltext is emitted unless a parent @@ -452,44 +208,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 105\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> a\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x81HrevisionEnodes\x82T\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4TF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Dtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 206\r\n - s> \xfe\x01\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x02\xa2Ofieldsfollowing\x81\x82Hrevision\x19\x01$DnodeT\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4Y\x01$a\x002b4eb07319bfa077a40a2f04913659aef0da42da\n - s> b\x00819e258d31a5e1606629f365bb902a1b21ee4216\n - s> dir0/c\x00914445346a0ca0629bd47ceb5dfe07e4d4cf2501\n - s> dir0/child0/e\x00bbba6c06b30f443d34ff841bc985c4d0827c6be4\n - s> dir0/child1/f\x0012fc7dcd773b5a0a929ce195228083c6ddc9cec4\n - s> dir0/d\x00538206dc971e521540d6843abfe6d16032f6d426\n - s> \xa3MdeltabasenodeT\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4Ofieldsfollowing\x81\x82Edelta\x187DnodeTF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0X7\x00\x00\x00\x00\x00\x00\x00+\x00\x00\x00+a\x000879345e39377229634b420c639454156726c6b6\n - s> \r\n - received frame(size=510; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 2 @@ -516,7 +234,6 @@ }, b'\x00\x00\x00\x00\x00\x00\x00+\x00\x00\x00+a\x000879345e39377229634b420c639454156726c6b6\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) With haveparents=True, first revision is a delta instead of fulltext @@ -529,44 +246,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 118\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> n\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa4Ffields\x81HrevisionKhaveparents\xf5Enodes\x82T\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4TF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Dtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 206\r\n - s> \xfe\x01\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x02\xa2Ofieldsfollowing\x81\x82Hrevision\x19\x01$DnodeT\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4Y\x01$a\x002b4eb07319bfa077a40a2f04913659aef0da42da\n - s> b\x00819e258d31a5e1606629f365bb902a1b21ee4216\n - s> dir0/c\x00914445346a0ca0629bd47ceb5dfe07e4d4cf2501\n - s> dir0/child0/e\x00bbba6c06b30f443d34ff841bc985c4d0827c6be4\n - s> dir0/child1/f\x0012fc7dcd773b5a0a929ce195228083c6ddc9cec4\n - s> dir0/d\x00538206dc971e521540d6843abfe6d16032f6d426\n - s> \xa3MdeltabasenodeT\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4Ofieldsfollowing\x81\x82Edelta\x187DnodeTF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0X7\x00\x00\x00\x00\x00\x00\x00+\x00\x00\x00+a\x000879345e39377229634b420c639454156726c6b6\n - s> \r\n - received frame(size=510; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 2 @@ -593,7 +272,6 @@ }, b'\x00\x00\x00\x00\x00\x00\x00+\x00\x00\x00+a\x000879345e39377229634b420c639454156726c6b6\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Revisions are sorted by DAG order, parents first @@ -605,44 +283,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 105\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> a\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x81HrevisionEnodes\x82TF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0T\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4Dtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 206\r\n - s> \xfe\x01\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x02\xa2Ofieldsfollowing\x81\x82Hrevision\x19\x01$DnodeT\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4Y\x01$a\x002b4eb07319bfa077a40a2f04913659aef0da42da\n - s> b\x00819e258d31a5e1606629f365bb902a1b21ee4216\n - s> dir0/c\x00914445346a0ca0629bd47ceb5dfe07e4d4cf2501\n - s> dir0/child0/e\x00bbba6c06b30f443d34ff841bc985c4d0827c6be4\n - s> dir0/child1/f\x0012fc7dcd773b5a0a929ce195228083c6ddc9cec4\n - s> dir0/d\x00538206dc971e521540d6843abfe6d16032f6d426\n - s> \xa3MdeltabasenodeT\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4Ofieldsfollowing\x81\x82Edelta\x187DnodeTF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0X7\x00\x00\x00\x00\x00\x00\x00+\x00\x00\x00+a\x000879345e39377229634b420c639454156726c6b6\n - s> \r\n - received frame(size=510; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 2 @@ -669,7 +309,6 @@ }, b'\x00\x00\x00\x00\x00\x00\x00+\x00\x00\x00+a\x000879345e39377229634b420c639454156726c6b6\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Requesting parents and revision data works @@ -681,44 +320,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 113\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> i\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa3Ffields\x82GparentsHrevisionEnodes\x82T\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4TF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Dtree@DnameLmanifestdata - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 26c\r\n - s> d\x02\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x02\xa3Ofieldsfollowing\x81\x82Hrevision\x19\x01$DnodeT\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4Gparents\x82T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00Y\x01$a\x002b4eb07319bfa077a40a2f04913659aef0da42da\n - s> b\x00819e258d31a5e1606629f365bb902a1b21ee4216\n - s> dir0/c\x00914445346a0ca0629bd47ceb5dfe07e4d4cf2501\n - s> dir0/child0/e\x00bbba6c06b30f443d34ff841bc985c4d0827c6be4\n - s> dir0/child1/f\x0012fc7dcd773b5a0a929ce195228083c6ddc9cec4\n - s> dir0/d\x00538206dc971e521540d6843abfe6d16032f6d426\n - s> \xa4MdeltabasenodeT\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4Ofieldsfollowing\x81\x82Edelta\x187DnodeTF\xa6r\x1b^\xda\xf0\xea\x04\xb7\x9a\\\xb3!\x88T\xa4\xd2\xab\xa0Gparents\x82T\x1b\x17[Y_\x02,\xfa\xb5\xb8\t\xcc\x0e\xd5Q\xbd\x0b?\xf5\xe4T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00X7\x00\x00\x00\x00\x00\x00\x00+\x00\x00\x00+a\x000879345e39377229634b420c639454156726c6b6\n - s> \r\n - received frame(size=612; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 2 @@ -753,6 +354,5 @@ }, b'\x00\x00\x00\x00\x00\x00\x00+\x00\x00\x00+a\x000879345e39377229634b420c639454156726c6b6\n' ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat error.log diff --git a/tests/test-wireproto-command-pushkey.t b/tests/test-wireproto-command-pushkey.t --- a/tests/test-wireproto-command-pushkey.t +++ b/tests/test-wireproto-command-pushkey.t @@ -30,40 +30,7 @@ > EOF creating http peer for wire protocol version 2 sending pushkey command - s> *\r\n (glob) - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 105\r\n - s> host: $LOCALIP:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - s> a\x00\x00\x01\x00\x01\x01\x11\xa2Dargs\xa4CkeyA@InamespaceIbookmarksCnewX(426bada5c67598ca65036d57d9e4b64b0c1ce7a0Cold@DnameGpushkey - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - 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> \xf5 - 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: True - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ sendhttpv2peer << EOF > command listkeys @@ -71,41 +38,8 @@ > EOF creating http peer for wire protocol version 2 sending listkeys command - s> POST /api/exp-http-v2-0002/ro/listkeys HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 35\r\n - s> -\x00\x00\x01\x00\x02\x001 - s> \xa1A@X(426bada5c67598ca65036d57d9e4b64b0c1ce7a0 - s> \r\n - received frame(size=45; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: { b'@': b'426bada5c67598ca65036d57d9e4b64b0c1ce7a0' } - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat error.log diff --git a/tests/test-wireproto-content-redirects.t b/tests/test-wireproto-content-redirects.t --- a/tests/test-wireproto-content-redirects.t +++ b/tests/test-wireproto-content-redirects.t @@ -1239,38 +1239,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 128\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\xa3Dargs\xa3Ffields\x81GparentsEnodes\x81T\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&ADtree@DnameLmanifestdataHredirect\xa2Fhashes\x82Fsha256Dsha1Gtargets\x81Elocal - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> 13\r\n - s> \x0b\x00\x00\x01\x00\x02\x011 - s> \xa1FstatusBok - s> \r\n - received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) - s> 63\r\n - s> [\x00\x00\x01\x00\x02\x001 - s> \xa1Jtotalitems\x01\xa2DnodeT\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&AGparents\x82T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 - s> \r\n - received frame(size=91; 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 - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) response: gen[ { b'totalitems': 1 @@ -1283,7 +1251,6 @@ ] } ] - (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) Cached entry should be available on server @@ -1328,52 +1295,6 @@ > EOF creating http peer for wire protocol version 2 sending manifestdata command - s> POST /api/exp-http-v2-0002/ro/manifestdata HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-exp-framing-0005\r\n - s> content-type: application/mercurial-exp-framing-0005\r\n - s> content-length: 128\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\xa3Dargs\xa3Ffields\x81GparentsEnodes\x81T\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&ADtree@DnameLmanifestdataHredirect\xa2Fhashes\x82Fsha256Dsha1Gtargets\x81Elocal - 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-0005\r\n - s> Transfer-Encoding: chunked\r\n - s> \r\n - s> *\r\n (glob) - s> \x*\x00\x00\x01\x00\x02\x011 (glob) - s> \xa2Hlocation\xa2ImediatypeX\x1aapplication/mercurial-cborCurl*http://*:$HGPORT/api/simplecache/c045a581599d58608efd3d93d8129841f2af04a0FstatusHredirect (glob) - s> \r\n - received frame(size=*; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) (glob) - s> 8\r\n - s> \x00\x00\x00\x01\x00\x02\x001 - s> \r\n - s> 8\r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=continuation) - s> \x00\x00\x00\x01\x00\x02\x002 - s> \r\n - s> 0\r\n - s> \r\n - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) - (following redirect to http://*:$HGPORT/api/simplecache/c045a581599d58608efd3d93d8129841f2af04a0) (glob) - s> GET /api/simplecache/c045a581599d58608efd3d93d8129841f2af04a0 HTTP/1.1\r\n - s> Accept-Encoding: identity\r\n - s> accept: application/mercurial-cbor\r\n - s> host: *:$HGPORT\r\n (glob) - s> user-agent: Mercurial debugwireproto\r\n - s> \r\n - 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-cbor\r\n - s> Content-Length: 91\r\n - s> \r\n - s> \xa1Jtotalitems\x01\xa2DnodeT\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&AGparents\x82T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 response: gen[ { b'totalitems': 1 @@ -1386,7 +1307,6 @@ ] } ] - (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) $ cat error.log $ killdaemons.py diff --git a/tests/wireprotohelpers.sh b/tests/wireprotohelpers.sh --- a/tests/wireprotohelpers.sh +++ b/tests/wireprotohelpers.sh @@ -6,6 +6,10 @@ } sendhttpv2peer() { + hg debugwireproto --nologhandshake --peer http2 http://$LOCALIP:$HGPORT/ +} + +sendhttpv2peerverbose() { hg --verbose debugwireproto --nologhandshake --peer http2 http://$LOCALIP:$HGPORT/ }