| Submitter | Boris Feld |
|---|---|
| Date | Nov. 13, 2017, 11:05 a.m. |
| Message ID | <715948f2256fa181c4f3.1510571101@FB> |
| Download | mbox | patch |
| Permalink | /patch/25512/ |
| State | Superseded |
| Headers | show |
Comments
Sorry I included some obsolete changesets by mistake, I will resend a new series. On Mon, 2017-11-13 at 12:05 +0100, Boris Feld wrote: > # HG changeset patch > # User Boris Feld <boris.feld@octobus.net> > # Date 1509866592 -3600 > # Sun Nov 05 08:23:12 2017 +0100 > # Node ID 715948f2256fa181c4f3730825492f9da0f74b2e > # Parent c06ed80fc1063905dc6a711fc32c88d5913b0db6 > # EXP-Topic better-substitute > # Available At https://bitbucket.org/octobus/mercurial-devel/ > # hg pull https://bitbucket.org/octobus/mercurial-devel/ > -r 715948f2256f > test-pattern: actually update tests using the patterns > > We mass update the tests now. This will help the next soul touching > the http > protocol. > > diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t > --- a/tests/test-clonebundles.t > +++ b/tests/test-clonebundles.t > @@ -32,8 +32,8 @@ Missing manifest should not result in se > > $ cat server/access.log > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg- > 1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250A > digests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupport > edcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250 > Aphases%253Dheads%250Apushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=1&common=00000000000000000000000000 > 00000000000000&heads=aaff8d2ffbbf07a46dd1f05d8ae7877e3f56e2a2&listkey > s=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=getbundle HTTP/1.1" 200 - x- > hgarg- > 1:$USUAL_BUNDLE_CAPS$&cg=1&common=00000000000000000000000000000000000 > 00000&heads=aaff8d2ffbbf07a46dd1f05d8ae7877e3f56e2a2&listkeys=bookmar > ks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > > Empty manifest file results in retrieval > (the extension only checks if the manifest file exists) > diff --git a/tests/test-debugcommands.t b/tests/test-debugcommands.t > --- a/tests/test-debugcommands.t > +++ b/tests/test-debugcommands.t > @@ -162,7 +162,7 @@ Test debugcapabilities command: > $ hg debugcapabilities ./debugrevlog/ > Main capabilities: > branchmap > - bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csh > a512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgt > agsfnodes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote- > changegroup%3Dhttp%2Chttps > + $USUAL_BUNDLE2_CAPS$ > getbundle > known > lookup > diff --git a/tests/test-getbundle.t b/tests/test-getbundle.t > --- a/tests/test-getbundle.t > +++ b/tests/test-getbundle.t > @@ -264,9 +264,9 @@ Verify we hit the HTTP server: > > $ cat access.log > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=getbundle HTTP/1.1" 200 - x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg- > 1:common=700b7e19db54103633c4bf4a6a6b6d55f4d50c03+d5f6e1ea45228532483 > 6a49d7d3c2a63cfed1d31&heads=13c0170174366b441dc68e8e33757232fa744458+ > bac16991d12ff45f9dc43c52da1946dfadb83e80 x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=getbundle HTTP/1.1" 200 - x- > hgarg- > 1:common=700b7e19db54103633c4bf4a6a6b6d55f4d50c03+d5f6e1ea45228532483 > 6a49d7d3c2a63cfed1d31&heads=13c0170174366b441dc68e8e33757232fa744458+ > bac16991d12ff45f9dc43c52da1946dfadb83e80 x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > > $ cat error.log > > diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb- > commands.t > --- a/tests/test-hgweb-commands.t > +++ b/tests/test-hgweb-commands.t > @@ -1926,7 +1926,7 @@ capabilities > $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=capabilities'; echo > 200 Script output follows > > - lookup changegroupsubset branchmap pushkey known getbundle > unbundlehash batch > bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512% > 0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfn > odes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote- > changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN > httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx compression=*zlib > (glob) > + lookup changegroupsubset branchmap pushkey known getbundle > unbundlehash batch $USUAL_BUNDLE2_CAPS$ unbundle=HG10GZ,HG10BZ,HG10UN > httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx compression=zstd,zlib > > heads > > @@ -2174,7 +2174,7 @@ capabilities > batch > stream-preferred > streamreqs=generaldelta,revlogv1 > - bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha5 > 12%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtag > sfnodes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote- > changegroup%3Dhttp%2Chttps > + $USUAL_BUNDLE2_CAPS$ > unbundle=HG10GZ,HG10BZ,HG10UN > httpheader=1024 > httpmediatype=0.1rx,0.1tx,0.2tx > diff --git a/tests/test-http-bad-server.t b/tests/test-http-bad- > server.t > --- a/tests/test-http-bad-server.t > +++ b/tests/test-http-bad-server.t > @@ -130,7 +130,7 @@ Failure on subsequent HTTP request on th > readline(184 from -1) -> (27) Accept-Encoding: identity\r\n > readline(157 from -1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n > readline(128 from -1) -> (41) x-hgarg-1: > cmds=heads+%3Bknown+nodes%3D\r\n > - readline(87 from -1) -> (48) x-hgproto-1: 0.1 0.2 > comp=zstd,zlib,none,bzip2\r\n > + readline(87 from -1) -> (48) x-hgproto-1: 0.1 0.2 > comp=$USUAL_COMPRESSIONS$\r\n > readline(39 from -1) -> (35) accept: application/mercurial-0.1\r\n > readline(4 from -1) -> (4) host > read limit reached; closing socket > @@ -172,7 +172,7 @@ Failure to read getbundle HTTP request > readline(266 from -1) -> (27) Accept-Encoding: identity\r\n > readline(239 from -1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n > readline(210 from -1) -> (41) x-hgarg-1: > cmds=heads+%3Bknown+nodes%3D\r\n > - readline(169 from -1) -> (48) x-hgproto-1: 0.1 0.2 > comp=zstd,zlib,none,bzip2\r\n > + readline(169 from -1) -> (48) x-hgproto-1: 0.1 0.2 > comp=$USUAL_COMPRESSIONS$\r\n > readline(121 from -1) -> (35) accept: application/mercurial- > 0.1\r\n > readline(86 from -1) -> (2?) host: localhost:$HGPORT\r\n (glob) > readline(6? from -1) -> (49) user-agent: mercurial/proto-1.0 > (Mercurial 4.2)\r\n (glob) > @@ -231,7 +231,7 @@ Now do a variation using POST to send ar > readline(261 from -1) -> (41) content-type: application/mercurial- > 0.1\r\n > readline(220 from -1) -> (19) vary: X-HgProto-1\r\n > readline(201 from -1) -> (19) x-hgargs-post: 28\r\n > - readline(182 from -1) -> (48) x-hgproto-1: 0.1 0.2 > comp=zstd,zlib,none,bzip2\r\n > + readline(182 from -1) -> (48) x-hgproto-1: 0.1 0.2 > comp=$USUAL_COMPRESSIONS$\r\n > readline(134 from -1) -> (35) accept: application/mercurial- > 0.1\r\n > readline(99 from -1) -> (20) content-length: 28\r\n > readline(79 from -1) -> (2?) host: localhost:$HGPORT\r\n (glob) > @@ -334,7 +334,7 @@ TODO this output is horrible > readline(-1) -> (27) Accept-Encoding: identity\r\n > readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n > readline(-1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n > - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=zstd,zlib,none,bzip2\r\n > + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=$USUAL_COMPRESSIONS$\r\n > readline(-1) -> (35) accept: application/mercurial-0.1\r\n > readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) > readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial > 4.2)\r\n > @@ -382,7 +382,7 @@ TODO client spews a stack due to uncaugh > readline(-1) -> (27) Accept-Encoding: identity\r\n > readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n > readline(-1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n > - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=zstd,zlib,none,bzip2\r\n > + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=$USUAL_COMPRESSIONS$\r\n > readline(-1) -> (35) accept: application/mercurial-0.1\r\n > readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) > readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial > 4.2)\r\n > @@ -434,7 +434,7 @@ TODO this output is terrible > readline(-1) -> (27) Accept-Encoding: identity\r\n > readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n > readline(-1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n > - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=zstd,zlib,none,bzip2\r\n > + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=$USUAL_COMPRESSIONS$\r\n > readline(-1) -> (35) accept: application/mercurial-0.1\r\n > readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) > readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial > 4.2)\r\n > @@ -450,7 +450,7 @@ TODO this output is terrible > readline(-1) -> (27) Accept-Encoding: identity\r\n > readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n > readline(-1) -> (396) x-hgarg-1: > bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adi > gests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupported > content%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Ap > ushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=1&common=00000000000000000000000000 > 00000000000000&heads=96ee1d7354c4ad7372047672c36a1f561e3a6a4c&listkey > s=phases%2Cbookmarks\r\n > - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=zstd,zlib,none,bzip2\r\n > + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=$USUAL_COMPRESSIONS$\r\n > readline(-1) -> (35) accept: application/mercurial-0.1\r\n > readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) > readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial > 4.2)\r\n > @@ -495,7 +495,7 @@ Server sends empty HTTP body for getbund > readline(-1) -> (27) Accept-Encoding: identity\r\n > readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n > readline(-1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n > - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=zstd,zlib,none,bzip2\r\n > + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=$USUAL_COMPRESSIONS$\r\n > readline(-1) -> (35) accept: application/mercurial-0.1\r\n > readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) > readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial > 4.2)\r\n > @@ -511,7 +511,7 @@ Server sends empty HTTP body for getbund > readline(-1) -> (27) Accept-Encoding: identity\r\n > readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n > readline(-1) -> (396) x-hgarg-1: > bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adi > gests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupported > content%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Ap > ushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=1&common=00000000000000000000000000 > 00000000000000&heads=96ee1d7354c4ad7372047672c36a1f561e3a6a4c&listkey > s=phases%2Cbookmarks\r\n > - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=zstd,zlib,none,bzip2\r\n > + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=$USUAL_COMPRESSIONS$\r\n > readline(-1) -> (35) accept: application/mercurial-0.1\r\n > readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) > readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial > 4.2)\r\n > @@ -558,7 +558,7 @@ Server sends partial compression string > readline(-1) -> (27) Accept-Encoding: identity\r\n > readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n > readline(-1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n > - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=zstd,zlib,none,bzip2\r\n > + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=$USUAL_COMPRESSIONS$\r\n > readline(-1) -> (35) accept: application/mercurial-0.1\r\n > readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) > readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial > 4.2)\r\n > @@ -574,7 +574,7 @@ Server sends partial compression string > readline(-1) -> (27) Accept-Encoding: identity\r\n > readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n > readline(-1) -> (396) x-hgarg-1: > bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adi > gests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupported > content%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Ap > ushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=1&common=00000000000000000000000000 > 00000000000000&heads=96ee1d7354c4ad7372047672c36a1f561e3a6a4c&listkey > s=phases%2Cbookmarks\r\n > - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=zstd,zlib,none,bzip2\r\n > + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 > comp=$USUAL_COMPRESSIONS$\r\n > readline(-1) -> (35) accept: application/mercurial-0.1\r\n > readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) > readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial > 4.2)\r\n > diff --git a/tests/test-http-bundle1.t b/tests/test-http-bundle1.t > --- a/tests/test-http-bundle1.t > +++ b/tests/test-http-bundle1.t > @@ -265,66 +265,66 @@ test http authentication > > $ sed 's/.*] "/"/' < ../access.log > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292 > d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292 > d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg- > 1:common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e > 1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 > (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg- > 1:common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e > 1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff87 > 2 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff87 > 2 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg- > 1:heads=686173686564+5eb5abfefeea63c80dd7553bcc3783f37e0c5524* (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > > $ cd .. > > diff --git a/tests/test-http-proxy.t b/tests/test-http-proxy.t > --- a/tests/test-http-proxy.t > +++ b/tests/test-http-proxy.t > @@ -107,19 +107,19 @@ do not use the proxy if it is in the no > 1 files updated, 0 files merged, 0 files removed, 0 files > unresolved > $ cat proxy.log > * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities > HTTP/1.1" - - (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - > - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" > - - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - > x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d62 > 9 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - > - x-hgarg- > 1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250A > digests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupport > edcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250 > Aphases%253Dheads%250Apushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=0&common=83180e7845de420a1bb46896fd > 5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkey > s=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=branch > map HTTP/1.1" - - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=stream > _out HTTP/1.1" - - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch > HTTP/1.1" - - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d62 > 9 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbun > dle HTTP/1.1" - - x-hgarg- > 1:$USUAL_BUNDLE_CAPS$&cg=0&common=83180e7845de420a1bb46896fd5fe05294f > 8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmar > ks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities > HTTP/1.1" - - (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - > x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - > - x-hgarg- > 1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250A > digests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupport > edcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250 > Aphases%253Dheads%250Apushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=1&common=00000000000000000000000000 > 00000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkey > s=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch > HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbun > dle HTTP/1.1" - - x-hgarg- > 1:$USUAL_BUNDLE_CAPS$&cg=1&common=00000000000000000000000000000000000 > 00000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmar > ks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities > HTTP/1.1" - - (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - > x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - > - x-hgarg- > 1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250A > digests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupport > edcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250 > Aphases%253Dheads%250Apushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=1&common=00000000000000000000000000 > 00000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkey > s=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch > HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbun > dle HTTP/1.1" - - x-hgarg- > 1:$USUAL_BUNDLE_CAPS$&cg=1&common=00000000000000000000000000000000000 > 00000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmar > ks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities > HTTP/1.1" - - (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - > x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - > - x-hgarg- > 1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250A > digests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupport > edcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250 > Aphases%253Dheads%250Apushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=1&common=00000000000000000000000000 > 00000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkey > s=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch > HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbun > dle HTTP/1.1" - - x-hgarg- > 1:$USUAL_BUNDLE_CAPS$&cg=1&common=00000000000000000000000000000000000 > 00000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmar > ks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities > HTTP/1.1" - - (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - > x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - > - x-hgarg- > 1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250A > digests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupport > edcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250 > Aphases%253Dheads%250Apushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=1&common=00000000000000000000000000 > 00000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkey > s=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch > HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbun > dle HTTP/1.1" - - x-hgarg- > 1:$USUAL_BUNDLE_CAPS$&cg=1&common=00000000000000000000000000000000000 > 00000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmar > ks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > diff --git a/tests/test-http.t b/tests/test-http.t > --- a/tests/test-http.t > +++ b/tests/test-http.t > @@ -256,63 +256,63 @@ test http authentication > > $ sed 's/.*] "/"/' < ../access.log > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292 > d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg- > 1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250A > digests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupport > edcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250 > Aphases%253Dheads%250Apushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=0&common=5fed3813f7f5e1824344fdc9cf > 8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkey > s=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292 > d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg- > 1:$USUAL_BUNDLE_CAPS$&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662 > c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmar > ks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg- > 1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250A > digests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupport > edcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250 > Aphases%253Dheads%250Apushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=1&common=00000000000000000000000000 > 00000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkey > s=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg- > 1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250A > digests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupport > edcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250 > Aphases%253Dheads%250Apushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=1&common=00000000000000000000000000 > 00000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkey > s=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg- > 1:$USUAL_BUNDLE_CAPS$&cg=1&common=00000000000000000000000000000000000 > 00000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmar > ks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg- > 1:$USUAL_BUNDLE_CAPS$&cg=1&common=00000000000000000000000000000000000 > 00000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmar > ks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto- > 1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff87 > 2 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff87 > 2 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365* > (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > > $ cd .. > > diff --git a/tests/test-largefiles-wireproto.t b/tests/test- > largefiles-wireproto.t > --- a/tests/test-largefiles-wireproto.t > +++ b/tests/test-largefiles-wireproto.t > @@ -352,7 +352,7 @@ largefiles should batch verify remote ca > searching 2 changesets for largefiles > verified existence of 2 revisions of 2 largefiles > $ tail -1 access.log > - $LOCALIP - - [*] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=statlfile+sha%3D972a1a11f19934401291cc99117ec614933374ce%3Bsta > tlfile+sha%3Dc801c9cfe94400963fcb683246217d5db77f9a9a x-hgproto-1:0.1 > 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=statlfile+sha%3D972a1a11f19934401291cc99117ec614933374ce%3Bsta > tlfile+sha%3Dc801c9cfe94400963fcb683246217d5db77f9a9a x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > $ hg -R batchverifyclone update > getting changed largefiles > 2 largefiles updated, 0 removed > @@ -390,7 +390,7 @@ available locally. > searching 3 changesets for largefiles > verified existence of 3 revisions of 3 largefiles > $ tail -1 access.log > - $LOCALIP - - [*] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=statlfile+sha%3Dc8559c3c9cfb42131794b7d8009230403b9b454c x- > hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=statlfile+sha%3Dc8559c3c9cfb42131794b7d8009230403b9b454c x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > > $ killdaemons.py > > diff --git a/tests/test-setdiscovery.t b/tests/test-setdiscovery.t > --- a/tests/test-setdiscovery.t > +++ b/tests/test-setdiscovery.t > @@ -350,9 +350,9 @@ Test actual protocol when pulling one ne > $ killdaemons.py > $ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses > random sampling > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866d > b x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg- > 1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250A > digests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupport > edcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250 > Aphases%253Dheads%250Apushkey%250Aremote- > changegroup%253Dhttp%252Chttps&cg=1&common=513314ca8b3ae4dac8eec56966 > 265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x- > hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg- > 1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866d > b x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg- > 1:$USUAL_BUNDLE_CAPS$&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf > 866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > $ cat errors.log > > $ cd .. > diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t > --- a/tests/test-ssh-bundle1.t > +++ b/tests/test-ssh-bundle1.t > @@ -468,7 +468,7 @@ debug output > sending hello command > sending between command > remote: 372 > - remote: capabilities: lookup changegroupsubset branchmap pushkey > known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 > bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512% > 0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfn > odes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote- > changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN > + remote: capabilities: lookup changegroupsubset branchmap pushkey > known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 > $USUAL_BUNDLE2_CAPS$ unbundle=HG10GZ,HG10BZ,HG10UN > remote: 1 > preparing listkeys for "bookmarks" > sending listkeys command > diff --git a/tests/test-ssh.t b/tests/test-ssh.t > --- a/tests/test-ssh.t > +++ b/tests/test-ssh.t > @@ -484,7 +484,7 @@ debug output > sending hello command > sending between command > remote: 372 > - remote: capabilities: lookup changegroupsubset branchmap pushkey > known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 > bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512% > 0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfn > odes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote- > changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN > + remote: capabilities: lookup changegroupsubset branchmap pushkey > known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 > $USUAL_BUNDLE2_CAPS$ unbundle=HG10GZ,HG10BZ,HG10UN > remote: 1 > query 1; heads > sending batch command > diff --git a/tests/test-treediscovery.t b/tests/test-treediscovery.t > --- a/tests/test-treediscovery.t > +++ b/tests/test-treediscovery.t > @@ -516,35 +516,35 @@ Both have new stuff in existing named br > #if zstd > $ tstop show > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg- > 1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=between HTTP/1.1" 200 - x-hgarg- > 1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961- > d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg- > 1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae > 8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 > + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg- > 1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=between HTTP/1.1" 200 - x-hgarg- > 1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961- > d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg- > 1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae > 8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg- > 1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=between HTTP/1.1" 200 - x-hgarg- > 1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961- > d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg- > 1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=between HTTP/1.1" 200 - x-hgarg- > 1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961- > d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 > - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg- > 1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=between HTTP/1.1" 200 - x-hgarg- > 1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961- > d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg- > 1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae > 8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a > x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg- > 1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=between HTTP/1.1" 200 - x-hgarg- > 1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961- > d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg- > 1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae > 8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 > - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 > + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg- > 1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob) > - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > "GET /?cmd=capabilities HTTP/1.1" 200 - > - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=zstd,zlib,none,bzip2 > + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > #else > $ tstop show > "GET /?cmd=capabilities HTTP/1.1" 200 - > diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t > --- a/tests/test-wireproto.t > +++ b/tests/test-wireproto.t > @@ -94,23 +94,23 @@ HTTP without args-in-POST: > * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs- > post:1033* (glob) > * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs- > post:1033* (glob) > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:four=quatre&one=un&three=trois&two=deux x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:four=quatre&one=un&three=trois&two=deux x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg-1:four=quatre&one=un&three=trois&two=deux x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg-1:four=quatre&one=un&three=trois&two=deux x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:four=qu++atre&one=+un&three=trois+&two=deux x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:four=qu++atre&one=+un&three=trois+&two=deux x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg-1:four=qu++atre&one=+un&three=trois+&two=deux x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg-1:four=qu++atre&one=+un&three=trois+&two=deux x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:four=vier&one=eins&two=zwei x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:four=vier&one=eins&two=zwei x-hgproto-1:0.1 0.2 > comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg-1:four=vier&one=eins&two=zwei x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg-1:four=vier&one=eins&two=zwei x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg- > 2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 > (glob) > - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg- > 1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg- > 2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 > (glob) > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg- > 1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg- > 2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - > x-hgarg- > 1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg- > 2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 > comp=$USUAL_COMPRESSIONS$ > > HTTP without the httpheader capability: > > @@ -133,17 +133,17 @@ HTTP without the httpheader capability: > $ cat error2.log > $ cat access2.log > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET > /?cmd=debugwireargs&four=quatre&one=un&three=trois&two=deux HTTP/1.1" > 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET > /?cmd=debugwireargs&four=quatre&one=un&three=trois&two=deux HTTP/1.1" > 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET > /?cmd=debugwireargs&four=quatre&one=un&three=trois&two=deux HTTP/1.1" > 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET > /?cmd=debugwireargs&four=quatre&one=un&three=trois&two=deux HTTP/1.1" > 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=debugwireargs&four=vier&one=eins&two=zwei > HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET /?cmd=debugwireargs&four=vier&one=eins&two=zwei > HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET > /?cmd=debugwireargs&four=vier&one=eins&two=zwei HTTP/1.1" 200 - x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET > /?cmd=debugwireargs&four=vier&one=eins&two=zwei HTTP/1.1" 200 - x- > hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 > - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 > - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET > /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET > /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) > - * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 > - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > - * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 > - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) > + $LOCALIP - - [$LOGDATE$] "GET > /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > + $LOCALIP - - [$LOGDATE$] "GET > /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 > 0.2 comp=$USUAL_COMPRESSIONS$ > > SSH (try to exercise the ssh functionality with a dummy script): >
Patch
diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t --- a/tests/test-clonebundles.t +++ b/tests/test-clonebundles.t @@ -32,8 +32,8 @@ Missing manifest should not result in se $ cat server/access.log * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=aaff8d2ffbbf07a46dd1f05d8ae7877e3f56e2a2&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=aaff8d2ffbbf07a46dd1f05d8ae7877e3f56e2a2&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ Empty manifest file results in retrieval (the extension only checks if the manifest file exists) diff --git a/tests/test-debugcommands.t b/tests/test-debugcommands.t --- a/tests/test-debugcommands.t +++ b/tests/test-debugcommands.t @@ -162,7 +162,7 @@ Test debugcapabilities command: $ hg debugcapabilities ./debugrevlog/ Main capabilities: branchmap - bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps + $USUAL_BUNDLE2_CAPS$ getbundle known lookup diff --git a/tests/test-getbundle.t b/tests/test-getbundle.t --- a/tests/test-getbundle.t +++ b/tests/test-getbundle.t @@ -264,9 +264,9 @@ Verify we hit the HTTP server: $ cat access.log * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=700b7e19db54103633c4bf4a6a6b6d55f4d50c03+d5f6e1ea452285324836a49d7d3c2a63cfed1d31&heads=13c0170174366b441dc68e8e33757232fa744458+bac16991d12ff45f9dc43c52da1946dfadb83e80 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=700b7e19db54103633c4bf4a6a6b6d55f4d50c03+d5f6e1ea452285324836a49d7d3c2a63cfed1d31&heads=13c0170174366b441dc68e8e33757232fa744458+bac16991d12ff45f9dc43c52da1946dfadb83e80 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ $ cat error.log diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t --- a/tests/test-hgweb-commands.t +++ b/tests/test-hgweb-commands.t @@ -1926,7 +1926,7 @@ capabilities $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=capabilities'; echo 200 Script output follows - lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx compression=*zlib (glob) + lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch $USUAL_BUNDLE2_CAPS$ unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx compression=zstd,zlib heads @@ -2174,7 +2174,7 @@ capabilities batch stream-preferred streamreqs=generaldelta,revlogv1 - bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps + $USUAL_BUNDLE2_CAPS$ unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx diff --git a/tests/test-http-bad-server.t b/tests/test-http-bad-server.t --- a/tests/test-http-bad-server.t +++ b/tests/test-http-bad-server.t @@ -130,7 +130,7 @@ Failure on subsequent HTTP request on th readline(184 from -1) -> (27) Accept-Encoding: identity\r\n readline(157 from -1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n readline(128 from -1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n - readline(87 from -1) -> (48) x-hgproto-1: 0.1 0.2 comp=zstd,zlib,none,bzip2\r\n + readline(87 from -1) -> (48) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$\r\n readline(39 from -1) -> (35) accept: application/mercurial-0.1\r\n readline(4 from -1) -> (4) host read limit reached; closing socket @@ -172,7 +172,7 @@ Failure to read getbundle HTTP request readline(266 from -1) -> (27) Accept-Encoding: identity\r\n readline(239 from -1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n readline(210 from -1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n - readline(169 from -1) -> (48) x-hgproto-1: 0.1 0.2 comp=zstd,zlib,none,bzip2\r\n + readline(169 from -1) -> (48) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$\r\n readline(121 from -1) -> (35) accept: application/mercurial-0.1\r\n readline(86 from -1) -> (2?) host: localhost:$HGPORT\r\n (glob) readline(6? from -1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n (glob) @@ -231,7 +231,7 @@ Now do a variation using POST to send ar readline(261 from -1) -> (41) content-type: application/mercurial-0.1\r\n readline(220 from -1) -> (19) vary: X-HgProto-1\r\n readline(201 from -1) -> (19) x-hgargs-post: 28\r\n - readline(182 from -1) -> (48) x-hgproto-1: 0.1 0.2 comp=zstd,zlib,none,bzip2\r\n + readline(182 from -1) -> (48) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$\r\n readline(134 from -1) -> (35) accept: application/mercurial-0.1\r\n readline(99 from -1) -> (20) content-length: 28\r\n readline(79 from -1) -> (2?) host: localhost:$HGPORT\r\n (glob) @@ -334,7 +334,7 @@ TODO this output is horrible readline(-1) -> (27) Accept-Encoding: identity\r\n readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n readline(-1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=zstd,zlib,none,bzip2\r\n + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$\r\n readline(-1) -> (35) accept: application/mercurial-0.1\r\n readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n @@ -382,7 +382,7 @@ TODO client spews a stack due to uncaugh readline(-1) -> (27) Accept-Encoding: identity\r\n readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n readline(-1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=zstd,zlib,none,bzip2\r\n + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$\r\n readline(-1) -> (35) accept: application/mercurial-0.1\r\n readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n @@ -434,7 +434,7 @@ TODO this output is terrible readline(-1) -> (27) Accept-Encoding: identity\r\n readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n readline(-1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=zstd,zlib,none,bzip2\r\n + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$\r\n readline(-1) -> (35) accept: application/mercurial-0.1\r\n readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n @@ -450,7 +450,7 @@ TODO this output is terrible readline(-1) -> (27) Accept-Encoding: identity\r\n readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n readline(-1) -> (396) x-hgarg-1: bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=96ee1d7354c4ad7372047672c36a1f561e3a6a4c&listkeys=phases%2Cbookmarks\r\n - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=zstd,zlib,none,bzip2\r\n + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$\r\n readline(-1) -> (35) accept: application/mercurial-0.1\r\n readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n @@ -495,7 +495,7 @@ Server sends empty HTTP body for getbund readline(-1) -> (27) Accept-Encoding: identity\r\n readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n readline(-1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=zstd,zlib,none,bzip2\r\n + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$\r\n readline(-1) -> (35) accept: application/mercurial-0.1\r\n readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n @@ -511,7 +511,7 @@ Server sends empty HTTP body for getbund readline(-1) -> (27) Accept-Encoding: identity\r\n readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n readline(-1) -> (396) x-hgarg-1: bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=96ee1d7354c4ad7372047672c36a1f561e3a6a4c&listkeys=phases%2Cbookmarks\r\n - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=zstd,zlib,none,bzip2\r\n + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$\r\n readline(-1) -> (35) accept: application/mercurial-0.1\r\n readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n @@ -558,7 +558,7 @@ Server sends partial compression string readline(-1) -> (27) Accept-Encoding: identity\r\n readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n readline(-1) -> (41) x-hgarg-1: cmds=heads+%3Bknown+nodes%3D\r\n - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=zstd,zlib,none,bzip2\r\n + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$\r\n readline(-1) -> (35) accept: application/mercurial-0.1\r\n readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n @@ -574,7 +574,7 @@ Server sends partial compression string readline(-1) -> (27) Accept-Encoding: identity\r\n readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n readline(-1) -> (396) x-hgarg-1: bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=96ee1d7354c4ad7372047672c36a1f561e3a6a4c&listkeys=phases%2Cbookmarks\r\n - readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=zstd,zlib,none,bzip2\r\n + readline(-1) -> (48) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$\r\n readline(-1) -> (35) accept: application/mercurial-0.1\r\n readline(-1) -> (2?) host: localhost:$HGPORT\r\n (glob) readline(-1) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n diff --git a/tests/test-http-bundle1.t b/tests/test-http-bundle1.t --- a/tests/test-http-bundle1.t +++ b/tests/test-http-bundle1.t @@ -265,66 +265,66 @@ test http authentication $ sed 's/.*] "/"/' < ../access.log "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+5eb5abfefeea63c80dd7553bcc3783f37e0c5524* (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ $ cd .. diff --git a/tests/test-http-proxy.t b/tests/test-http-proxy.t --- a/tests/test-http-proxy.t +++ b/tests/test-http-proxy.t @@ -107,19 +107,19 @@ do not use the proxy if it is in the no 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat proxy.log * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d629 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=83180e7845de420a1bb46896fd5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d629 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=0&common=83180e7845de420a1bb46896fd5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ diff --git a/tests/test-http.t b/tests/test-http.t --- a/tests/test-http.t +++ b/tests/test-http.t @@ -256,63 +256,63 @@ test http authentication $ sed 's/.*] "/"/' < ../access.log "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=stream_out HTTP/1.1" 401 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 403 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365* (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ $ cd .. diff --git a/tests/test-largefiles-wireproto.t b/tests/test-largefiles-wireproto.t --- a/tests/test-largefiles-wireproto.t +++ b/tests/test-largefiles-wireproto.t @@ -352,7 +352,7 @@ largefiles should batch verify remote ca searching 2 changesets for largefiles verified existence of 2 revisions of 2 largefiles $ tail -1 access.log - $LOCALIP - - [*] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=statlfile+sha%3D972a1a11f19934401291cc99117ec614933374ce%3Bstatlfile+sha%3Dc801c9cfe94400963fcb683246217d5db77f9a9a x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=statlfile+sha%3D972a1a11f19934401291cc99117ec614933374ce%3Bstatlfile+sha%3Dc801c9cfe94400963fcb683246217d5db77f9a9a x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ $ hg -R batchverifyclone update getting changed largefiles 2 largefiles updated, 0 removed @@ -390,7 +390,7 @@ available locally. searching 3 changesets for largefiles verified existence of 3 revisions of 3 largefiles $ tail -1 access.log - $LOCALIP - - [*] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=statlfile+sha%3Dc8559c3c9cfb42131794b7d8009230403b9b454c x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=statlfile+sha%3Dc8559c3c9cfb42131794b7d8009230403b9b454c x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ $ killdaemons.py diff --git a/tests/test-setdiscovery.t b/tests/test-setdiscovery.t --- a/tests/test-setdiscovery.t +++ b/tests/test-setdiscovery.t @@ -350,9 +350,9 @@ Test actual protocol when pulling one ne $ killdaemons.py $ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ $ cat errors.log $ cd .. diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t --- a/tests/test-ssh-bundle1.t +++ b/tests/test-ssh-bundle1.t @@ -468,7 +468,7 @@ debug output sending hello command sending between command remote: 372 - remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN + remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS$ unbundle=HG10GZ,HG10BZ,HG10UN remote: 1 preparing listkeys for "bookmarks" sending listkeys command diff --git a/tests/test-ssh.t b/tests/test-ssh.t --- a/tests/test-ssh.t +++ b/tests/test-ssh.t @@ -484,7 +484,7 @@ debug output sending hello command sending between command remote: 372 - remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN + remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS$ unbundle=HG10GZ,HG10BZ,HG10UN remote: 1 query 1; heads sending batch command diff --git a/tests/test-treediscovery.t b/tests/test-treediscovery.t --- a/tests/test-treediscovery.t +++ b/tests/test-treediscovery.t @@ -516,35 +516,35 @@ Both have new stuff in existing named br #if zstd $ tstop show "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob) - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ "GET /?cmd=capabilities HTTP/1.1" 200 - - "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 + "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ #else $ tstop show "GET /?cmd=capabilities HTTP/1.1" 200 - diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t --- a/tests/test-wireproto.t +++ b/tests/test-wireproto.t @@ -94,23 +94,23 @@ HTTP without args-in-POST: * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:1033* (glob) * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:1033* (glob) * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=quatre&one=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=quatre&one=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=quatre&one=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=quatre&one=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=qu++atre&one=+un&three=trois+&two=deux x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=qu++atre&one=+un&three=trois+&two=deux x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=qu++atre&one=+un&three=trois+&two=deux x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=qu++atre&one=+un&three=trois+&two=deux x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=vier&one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=vier&one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=vier&one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=vier&one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg-2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg-2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg-2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg-2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ HTTP without the httpheader capability: @@ -133,17 +133,17 @@ HTTP without the httpheader capability: $ cat error2.log $ cat access2.log * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=debugwireargs&four=quatre&one=un&three=trois&two=deux HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET /?cmd=debugwireargs&four=quatre&one=un&three=trois&two=deux HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs&four=quatre&one=un&three=trois&two=deux HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs&four=quatre&one=un&three=trois&two=deux HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=debugwireargs&four=vier&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET /?cmd=debugwireargs&four=vier&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs&four=vier&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs&four=vier&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) - * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) - * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ + $LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ SSH (try to exercise the ssh functionality with a dummy script):