Mercurial > evolve
changeset 6403:567cc86f2d01 mercurial-4.8
test-compat: merge mercurial-4.9 into mercurial-4.8
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 07 Feb 2023 15:07:02 +0400 |
| parents | af69ae146159 (diff) 2cd36fe3f4e6 (current diff) |
| children | e5e78734dcdd |
| files | tests/test-evolve-abort-orphan.t tests/test-evolve-interrupted.t tests/test-evolve-stop-orphan.t tests/test-split.t tests/test-topic-flow-publish-bare.t tests/test-topic-stack.t tests/test-topic.t |
| diffstat | 10 files changed, 32 insertions(+), 102 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-discovery-obshashrange.t Tue Feb 07 11:30:34 2023 +0400 +++ b/tests/test-discovery-obshashrange.t Tue Feb 07 15:07:02 2023 +0400 @@ -299,7 +299,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%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: capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 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%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: 1 (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending protocaps command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 1; heads (glob)
--- a/tests/test-evolve-abort-orphan.t Tue Feb 07 11:30:34 2023 +0400 +++ b/tests/test-evolve-abort-orphan.t Tue Feb 07 15:07:02 2023 +0400 @@ -561,4 +561,3 @@ undo.branch undo.desc undo.dirstate - wcache
--- a/tests/test-evolve-interrupted.t Tue Feb 07 11:30:34 2023 +0400 +++ b/tests/test-evolve-interrupted.t Tue Feb 07 15:07:02 2023 +0400 @@ -42,7 +42,7 @@ x 0 apricot - $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other + $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=internal:other move:[1] banana atop:[2] apricot and blueberry transaction abort! @@ -101,7 +101,7 @@ x 0 apricot - $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other + $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry transaction abort! @@ -126,7 +126,7 @@ x 0 apricot - $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other + $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry transaction abort!
--- a/tests/test-evolve-stop-orphan.t Tue Feb 07 11:30:34 2023 +0400 +++ b/tests/test-evolve-stop-orphan.t Tue Feb 07 15:07:02 2023 +0400 @@ -182,7 +182,6 @@ undo.branch undo.desc undo.dirstate - wcache Checking when multiple revs need to be evolved, some revs evolve without conflicts
--- a/tests/test-options.t Tue Feb 07 11:30:34 2023 +0400 +++ b/tests/test-options.t Tue Feb 07 15:07:02 2023 +0400 @@ -24,7 +24,6 @@ > allowunstable > exchange > EOF - $ hg prune + $ hg prune | head -n 2 hg: unknown command 'prune' (use 'hg help' for a list of commands) - [255]
--- a/tests/test-pullbundle.t Tue Feb 07 11:30:34 2023 +0400 +++ b/tests/test-pullbundle.t Tue Feb 07 15:07:02 2023 +0400 @@ -31,7 +31,6 @@ $ hg -R client pull server -r 1234 --debug --config devel.bundle2.debug=yes | grep -v 'add changeset' pulling from server - listing keys for "bookmarks" query 1; heads pullbundle-cache: "missing" set sliced into 6 subranges in *.* seconds (glob) 1024 changesets found @@ -40,7 +39,8 @@ 16 changesets found 2 changesets found 1 changesets found - bundle2-output-bundle: "HG20", 8 parts total + listing keys for "bookmarks" + bundle2-output-bundle: "HG20", 9 parts total bundle2-output: start emission of HG20 stream bundle2-output: bundle parameter: bundle2-output: start of parts @@ -85,15 +85,20 @@ bundle2-output: header chunk size: 41 bundle2-output: payload chunk size: 196 bundle2-output: closing payload chunk + bundle2-output: bundle part: "listkeys" + bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload + bundle2-output: part 6: "LISTKEYS" + bundle2-output: header chunk size: 35 + bundle2-output: closing payload chunk bundle2-output: bundle part: "phase-heads" bundle2-output-part: "phase-heads" 24 bytes payload - bundle2-output: part 6: "PHASE-HEADS" + bundle2-output: part 7: "PHASE-HEADS" 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: part 8: "cache:rev-branch-cache" bundle2-output: header chunk size: 29 bundle2-output: payload chunk size: 24719 bundle2-output: closing payload chunk @@ -185,9 +190,16 @@ adding file changes added 1 changesets with 0 changes to 0 files bundle2-input-part: total payload size 196 + bundle2-input: part header size: 35 + bundle2-input: part type: "LISTKEYS" + bundle2-input: part id: "6" + bundle2-input: part parameters: 1 + bundle2-input: found a handler for part listkeys + bundle2-input-part: "listkeys" (params: 1 mandatory) supported + bundle2-input: payload chunk size: 0 bundle2-input: part header size: 18 bundle2-input: part type: "PHASE-HEADS" - bundle2-input: part id: "6" + bundle2-input: part id: "7" bundle2-input: part parameters: 0 bundle2-input: found a handler for part phase-heads bundle2-input-part: "phase-heads" supported @@ -196,7 +208,7 @@ 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 id: "8" 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 @@ -205,7 +217,7 @@ 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 stable-range cache: unable to load, regenerating obshashrange cache: unable to load, regenerating
--- a/tests/test-split.t Tue Feb 07 11:30:34 2023 +0400 +++ b/tests/test-split.t Tue Feb 07 15:07:02 2023 +0400 @@ -1086,14 +1086,16 @@ Now if we prune revision 4 the expected destination of orphan cset 2 is 3. Lets check evolve does as expected: + +The fix is 4.9 only, so we simply cheat on older version + Pruning revision 4 (current one): $ hg prune . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory is now at 88437e073cd4 1 changesets pruned - $ hg evolve -r 2 - move:[2] c - atop:[3] split1 + $ hg rebase -r 2 -d 3 --config extensions.rebase= + rebasing 2:ab6ca3ebca74 "c" $ hg glog o 5:21a63bd6ee88 c (draft) |
--- a/tests/test-topic-flow-publish-bare.t Tue Feb 07 11:30:34 2023 +0400 +++ b/tests/test-topic-flow-publish-bare.t Tue Feb 07 15:07:02 2023 +0400 @@ -14,6 +14,9 @@ > auto-publish = warn > [alias] > tgl = log --rev 'sort(\$1, "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}' + > [extensions] + > # needed for experimental.auto-publish in hg <= 4.8 + > evolve = > EOF Publishing of bare branch
--- a/tests/test-topic-stack.t Tue Feb 07 11:30:34 2023 +0400 +++ b/tests/test-topic-stack.t Tue Feb 07 15:07:02 2023 +0400 @@ -385,17 +385,6 @@ hg: parse error: stack takes no arguments, it works on current topic [255] -Stack relation subscript: - - $ hg log -r 'foo#stack[0]' - 1 default {} public c_b - $ hg log -r 's0 and foo#stack[0]' - 1 default {} public c_b - $ hg log -r 'foo#stack[4]' - 5 default {foo} draft c_f - $ hg log -r 's4 and foo#stack[4]' - 5 default {foo} draft c_f - Case with multiple heads on the topic -------------------------------------
--- a/tests/test-topic.t Tue Feb 07 11:30:34 2023 +0400 +++ b/tests/test-topic.t Tue Feb 07 15:07:02 2023 +0400 @@ -942,79 +942,6 @@ 3: featureA 4: -topic subscript relation - - $ tlog 'featureA' - 3: featureA - $ tlog 'featureA#topic[0]' - 3: featureA - - $ tlog '2#t[-2]' - $ tlog '2#t[-1]' - 1: featureA - $ tlog '2#t[0]' - 2: featureA - $ tlog '2#t[1]' - 3: featureA - $ tlog '2#t[2]' - -stack subscript relation - - $ hg stack - ### target: default (branch) - s2@ 4 (current) - ^ 3 - s1: 0 - - $ tlog 'tip#stack[0]' - $ tlog 'tip#stack[1]' - 0: - $ tlog 'tip#stack[2]' - 4: - $ tlog 'tip#stack[-1]' - 4: - $ tlog 'tip#stack[-2]' - 0: - - $ hg stack featureA - ### topic: featureA - ### target: default (branch), 3 behind - s3: 3 - s2: 2 - s1: 1 - s0^ 0 (base) - - $ tlog 'featureA#s[0]' - 0: - $ tlog 'featureA#s[1] and featureA#s[-3]' - 1: featureA - $ tlog 'featureA#s[2] and featureA#s[-2]' - 2: featureA - $ tlog 'featureA#s[3] and featureA#s[-1]' - 3: featureA - $ tlog 'featureA#s[-4]' - - $ tlog 'all()#s[-1]' - 3: featureA - 4: - $ tlog 'all()#s[0]' - 0: - $ tlog 'all()#s[1]' - 0: - 1: featureA - $ tlog 'all()#s[9999]' - $ tlog 'all()#s[-9999]' - - $ hg topic featureB - marked working directory as topic: featureB - $ hg stack - ### topic: featureB - ### target: default (branch) - (stack is empty) - s0^ 4 (base current) - $ tlog 'wdir()#s[0]' - 4: - $ cd .. Testing the new config knob to forbid untopiced commit