# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1604140632 -28800
# Node ID ee18173c54a295400feddd5db49281f2469070c9
# Parent  72d88e491a199e6ab1aef9a8a7613ad5e6749a09# Parent  af0458d91d10e0cb77fe15dac725a6cf05edfe22
test-compat: merge mercurial-5.4 into mercurial-5.3

# no-check-commit

diff -r 72d88e491a19 -r ee18173c54a2 .gitlab-ci.yml
--- a/.gitlab-ci.yml	Sat Oct 31 18:31:11 2020 +0800
+++ b/.gitlab-ci.yml	Sat Oct 31 18:37:12 2020 +0800
@@ -44,7 +44,7 @@
 tests-py2-cext:
     <<: *runtests
     variables:
-        RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
+        RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "c"
 
 tests-py2-pure:
@@ -58,7 +58,7 @@
     variables:
         PY: py3
         PYTHON: python3
-        RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
+        RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "c"
 
 tests-py3-pure:
diff -r 72d88e491a19 -r ee18173c54a2 tests/test-discovery-obshashrange.t
--- a/tests/test-discovery-obshashrange.t	Sat Oct 31 18:31:11 2020 +0800
+++ b/tests/test-discovery-obshashrange.t	Sat Oct 31 18:37:12 2020 +0800
@@ -328,7 +328,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)
diff -r 72d88e491a19 -r ee18173c54a2 tests/test-evolve-interrupted.t
--- a/tests/test-evolve-interrupted.t	Sat Oct 31 18:31:11 2020 +0800
+++ b/tests/test-evolve-interrupted.t	Sat Oct 31 18:37:12 2020 +0800
@@ -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
   
diff -r 72d88e491a19 -r ee18173c54a2 tests/test-evolve-progress.t
--- a/tests/test-evolve-progress.t	Sat Oct 31 18:31:11 2020 +0800
+++ b/tests/test-evolve-progress.t	Sat Oct 31 18:37:12 2020 +0800
@@ -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 60a86497fbfe
   evolve: 2/3 changesets (66.67%)
+    unmatched files in other:
+     b
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0
@@ -171,7 +175,7 @@
    ancestor: 53c0008d98a0, local: b2de95304e32+, 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
diff -r 72d88e491a19 -r ee18173c54a2 tests/test-evolve.t
diff -r 72d88e491a19 -r ee18173c54a2 tests/test-wireproto.t