# HG changeset patch # User Anton Shestakov # Date 1650909930 -14400 # Node ID 14152b9abf936136536e17aabdcd0750c5906920 # Parent 409e332e518ab1d56d6d069073429c22b96b17ce# Parent 0042d69b864841d1eabb2812f500e03bcc99fa8f test-compat: merge mercurial-5.8 into mercurial-5.7 diff -r 409e332e518a -r 14152b9abf93 tests/test-discovery-obshashrange.t --- a/tests/test-discovery-obshashrange.t Mon Apr 25 21:34:40 2022 +0400 +++ b/tests/test-discovery-obshashrange.t Mon Apr 25 22:05:30 2022 +0400 @@ -150,6 +150,7 @@ cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} $ rm ../server/.hg/blackbox.log $ hg blackbox + * @0000000000000000000000000000000000000000 (*)> 0/0 cache hits/lookups in *.???? seconds (glob) * @0000000000000000000000000000000000000000 (*)> clone *ssh://user@dummy/server* client exited 0 after *.?? seconds (glob) * @0000000000000000000000000000000000000000 (*)> pull --rev 4 (glob) * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (5r, 3o) (glob) @@ -305,7 +306,7 @@ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending hello command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending between command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: * (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Acheckheads%3Drelated%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Acheckheads%3Drelated%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: 1 (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending protocaps command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 1; heads (glob) diff -r 409e332e518a -r 14152b9abf93 tests/test-evolve-interrupted.t --- a/tests/test-evolve-interrupted.t Mon Apr 25 21:34:40 2022 +0400 +++ b/tests/test-evolve-interrupted.t Mon Apr 25 22:05:30 2022 +0400 @@ -48,7 +48,7 @@ transaction abort! rollback completed abort: precommit hook exited with status 1 - [40] + [255] $ hg l @ 2 apricot and blueberry @@ -107,7 +107,7 @@ transaction abort! rollback completed abort: precommit hook exited with status 1 - [40] + [255] $ cat b banana $ hg evolve --stop @@ -132,7 +132,7 @@ transaction abort! rollback completed abort: precommit hook exited with status 1 - [40] + [255] $ hg evolve --continue evolving 1:e0486f65907d "banana" working directory is now at bd5ec7dfc2af diff -r 409e332e518a -r 14152b9abf93 tests/test-prev-next.t --- a/tests/test-prev-next.t Mon Apr 25 21:34:40 2022 +0400 +++ b/tests/test-prev-next.t Mon Apr 25 22:05:30 2022 +0400 @@ -431,7 +431,7 @@ $ hg prev abort: conflicting changes (do you want --merge?) - [20] + [255] $ echo hi > bar $ hg prev @@ -443,7 +443,7 @@ $ hg next abort: conflicting changes (do you want --merge?) - [20] + [255] Test that --merge still works fine with commands.update.check set @@ -454,7 +454,7 @@ $ hg next abort: conflicting changes (do you want --merge?) - [20] + [255] $ hg next --merge merging bar warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') diff -r 409e332e518a -r 14152b9abf93 tests/test-pullbundle.t --- a/tests/test-pullbundle.t Mon Apr 25 21:34:40 2022 +0400 +++ b/tests/test-pullbundle.t Mon Apr 25 22:05:30 2022 +0400 @@ -40,7 +40,7 @@ 16 changesets found 2 changesets found 1 changesets found - bundle2-output-bundle: "HG20", 7 parts total + bundle2-output-bundle: "HG20", 8 parts total bundle2-output: start emission of HG20 stream bundle2-output: bundle parameter: bundle2-output: start of parts @@ -91,6 +91,12 @@ bundle2-output: header chunk size: 18 bundle2-output: payload chunk size: 24 bundle2-output: closing payload chunk + bundle2-output: bundle part: "cache:rev-branch-cache" + bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload + bundle2-output: part 7: "cache:rev-branch-cache" + bundle2-output: header chunk size: 29 + bundle2-output: payload chunk size: 24719 + bundle2-output: closing payload chunk bundle2-output: end of bundle bundle2-input: start processing of HG20 stream bundle2-input: reading bundle2 stream parameters @@ -182,9 +188,18 @@ bundle2-input: payload chunk size: 24 bundle2-input: payload chunk size: 0 bundle2-input-part: total payload size 24 + bundle2-input: part header size: 29 + bundle2-input: part type: "cache:rev-branch-cache" + bundle2-input: part id: "7" + bundle2-input: part parameters: 0 + bundle2-input: found a handler for part cache:rev-branch-cache + bundle2-input-part: "cache:rev-branch-cache" (advisory) supported + bundle2-input: payload chunk size: 24719 + bundle2-input: payload chunk size: 0 + bundle2-input-part: total payload size 24719 bundle2-input: part header size: 0 bundle2-input: end of bundle2 stream - bundle2-input-bundle: 7 parts total + bundle2-input-bundle: 8 parts total checking for updated bookmarks updating the branch cache added 1235 changesets with 0 changes to 0 files