Mercurial > evolve
changeset 6812:ff7a9ad270b2 mercurial-5.3
test-compat: merge mercurial-5.4 into mercurial-5.3
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 26 Jun 2024 21:08:30 +0400 |
| parents | 6ea8c0a16d83 (current diff) 5376963ea1d9 (diff) |
| children | 3c880848174c a7929709e89f |
| files | .gitlab-ci.yml tests/test-evolve-interrupted.t |
| diffstat | 11 files changed, 24 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitlab-ci.yml Wed Jun 26 20:39:06 2024 +0400 +++ b/.gitlab-ci.yml Wed Jun 26 21:08:30 2024 +0400 @@ -46,7 +46,7 @@ variables: PY: py2 PYTHON: prlimit --nofile=1024:1024 python2 - RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" + RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt" TEST_HGMODULEPOLICY: "c" tests-py2-pure: @@ -60,7 +60,7 @@ tests-py3-cext: <<: *runtests variables: - RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" + RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt" TEST_HGMODULEPOLICY: "c" tests-py3-pure:
--- a/tests/test-discovery-obshashrange.t Wed Jun 26 20:39:06 2024 +0400 +++ b/tests/test-discovery-obshashrange.t Wed Jun 26 21:08:30 2024 +0400 @@ -307,7 +307,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%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,sparserevlog 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 Wed Jun 26 20:39:06 2024 +0400 +++ b/tests/test-evolve-abort-orphan.t Wed Jun 26 21:08:30 2024 +0400 @@ -203,7 +203,7 @@ | () draft | * 6:69c43da639bb added d | | () draft orphan - | % 5:e93a9161a274 added c + | * 5:e93a9161a274 added c | | () draft orphan | x 2:b1661037fa25 added b | | () draft @@ -297,7 +297,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | % 6:8f20d4390c21 foo to a + | * 6:8f20d4390c21 foo to a | | () draft orphan | | * 5:bcb1c47f8520 added d | | | () draft orphan @@ -361,7 +361,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | % 6:8f20d4390c21 foo to a + | * 6:8f20d4390c21 foo to a | | () draft orphan | | * 5:bcb1c47f8520 added d | | | () draft orphan @@ -446,7 +446,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | % 6:8f20d4390c21 foo to a + | * 6:8f20d4390c21 foo to a | | () draft orphan | x 1:2f913b0c9220 added a |/ () draft @@ -514,7 +514,7 @@ | (bm1) draft o 4:a0086c17bfc7 added a | () draft - | % 3:17509928e5bf added c + | * 3:17509928e5bf added c | | () draft orphan | x 2:9f0c80a55ddc added b | | () draft
--- a/tests/test-evolve-interrupted.t Wed Jun 26 20:39:06 2024 +0400 +++ b/tests/test-evolve-interrupted.t Wed Jun 26 21:08:30 2024 +0400 @@ -52,7 +52,7 @@ $ hg l @ 2 apricot and blueberry - % 1 banana + * 1 banana | x 0 apricot @@ -80,7 +80,7 @@ $ hg l @ 2 apricot and blueberry - % 1 banana + * 1 banana | x 0 apricot
--- a/tests/test-evolve-phase.t Wed Jun 26 20:39:06 2024 +0400 +++ b/tests/test-evolve-phase.t Wed Jun 26 21:08:30 2024 +0400 @@ -103,7 +103,7 @@ $ hg glog @ 3 - 87495ea7c9ec b (draft) | - | % 2 - 13833940840c c (secret) + | * 2 - 13833940840c c (secret) | | | x 1 - 1e6c11564562 b (draft) |/
--- a/tests/test-evolve-progress.t Wed Jun 26 20:39:06 2024 +0400 +++ b/tests/test-evolve-progress.t Wed Jun 26 21:08:30 2024 +0400 @@ -33,7 +33,7 @@ ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 a: remote is newer -> g getting a - updating: a 1/2 files (50.00%) + updating: a 1/1 files (100.00%) committing files: a committing manifest @@ -42,6 +42,8 @@ move:[2] third hg rebase -r 769574b07a96 -d 5f16d91ecde0 evolve: 2/3 changesets (66.67%) + unmatched files in other: + b resolving manifests branchmerge: True, force: True, partial: False ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 @@ -61,7 +63,7 @@ ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab b: remote is newer -> g getting b - updating: b 1/2 files (50.00%) + updating: b 1/1 files (100.00%) committing files: b committing manifest @@ -94,7 +96,7 @@ ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 a: remote is newer -> g getting a - updating: a 1/2 files (50.00%) + updating: a 1/1 files (100.00%) committing files: a committing manifest @@ -153,6 +155,8 @@ atop:[11] second hg rebase -r 53c0008d98a0 -d c8caf623f57b evolve: 2/3 changesets (66.67%) + unmatched files in other: + b resolving manifests branchmerge: True, force: True, partial: False ancestor: 5f16d91ecde0, local: c8caf623f57b+, remote: 53c0008d98a0 @@ -171,7 +175,7 @@ ancestor: 53c0008d98a0, local: 55f7ff45dec4+, remote: 385376d04062 b: remote is newer -> g getting b - updating: b 1/2 files (50.00%) + updating: b 1/1 files (100.00%) committing files: b committing manifest
--- a/tests/test-evolve.t Wed Jun 26 20:39:06 2024 +0400 +++ b/tests/test-evolve.t Wed Jun 26 21:08:30 2024 +0400 @@ -1403,7 +1403,7 @@ | o 32:d788a38aecda@default(draft) amended | - | % 31:835945a2b5c1@default(draft) will cause conflict at evolve + | * 31:835945a2b5c1@default(draft) will cause conflict at evolve | | | x 30:c4fb0d23465b@default(draft) will be evolved safely | |
--- a/tests/test-namespaces.t Wed Jun 26 20:39:06 2024 +0400 +++ b/tests/test-namespaces.t Wed Jun 26 21:08:30 2024 +0400 @@ -41,7 +41,7 @@ $ hg --encoding utf-8 debug-topic-namespace æ marked working directory as topic namespace: \xc3\xa6 (esc) $ hg --encoding utf-8 debug-topic-namespaces - æ (esc) + \xc3\xa6 (esc) $ hg --encoding ascii debug-topic-namespaces ? (esc) $ hg --encoding latin1 debug-topic-namespaces
--- a/tests/test-stabilize-conflict.t Wed Jun 26 20:39:06 2024 +0400 +++ b/tests/test-stabilize-conflict.t Wed Jun 26 21:08:30 2024 +0400 @@ -144,7 +144,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | % changeset: 4:71c18f70c34f + | * changeset: 4:71c18f70c34f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan @@ -242,7 +242,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | % changeset: 6:368da14a3c59 + | * changeset: 6:368da14a3c59 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan
--- a/tests/test-topic-stack.t Wed Jun 26 20:39:06 2024 +0400 +++ b/tests/test-topic-stack.t Wed Jun 26 21:08:30 2024 +0400 @@ -385,14 +385,6 @@ hg: parse error: stack takes no arguments, it works on current topic [255] -Stack relation: - - $ hg log -r 'foo#stack' - 2 default {foo} draft c_c - 4 default {foo} draft c_e - 5 default {foo} draft c_f - 6 default {foo} draft c_d - Stack relation subscript: $ hg log -r 'foo#stack[0]'
--- a/tests/test-topic.t Wed Jun 26 20:39:06 2024 +0400 +++ b/tests/test-topic.t Wed Jun 26 21:08:30 2024 +0400 @@ -327,7 +327,7 @@ $ hg --encoding utf-8 topic æ marked working directory as topic: \xc3\xa6 (esc) $ hg --encoding utf-8 topics - * æ (0 changesets) (esc) + * \xc3\xa6 (0 changesets) (esc) $ hg --encoding ascii topics * ? (0 changesets) (esc) $ hg --encoding latin1 topics @@ -983,10 +983,6 @@ ^ 3 s1: 0 - $ tlog 'tip#s' - 0: - 4: - $ tlog 'tip#stack[0]' $ tlog 'tip#stack[1]' 0: @@ -1005,11 +1001,6 @@ s1: 1 s0^ 0 (base) - $ tlog 'featureA#s' - 1: featureA - 2: featureA - 3: featureA - $ tlog 'featureA#s[0]' 0: $ tlog 'featureA#s[0:0]' @@ -1060,7 +1051,6 @@ ### target: default (branch) (stack is empty) s0^ 4 (base current) - $ tlog 'wdir()#s' $ tlog 'wdir()#s[0]' 4: