# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1536005112 -7200
# Node ID dc247e648f4321ae1370718e067ce2c2c353b3e9
# Parent  9a2db13b2e99bffa265fa8f8d0cae13cd5d59b7d# Parent  eb4d07a0b19feb0eac1ec8144d666cd135656c09
test-compat: merge mercurial-4.6 into mercurial-4.5

diff -r eb4d07a0b19f -r dc247e648f43 tests/test-discovery-obshashrange.t
--- a/tests/test-discovery-obshashrange.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-discovery-obshashrange.t	Mon Sep 03 22:05:12 2018 +0200
@@ -189,7 +189,6 @@
   remote: * (glob)
   remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch * (glob)
   remote: 1
-  sending protocaps command
   preparing listkeys for "phases"
   sending listkeys command
   received listkey for "phases": 58 bytes
@@ -319,9 +318,8 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending hello command (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending between command (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: * (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _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 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _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 changegroupsubset getbundle known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: 1 (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending protocaps command (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "phases": 58 bytes (glob)
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-evolve-obshistory-amend-then-fold.t
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Mon Sep 03 22:05:12 2018 +0200
@@ -227,8 +227,8 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '471f378eab4c'!
+  (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   [255]
   $ hg update --hidden 'desc(A0)'
   updating to a hidden changeset 471f378eab4c
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-evolve-obshistory-amend.t
--- a/tests/test-evolve-obshistory-amend.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-evolve-obshistory-amend.t	Mon Sep 03 22:05:12 2018 +0200
@@ -195,8 +195,8 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '471f378eab4c'!
+  (use --hidden to access hidden revisions; successor: 4ae3a4151de9)
   [255]
   $ hg update --hidden "desc(A0)"
   updating to a hidden changeset 471f378eab4c
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-evolve-obshistory-content-divergent.t
--- a/tests/test-evolve-obshistory-content-divergent.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-evolve-obshistory-content-divergent.t	Mon Sep 03 22:05:12 2018 +0200
@@ -333,8 +333,8 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' has diverged!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '471f378eab4c'!
+  (use --hidden to access hidden revisions; diverged)
   [255]
   $ hg update --hidden 'desc(A0)'
   updating to a hidden changeset 471f378eab4c
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-evolve-obshistory-fold.t
--- a/tests/test-evolve-obshistory-fold.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-evolve-obshistory-fold.t	Mon Sep 03 22:05:12 2018 +0200
@@ -225,8 +225,8 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '471f378eab4c'!
+  (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   [255]
   $ hg update --hidden 'desc(A0)'
   updating to a hidden changeset 471f378eab4c
@@ -235,8 +235,8 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   $ hg update 0dec01379d3b
-  abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '0dec01379d3b'!
+  (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   [255]
   $ hg update --hidden 'desc(B0)'
   updating to a hidden changeset 0dec01379d3b
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-evolve-obshistory-lots-of-splits.t
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Mon Sep 03 22:05:12 2018 +0200
@@ -277,8 +277,8 @@
          (No patch available, too many successors (4))
   
   $ hg update de7290d8b885
-  abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision 'de7290d8b885'!
+  (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
   [255]
   $ hg update --hidden 'min(desc(A0))'
   updating to a hidden changeset de7290d8b885
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-evolve-obshistory-phase-divergent.t
--- a/tests/test-evolve-obshistory-phase-divergent.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-evolve-obshistory-phase-divergent.t	Mon Sep 03 22:05:12 2018 +0200
@@ -204,7 +204,7 @@
           "markers": [
               {
                   "date": [
-                      0,
+                      0.0,
                       0
                   ],
                   "effect": [
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-evolve-obshistory-prune.t
--- a/tests/test-evolve-obshistory-prune.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-evolve-obshistory-prune.t	Mon Sep 03 22:05:12 2018 +0200
@@ -102,8 +102,8 @@
   $ hg up 1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up 0dec01379d3b
-  abort: hidden revision '0dec01379d3b' is pruned!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '0dec01379d3b'!
+  (use --hidden to access hidden revisions; pruned)
   [255]
   $ hg up --hidden -r 'desc(B0)'
   updating to a hidden changeset 0dec01379d3b
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-evolve-obshistory-split.t
--- a/tests/test-evolve-obshistory-split.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-evolve-obshistory-split.t	Mon Sep 03 22:05:12 2018 +0200
@@ -199,8 +199,8 @@
          (No patch available, too many successors (2))
   
   $ hg update 471597cad322
-  abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '471597cad322'!
+  (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
   [255]
   $ hg update --hidden 'min(desc(A0))'
   updating to a hidden changeset 471597cad322
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-fold.t
--- a/tests/test-fold.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-fold.t	Mon Sep 03 22:05:12 2018 +0200
@@ -112,8 +112,8 @@
 (test inherited from test-evolve.t)
 
   $ hg fold --from 6 # want to run hg fold 6
-  abort: hidden revision '6' was rewritten as: 198b5c405d01!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '6'!
+  (use --hidden to access hidden revisions; successor: 198b5c405d01)
   [255]
 
   $ hg log -G
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-prune.t
--- a/tests/test-prune.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-prune.t	Mon Sep 03 22:05:12 2018 +0200
@@ -312,8 +312,8 @@
   bookmark 'todelete' deleted
   1 changesets pruned
   $ hg id -ir dcbb326fdec2
-  abort: hidden revision 'dcbb326fdec2' is pruned!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision 'dcbb326fdec2'!
+  (use --hidden to access hidden revisions; pruned)
   [255]
   $ hg id -ir d62d843c9a01
   d62d843c9a01
@@ -346,8 +346,8 @@
   3 changesets pruned
   $ hg tag --remove --local c
   $ hg id -ir 6:2702dd0c91e7
-  abort: hidden revision '6' is pruned!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '6'!
+  (use --hidden to access hidden revisions; pruned)
   [255]
 
   $ hg debugobsstorestat
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-topic-flow-publish-flag.t
--- a/tests/test-topic-flow-publish-flag.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-topic-flow-publish-flag.t	Mon Sep 03 22:05:12 2018 +0200
@@ -300,7 +300,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   active topic 'topic_A' is now empty
-  (use 'hg topic --clear' to clear it if needed)
   $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
   @  11:d06fc4f891e8 c_dK0 public default
   |
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-topic-mode.t
--- a/tests/test-topic-mode.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-topic-mode.t	Mon Sep 03 22:05:12 2018 +0200
@@ -244,7 +244,6 @@
 
   $ hg phase --public -r .
   active topic 'various-dove' is now empty
-  (use 'hg topic --clear' to clear it if needed)
   $ hg up default
   clearing empty topic "various-dove"
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -308,7 +307,6 @@
 
   $ hg phase --public -r .
   active topic 'various-dove' is now empty
-  (use 'hg topic --clear' to clear it if needed)
   $ hg up default
   clearing empty topic "various-dove"
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-topic-stack.t
--- a/tests/test-topic-stack.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-topic-stack.t	Mon Sep 03 22:05:12 2018 +0200
@@ -64,7 +64,6 @@
   s1: c_a
   $ hg phase --public 'topic("other")'
   active topic 'other' is now empty
-  (use 'hg topic --clear' to clear it if needed)
 
 After changing the phase of all the changesets in "other" to public, the topic should still be active, but is empty. We should be better at informating the user about it and displaying good data in this case.
 
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-topic-tutorial.t	Mon Sep 03 22:05:12 2018 +0200
@@ -602,7 +602,6 @@
   added 2 changesets with 2 changes to 1 files
   2 new obsolescence markers
   active topic 'food' is now empty
-  (use 'hg topic --clear' to clear it if needed)
 
   $ hg topics
    * food (0 changesets)
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-topic.t
--- a/tests/test-topic.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-topic.t	Mon Sep 03 22:05:12 2018 +0200
@@ -537,7 +537,6 @@
   tip
   $ hg phase --public narf
   active topic 'narf' is now empty
-  (use 'hg topic --clear' to clear it if needed)
 
 POSSIBLE BUG: narf topic stays alive even though we just made all
 narf commits public:
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-userguide.t
--- a/tests/test-userguide.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-userguide.t	Mon Sep 03 22:05:12 2018 +0200
@@ -38,8 +38,8 @@
   $ echo 'tweak feature Y' >> file1.c
   $ hg commit --amend -u alice -d '2 0' -m 'implement feature Y'
   $ hg shortlog -q -r fe0ecd3bd2a4
-  abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision 'fe0ecd3bd2a4'!
+  (use --hidden to access hidden revisions; successor: 934359450037)
   [255]
   $ hg --hidden shortlog -G
   @  2:934359450037  draft  implement feature Y
diff -r eb4d07a0b19f -r dc247e648f43 tests/test-wireproto.t
--- a/tests/test-wireproto.t	Mon Sep 03 21:59:24 2018 +0200
+++ b/tests/test-wireproto.t	Mon Sep 03 22:05:12 2018 +0200
@@ -195,7 +195,7 @@
   $ cat hg.pid >> $DAEMON_PIDS
 
   $ curl -s http://localhost:$HGPORT/?cmd=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 changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
+  _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 changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
 
 Check we cannot use pushkey for marker exchange anymore