# HG changeset patch # User Pierre-Yves David # Date 1513005158 -3600 # Node ID 76c447d88d9a2e9463f668361abaeed404a63a1d # Parent 9f4d5b03900203a6bb0b357585624f7ccf503a1b test: backed out test change from changeset a18ca224e812 The related mercurial changeset, ad5f2b923b0d, is not in the stable branch yet. diff -r 9f4d5b039002 -r 76c447d88d9a tests/test-discovery-obshashrange.t --- a/tests/test-discovery-obshashrange.t Mon Dec 11 16:02:42 2017 +0100 +++ b/tests/test-discovery-obshashrange.t Mon Dec 11 16:12:38 2017 +0100 @@ -187,7 +187,7 @@ running python "*/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) sending hello command sending between command - remote: 495 + remote: 483 remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v0 batch * (glob) remote: 1 preparing listkeys for "phases" @@ -222,7 +222,7 @@ 45f8b879de922f6a6e620ba04205730335b6fc7e sending unbundle command bundle2-output-bundle: "HG20", 4 parts total - bundle2-output-part: "replycaps" 195 bytes payload + bundle2-output-part: "replycaps" 185 bytes payload bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload bundle2-output-part: "phase-heads" 24 bytes payload bundle2-output-part: "obsmarkers" streamed payload diff -r 9f4d5b039002 -r 76c447d88d9a tests/test-wireproto.t --- a/tests/test-wireproto.t Mon Dec 11 16:02:42 2017 +0100 +++ b/tests/test-wireproto.t Mon Dec 11 16:12:38 2017 +0100 @@ -195,7 +195,7 @@ $ cat hg.pid >> $DAEMON_PIDS $ curl -s http://localhost:$HGPORT/?cmd=capabilities - _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=zstd,zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) + _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=zstd,zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) Check we cannot use pushkey for marker exchange anymore