# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1508532898 -7200
# Node ID 088ea9b74e47bb9ab498835e830d13a905146122
# Parent  50be10c63825dd0b590c4a8ec44b1860fe93b5fb# Parent  a1cdc128defd745588c0c747a9b49ce1d719ec34
test-compat: merge future 6.7.0 in mercurial-4.0 branch

diff -r a1cdc128defd -r 088ea9b74e47 tests/test-check-flake8.t
--- a/tests/test-check-flake8.t	Fri Oct 20 22:54:41 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-#require test-repo
-
-  $ checkflake8() {
-  >   if ! (which flake8 > /dev/null); then
-  >     echo skipped: missing tool: flake8;
-  >     exit 80;
-  >   fi;
-  > };
-  $ checkflake8
-
-Copied from Mercurial core (60ee2593a270)
-
-  $ cd "`dirname "$TESTDIR"`"
-
-run flake8 if it exists; if it doesn't, then just skip
-
-  $ hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' 2>/dev/null \
-  > | xargs -0 flake8
diff -r a1cdc128defd -r 088ea9b74e47 tests/test-check-setup-manifest.t
--- a/tests/test-check-setup-manifest.t	Fri Oct 20 22:54:41 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#require test-repo
-
-  $ checkcm() {
-  >   if ! (which check-manifest > /dev/null); then
-  >     echo skipped: missing tool: check-manifest;
-  >     exit 80;
-  >   fi;
-  > };
-  $ checkcm
-  $ cat << EOF >> $HGRCPATH
-  > [experimental]
-  > evolution=all
-  > EOF
-
-Run check manifest:
-
-  $ cd $TESTDIR/..
-  $ check-manifest
-  lists of files in version control and sdist match
diff -r a1cdc128defd -r 088ea9b74e47 tests/test-discovery-obshashrange.t
--- a/tests/test-discovery-obshashrange.t	Fri Oct 20 22:54:41 2017 +0200
+++ b/tests/test-discovery-obshashrange.t	Fri Oct 20 22:54:58 2017 +0200
@@ -194,8 +194,8 @@
   running python "*/dummyssh" user@dummy 'hg -R server serve --stdio' (glob)
   sending hello command
   sending between command
-  remote: 516
-  remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v0 _evoext_pullobsmarkers_0 _evoext_pushobsmarkers_0 batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset getbundle known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
+  remote: 532
+  remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v0 _evoext_pullobsmarkers_0 _evoext_pushobsmarkers_0 batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset getbundle httpheader=1024 known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
   remote: 1
   preparing listkeys for "phases"
   sending listkeys command
diff -r a1cdc128defd -r 088ea9b74e47 tests/test-evolve-obshistory-complex.t
--- a/tests/test-evolve-obshistory-complex.t	Fri Oct 20 22:54:41 2017 +0200
+++ b/tests/test-evolve-obshistory-complex.t	Fri Oct 20 22:54:58 2017 +0200
@@ -80,14 +80,12 @@
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  trouble:     unstable
   |  summary:     fold2
   |
   | o  changeset:   8:d15d0ffc75f6
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | | o  changeset:   7:b868bc49b0a4
@@ -232,27 +230,23 @@
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  trouble:     unstable
   |  summary:     fold2
   |
   o  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  trouble:     unstable
   |  summary:     fold2
   |
   | o  changeset:   13:d0f33db50670
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | o  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | | o  changeset:   11:e036916b63ea
@@ -304,21 +298,18 @@
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  trouble:     unstable
   |  summary:     fold2
   |
   o  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  trouble:     unstable
   |  summary:     fold2
   |
   | o  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | | o  changeset:   10:19e14c8397fc
diff -r a1cdc128defd -r 088ea9b74e47 tests/test-evolve-obshistory.t
--- a/tests/test-evolve-obshistory.t	Fri Oct 20 22:54:41 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Fri Oct 20 22:54:58 2017 +0200
@@ -1015,14 +1015,12 @@
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  trouble:     divergent
   |  summary:     A2
   |
   | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    trouble:     divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
diff -r a1cdc128defd -r 088ea9b74e47 tests/test-evolve-templates.t
--- a/tests/test-evolve-templates.t	Fri Oct 20 22:54:41 2017 +0200
+++ b/tests/test-evolve-templates.t	Fri Oct 20 22:54:58 2017 +0200
@@ -431,14 +431,12 @@
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  trouble:     divergent
   |  summary:     A2
   |
   | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    trouble:     divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
diff -r a1cdc128defd -r 088ea9b74e47 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Fri Oct 20 22:54:41 2017 +0200
+++ b/tests/test-obsolete.t	Fri Oct 20 22:54:58 2017 +0200
@@ -579,7 +579,6 @@
   parent:      10:2033b4e49474
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  trouble:     bumped
   summary:     add obsol_d'''
   
   $ hg push ../other-new/
@@ -609,7 +608,6 @@
   |/   parent:      10:2033b4e49474
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    trouble:     bumped
   |    summary:     add obsol_d'''
   |
   | o  changeset:   11:9468a5f5d8b2
@@ -673,7 +671,6 @@
   parent:      10:2033b4e49474
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  trouble:     bumped, divergent
   summary:     add obsol_d'''
   
   changeset:   16:50f11e5e3a63
@@ -681,7 +678,6 @@
   parent:      11:9468a5f5d8b2
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  trouble:     divergent
   summary:     add obsolet_conflicting_d
   
 
@@ -721,14 +717,12 @@
   |  parent:      2:4538525df7e2
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  trouble:     unstable
   |  summary:     add obsol_d''
   |
   | o  changeset:   16:50f11e5e3a63
   | |  parent:      11:9468a5f5d8b2
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     divergent
   | |  summary:     add obsolet_conflicting_d
   | |
   | | o  changeset:   15:705ab2a6b72e
@@ -752,7 +746,6 @@
   | | |/   parent:      10:2033b4e49474
   | | |    user:        test
   | | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |    trouble:     bumped, divergent
   | | |    summary:     add obsol_d'''
   | | |
   | o |  changeset:   11:9468a5f5d8b2
diff -r a1cdc128defd -r 088ea9b74e47 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Fri Oct 20 22:54:41 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Oct 20 22:54:58 2017 +0200
@@ -145,7 +145,6 @@
   | o  changeset:   5:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   4:5977072d13c5
@@ -236,7 +235,6 @@
   | o  changeset:   8:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   7:e04690b09bc6
diff -r a1cdc128defd -r 088ea9b74e47 tests/test-stabilize-order.t
--- a/tests/test-stabilize-order.t	Fri Oct 20 22:54:41 2017 +0200
+++ b/tests/test-stabilize-order.t	Fri Oct 20 22:54:58 2017 +0200
@@ -208,13 +208,11 @@
   | |  parent:      12:2256dae6521f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     secondambiguous
   | |
   | | o  changeset:   13:bdc003b6eec2
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    trouble:     unstable
   | |    summary:     firstambiguous
   | |
   | x  changeset:   12:2256dae6521f
diff -r a1cdc128defd -r 088ea9b74e47 tests/test-topic-change.t
--- a/tests/test-topic-change.t	Fri Oct 20 22:54:41 2017 +0200
+++ b/tests/test-topic-change.t	Fri Oct 20 22:54:58 2017 +0200
@@ -366,55 +366,3 @@
   o  8:86a186070af2 {}
      Added a  ()
   
-Changing topic on secret changesets
------------------------------------
-
-  $ hg up 26
-  switching to topic bar
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  (leaving bookmark bookboo)
-
-  $ hg phase -r . -s -f
-  $ hg phase -r .
-  26: secret
-
-  $ hg topic -r . watwat
-  switching to topic watwat
-  changed topic on 1 changes
-
-  $ hg glog
-  @  36:894983f69e69 {watwat}
-  |  Added g  ()
-  |
-  | o  35:1b83d11095b9 {movebook}
-  | |  Added h  ()
-  | |
-  | | x  34:c48d6d71b2d9 {}
-  | |/   Added h  (bookboo)
-  | |
-  | | x  33:a24c31c35013 {watwat}
-  | |/   Added h  (book)
-  | |
-  | x  26:7c76c271395f {bar}
-  |/   Added g  ()
-  |
-  o  25:7f26084dfaf1 {bar}
-  |  Added f  ()
-  |
-  o  24:b1f05e9ba0b5 {bar}
-  |  Added e  ()
-  |
-  o  23:f9869da2286e {foo}
-  |  Added d  ()
-  |
-  o  22:1b88140feefe {foobar}
-  |  Added c  ()
-  |
-  o  21:c39cabfcbbf7 {foobar}
-  |  Added b  ()
-  |
-  o  8:86a186070af2 {}
-     Added a  ()
-  
-  $ hg phase -r .
-  36: secret
diff -r a1cdc128defd -r 088ea9b74e47 tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Fri Oct 20 22:54:41 2017 +0200
+++ b/tests/test-topic-tutorial.t	Fri Oct 20 22:54:58 2017 +0200
@@ -1211,14 +1211,12 @@
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     Adding drill
   | |
   | o  changeset:   14:d4f97f32f8a1
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     Adding saw
   | |
   | x  changeset:   13:a8ab3599d53d