Mercurial > evolve

changeset 4553:aafd51f145ea mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: adapt test output to 4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 23 Apr 2019 12:28:32 +0200
parents 0eb80259f9cb
children d96016b46283
files tests/test-discovery-obshashrange.t tests/test-evolve-content-divergent-basic.t tests/test-evolve-content-divergent-corner-cases.t tests/test-evolve-content-divergent-interrupted.t tests/test-evolve-content-divergent-meta.t tests/test-evolve-content-divergent-stack.t tests/test-evolve-continue.t tests/test-evolve-phase-divergence.t tests/test-evolve-public-content-divergent.t tests/test-extension-isolation.t
diffstat 10 files changed, 46 insertions(+), 332 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-discovery-obshashrange.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-discovery-obshashrange.t	Tue Apr 23 12:28:32 2019 +0200
@@ -1117,62 +1117,4 @@
   .hg/cache/evoext-obscache-00: size=70
   $ cd ..
 
-Check capabilities advertisement
-================================
-
-  $ hg init with-evolve
-  $ cat << EOF >> with-evolve/.hg/hgrc
-  > [experimental]
-  > evolution.exchange=yes
-  > EOF
-  $ hg init without-evolve
-  $ cat << EOF >> without-evolve/.hg/hgrc
-  > [experimental]
-  > evolution.exchange=no
-  > EOF
-
-  $ hg debugcapabilities ssh://user@dummy/with-evolve | grep _evoext
-    _evoext_getbundle_obscommon
-    _evoext_obshash_0
-    _evoext_obshash_1
-    _evoext_obshashrange_v1
-  $ hg debugcapabilities ssh://user@dummy/without-evolve | grep _evoext
-  [1]
-
-Using http:
-
-  $ cat > web.conf << EOF
-  > [paths]
-  > / = *
-  > EOF
-
-(evolve version first)
-
-  $ hg serve --web-conf web.conf -p $HGPORT -d --pid-file hg.pid
-  $ cat hg.pid >> $DAEMON_PIDS
-
-  $ hg debugcapabilities http://localhost:$HGPORT/with-evolve| grep _evoext
-    _evoext_getbundle_obscommon
-    _evoext_obshash_0
-    _evoext_obshash_1
-    _evoext_obshashrange_v1
-  $ hg debugcapabilities http://localhost:$HGPORT/without-evolve| grep _evoext
-  [1]
-
   $ killdaemons.py
-
-
-(evolve version second)
-
-  $ hg serve --web-conf web.conf -p $HGPORT -d --pid-file hg.pid
-  $ cat hg.pid >> $DAEMON_PIDS
-
-  $ hg debugcapabilities http://localhost:$HGPORT/without-evolve| grep _evoext
-  [1]
-  $ hg debugcapabilities http://localhost:$HGPORT/with-evolve| grep _evoext
-    _evoext_getbundle_obscommon
-    _evoext_obshash_0
-    _evoext_obshash_1
-    _evoext_obshashrange_v1
-
-  $ killdaemons.py
--- a/tests/test-evolve-content-divergent-basic.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-content-divergent-basic.t	Tue Apr 23 12:28:32 2019 +0200
@@ -201,25 +201,24 @@
 Creating content-divergence with branch change where base, divergent and other
 have different branches
 
-  $ hg branch -r . foobar
-  changed branch on 1 changesets
+  $ hg branch --force foobar
+  marked working directory as branch foobar
+  (branches are permanent and global, did you want a bookmark?)
+  $ hg amend
 
   $ hg up c41c793e0ef1 --hidden
-  updating to a hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (c41c793e0ef1)
-  (use 'hg evolve' to update to its successor: 9e5dffcb3d48)
+  (use 'hg evolve' to update to its successor: bdeedce1f621)
   $ echo bar > d
   $ hg branch watwat
   marked working directory as branch watwat
   $ hg amend
-  2 new content-divergent changesets
 
   $ hg glog
   @  6:264b04f771fb added d
   |   () [watwat] draft
-  | *  5:9e5dffcb3d48 added d
+  | o  5:bdeedce1f621 added d
   |/    () [foobar] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -236,7 +235,7 @@
   merge:[6] added d
   with: [5] added d
   base: [4] added d
-  merging "other" content-divergent changeset '9e5dffcb3d48'
+  merging "other" content-divergent changeset 'bdeedce1f621'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content divergent changesets on different branches.
   choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar?  c
@@ -312,19 +311,16 @@
   $ hg amend -m "foo to d"
 
   $ hg up a9d6fd6b5e40 --hidden
-  updating to a hidden changeset a9d6fd6b5e40
-  (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (a9d6fd6b5e40)
   (use 'hg evolve' to update to its successor: b10b07a394f1)
   $ echo babar > d
   $ hg amend -m "foo to d"
-  2 new content-divergent changesets
 
   $ hg glog
   @  12:0bb497fed24a foo to d
   |   () [default] draft
-  | *  11:b10b07a394f1 foo to d
+  | o  11:b10b07a394f1 foo to d
   |/    () [default] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -372,19 +368,16 @@
   $ hg amend -m "bar to d, expect beers"
 
   $ hg up 11175423b5dc --hidden
-  updating to a hidden changeset 11175423b5dc
-  (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (11175423b5dc)
   (use 'hg evolve' to update to its successor: 27f0463f169a)
   $ echo wat > d
   $ hg amend -m "wat to d, wat?"
-  2 new content-divergent changesets
 
   $ hg glog
   @  15:f542037ddf31 wat to d, wat?
   |   () [default] draft
-  | *  14:27f0463f169a bar to d, expect beers
+  | o  14:27f0463f169a bar to d, expect beers
   |/    () [default] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -482,8 +475,6 @@
   $ echo 'babar' >> a
   $ hg amend
   $ hg up --hidden 'min(desc("More addition"))'
-  updating to a hidden changeset 867e43582046
-  (hidden revision '867e43582046' was rewritten as: fc6349f931da)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (867e43582046)
   (use 'hg evolve' to update to its successor: fc6349f931da)
@@ -492,11 +483,10 @@
   $ cat a.old >> a
   $ rm a.old
   $ hg amend
-  2 new content-divergent changesets
   $ glog
   @  3:051337a45e7c@default(draft) bk:[] More addition
   |
-  | *  2:fc6349f931da@default(draft) bk:[] More addition
+  | o  2:fc6349f931da@default(draft) bk:[] More addition
   |/
   o  0:6569b5a81c7e@default(public) bk:[] root
   
@@ -575,14 +565,11 @@
 
 
   $ hg up --hidden 'min(desc("More addition"))'
-  updating to a hidden changeset 867e43582046
-  (hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (867e43582046)
   (use 'hg evolve' to update to its successor: 5bf84d1d71d1)
   $ echo 'gotta break' >> a
   $ hg amend
-  2 new content-divergent changesets
 
 # reamend so that the case is not the first precursor.
 
@@ -594,7 +581,7 @@
   $ glog
   @  6:13c1b75640a1@default(draft) bk:[] More addition (2)
   |
-  | *  4:5bf84d1d71d1@default(draft) bk:[] More addition
+  | o  4:5bf84d1d71d1@default(draft) bk:[] More addition
   |/
   o  0:6569b5a81c7e@default(public) bk:[] root
   
@@ -752,8 +739,6 @@
   > EOF
   $ hg commit --amend -m E2
   $ hg --hidden update -r 'desc(E1)'
-  updating to a hidden changeset 4a250e5bd992
-  (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (4a250e5bd992)
   (use 'hg evolve' to update to its successor: 084ae625fa51)
@@ -791,7 +776,6 @@
   > IX
   > EOF
   $ hg commit --amend -m E3
-  2 new content-divergent changesets
   $ hg log -G --patch --hidden
   @  3:19ed1bf64a2c@default(draft) E3 [content-divergent]
   |  diff --git a/numbers b/numbers
@@ -810,7 +794,7 @@
   |  -II
   |  +ii
   |
-  | *  2:084ae625fa51@default(draft) E2 [content-divergent]
+  | o  2:084ae625fa51@default(draft) E2 [content-divergent]
   |/   diff --git a/letters b/letters
   |    --- a/letters
   |    +++ b/letters
@@ -896,7 +880,7 @@
     content-divergent: 084ae625fa51 (draft) (precursor 4a250e5bd992)
   
   $ hg obslog --all --patch
-  *  084ae625fa51 (2) E2
+  o  084ae625fa51 (2) E2
   |
   | @  19ed1bf64a2c (3) E3
   |/
--- a/tests/test-evolve-content-divergent-corner-cases.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Tue Apr 23 12:28:32 2019 +0200
@@ -251,17 +251,15 @@
 Lets create divergence
   $ hg prune 4 -s . --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Making obsolete resolution parent
   $ hg prune 3
   1 changesets pruned
-  1 new orphan changesets
 
   $ hg glog
   @  6:de4ea3103326 updated e
   |   () [default] draft
-  | *  5:ff6f7cd76a7c updated e
+  | o  5:ff6f7cd76a7c updated e
   | |   () [default] draft
   | x  3:9150fe93bec6 added d
   | |   () [default] draft
@@ -340,18 +338,15 @@
 create some content divergence
 
   $ hg co dff6e52f5e41 --hidden
-  updating to a hidden changeset dff6e52f5e41
-  (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (dff6e52f5e41)
   (use 'hg evolve' to update to its successor: 0825dcee2670)
   $ hg revert -r .^ c
   $ hg amend
-  2 new content-divergent changesets
   $ hg glog --hidden
   @  3:92ecd58f9b05 delete a
   |   () [default] draft
-  | *  2:0825dcee2670 delete a
+  | o  2:0825dcee2670 delete a
   |/    () [default] draft
   | x  1:dff6e52f5e41 delete a
   |/    () [default] draft
--- a/tests/test-evolve-content-divergent-interrupted.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-content-divergent-interrupted.t	Tue Apr 23 12:28:32 2019 +0200
@@ -413,19 +413,16 @@
   $ hg amend
 
   $ hg up c41c793e0ef1 --hidden
-  updating to a hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: e49523854bc8)
 
   $ echo foobar > d
   $ hg amend
-  2 new content-divergent changesets
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
@@ -456,7 +453,7 @@
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
@@ -479,7 +476,7 @@
   $ hg glog
   @  7:517d4375cb72 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
@@ -510,7 +507,7 @@
   $ hg glog
   @  7:517d4375cb72 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
@@ -531,7 +528,7 @@
   $ hg glog
   @  8:8fd1c4bd144c added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
@@ -574,9 +571,9 @@
 
 XXX: we should have preserved the wdir to be at rev 8
   $ hg glog
-  *  8:8fd1c4bd144c added d
+  o  8:8fd1c4bd144c added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   | |   () draft
   | @  3:ca1b80f7960a added c
   | |   () draft
--- a/tests/test-evolve-content-divergent-meta.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-content-divergent-meta.t	Tue Apr 23 12:28:32 2019 +0200
@@ -62,13 +62,12 @@
   1 changesets pruned
   $ hg prune -r "min(desc('added c'))" -s "max(desc('added c'))" --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
   $ hg glog
   @  4:6c06cda6dc99 added c
   |   draft content-divergent
   |
-  | *  3:0c9267e23c9d added c e
+  | o  3:0c9267e23c9d added c e
   |/    draft content-divergent
   |
   o  1:1740ad2a1eda added b
@@ -80,7 +79,6 @@
 
   $ cd ../userbar
   $ hg pull ./../userfoo -q
-  2 new content-divergent changesets
 
   $ hg evolve --content-divergent --any
   merge:[3] added c e
--- a/tests/test-evolve-content-divergent-stack.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-content-divergent-stack.t	Tue Apr 23 12:28:32 2019 +0200
@@ -260,7 +260,6 @@
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo wat > a
   $ hg amend -m "watbar to a"
-  3 new orphan changesets
   $ hg evolve --all
   move:[2] added b
   atop:[5] watbar to a
@@ -288,28 +287,27 @@
   adding file changes
   added 5 changesets with 1 changes to 5 files (+1 heads)
   4 new obsolescence markers
-  8 new content-divergent changesets
   new changesets 2228e3b74514:d45f050514c2
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg glog
-  *  13:d45f050514c2 added d
+  o  13:d45f050514c2 added d
   |   () [default] draft
-  *  12:8ed612937375 added c
+  o  12:8ed612937375 added c
   |   () [default] draft
-  *  11:6eb54b5af3fb added b
+  o  11:6eb54b5af3fb added b
   |   () [default] draft
-  *  10:c04ff147ef79 added a
+  o  10:c04ff147ef79 added a
   |   () [default] draft
   o  9:2228e3b74514 add newfile
   |   () [default] draft
   | @  8:c72d2885eb51 added d
   | |   () [default] draft
-  | *  7:3ce4be6d8e5e added c
+  | o  7:3ce4be6d8e5e added c
   | |   () [default] draft
-  | *  6:d5f148423c16 added b
+  | o  6:d5f148423c16 added b
   | |   () [default] draft
-  | *  5:8e222f257bbf watbar to a
+  | o  5:8e222f257bbf watbar to a
   |/    () [default] draft
   o  0:8fa14d15e168 added hgignore
       () [default] draft
@@ -322,7 +320,6 @@
   updating to "local" side of the conflict: c04ff147ef79
   merging "other" content-divergent changeset '186bdc2cdfa2'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  6 new orphan changesets
   merge:[11] added b
   with: [6] added b
   base: [2] added b
--- a/tests/test-evolve-continue.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-continue.t	Tue Apr 23 12:28:32 2019 +0200
@@ -389,14 +389,13 @@
   
   $ hg rebase -r . -d 1
   rebasing 2:29edef26570b "added c"
-  1 new orphan changesets
   $ echo conflict > c
   $ hg amend
 
   $ hg log -G -T "{rev} {desc}\n"
   @  5 added c
   |
-  | *  3 added d, modified c
+  | o  3 added d, modified c
   | |
   | x  2 added c
   | |
--- a/tests/test-evolve-phase-divergence.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-phase-divergence.t	Tue Apr 23 12:28:32 2019 +0200
@@ -975,7 +975,6 @@
   recreate:[2] added m
   atop:[1] added m and n
   committed as 86419909e017
-  1 new orphan changesets
   recreate:[3] added n
   atop:[1] added m and n
   rebasing to destination parent: d3873e73d99e
@@ -1212,12 +1211,11 @@
   $ hg amend
 
   $ hg phase -r a51bce62c219 --public --hidden
-  2 new phase-divergent changesets
 
   $ hg glog
   @  4:52ca78bb98c7 added n
   |   () draft
-  *  2:4f25cd9cd2bf added m
+  o  2:4f25cd9cd2bf added m
   |   () draft
   | o  1:a51bce62c219 added m and n
   |/    () public
@@ -1235,7 +1233,6 @@
   recreate:[2] added m
   atop:[1] added m and n
   committed as 86419909e017
-  1 new orphan changesets
   recreate:[4] added n
   atop:[1] added m and n
   rebasing to destination parent: d3873e73d99e
@@ -1482,7 +1479,6 @@
   > EOF
   $ hg commit --amend -m E2
   $ hg --hidden phase --public --rev 'desc(E1)'
-  1 new phase-divergent changesets
   $ hg log -G --patch --hidden --rev 'not desc("root")'
   @  changeset:   2:599454370881
   |  tag:         tip
@@ -1868,7 +1864,6 @@
 so the fixup should add back 'b'.
 
   $ hg phase -p -r dff6e52f5e41 --hidden
-  1 new phase-divergent changesets
   $ hg evolve --phase-divergent
   recreate:[2] delete a
   atop:[1] delete a
--- a/tests/test-evolve-public-content-divergent.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-public-content-divergent.t	Tue Apr 23 12:28:32 2019 +0200
@@ -41,13 +41,10 @@
 Amend again to create a cset divergent to public one:
 
   $ hg up 1 --hidden -q
-  updating to a hidden changeset 5f6d8a4bf34a
-  (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f)
   working directory parent is obsolete! (5f6d8a4bf34a)
 
   $ echo "I am second" >> b
   $ hg ci --amend -m "updated b"
-  1 new content-divergent changesets
 
   $ hg glog
   @  3:dcdaf152280a updated b
@@ -138,13 +135,10 @@
 Amend again to create a cset divergent to public one:
 
   $ hg up 1 --hidden -q
-  updating to a hidden changeset 5f6d8a4bf34a
-  (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c)
   working directory parent is obsolete! (5f6d8a4bf34a)
 
   $ echo "I am bar" > b
   $ hg ci --amend -m "updated b"
-  1 new content-divergent changesets
 
   $ hg glog
   @  3:0e805383168e updated b
@@ -243,13 +237,10 @@
 
 On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull:
   $ hg up 2 --hidden -q
-  updating to a hidden changeset 155349b645be
-  (hidden revision '155349b645be' was rewritten as: c0d7ee6604ea)
   working directory parent is obsolete! (155349b645be)
 
   $ echo cc >> c
   $ hg ci --amend -m "updated c"
-  2 new content-divergent changesets
 
 Lets change the phase to --public of branch which is pulled from server:
   $ hg phase --public -r 4
@@ -413,7 +404,6 @@
   1 changesets pruned
   $ hg prune 3 -s 4 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Change phase to public for one head:
   $ hg phase -r 4 --public
@@ -506,7 +496,6 @@
   1 changesets pruned
   $ hg prune 'min(desc("re:added d$"))' -s 'desc("added d c e")' --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Change phase to public for one head:
   $ hg phase --public -r 'max(desc("re:added d$"))'
@@ -515,7 +504,7 @@
   @  5:93cd84bbdaca added d
   |   public
   |
-  | *  4:f31bcc378766 added d c e
+  | o  4:f31bcc378766 added d c e
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -637,7 +626,6 @@
   1 changesets pruned
   $ hg prune 3 -s 4 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Change phase to public for one head:
   $ hg phase --public -r 5
@@ -646,7 +634,7 @@
   @  5:93cd84bbdaca added d
   |   public
   |
-  | *  4:9411ad1fe615 added d
+  | o  4:9411ad1fe615 added d
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -732,7 +720,6 @@
   1 changesets pruned
   $ hg prune 3 -s 4 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Change phase to public for one head:
   $ hg phase --public -r 5
@@ -741,7 +728,7 @@
   @  5:93cd84bbdaca added d
   |   public
   |
-  | *  4:3c17c7afaf6e added c e
+  | o  4:3c17c7afaf6e added c e
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -903,7 +890,6 @@
   1 changesets pruned
   $ hg prune 'min(desc("added d"))' -s 'desc("added c e")' --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
 Change phase to public for one head:
   $ hg phase --public -r 'max(desc("added d"))'
@@ -912,7 +898,7 @@
   @  5:93cd84bbdaca added d
   |   public
   |
-  | *  4:e568fd1029bb added c e
+  | o  4:e568fd1029bb added c e
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -953,7 +939,7 @@
   |  @@ -0,0 +1,1 @@
   |  +c
   |
-  | *  4:e568fd1029bb added c e
+  | o  4:e568fd1029bb added c e
   |/    draft content-divergent
   |
   |    diff -r 5f6d8a4bf34a -r e568fd1029bb c
@@ -989,7 +975,7 @@
   $ hg obslog --all --rev tip --patch
   @  93cd84bbdaca (5) added d
   |
-  | *  e568fd1029bb (4) added c e
+  | o  e568fd1029bb (4) added c e
   |/
   x  9150fe93bec6 (3) added d
        rewritten(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -1143,14 +1129,13 @@
   1 changesets pruned
   $ hg prune 2 -s 4 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 4
 
   $ hg glog
   @  4:f7c1071f1e7c added c
   |   public
   |
-  | *  3:90522bccf499 added ch
+  | o  3:90522bccf499 added ch
   |/    draft content-divergent
   |
   o  1:5f6d8a4bf34a added b
@@ -1234,14 +1219,13 @@
   1 changesets pruned
   $ hg prune 3 -s 5 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 5
 
   $ hg glog
   @  5:e800202333a4 added d
   |   public
   |
-  | *  4:5acd58ef5066 added dh
+  | o  4:5acd58ef5066 added dh
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -1325,14 +1309,13 @@
   1 changesets pruned
   $ hg prune 2 -s 4 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 4
 
   $ hg glog
   @  4:f7c1071f1e7c added c
   |   public
   |
-  | *  3:229da2719b19 added ch
+  | o  3:229da2719b19 added ch
   |/    draft content-divergent
   |
   o  1:5f6d8a4bf34a added b
@@ -1438,14 +1421,13 @@
   1 changesets pruned
   $ hg prune 3 -s 5 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 5
 
   $ hg glog
   @  5:e800202333a4 added d
   |   public
   |
-  | *  4:f89a8e2f86ac added dh
+  | o  4:f89a8e2f86ac added dh
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -1545,14 +1527,13 @@
   1 changesets pruned
   $ hg prune 3 -s 5 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 5
 
   $ hg glog
   @  5:e800202333a4 added d
   |   public
   |
-  | *  4:db0b7bba0aae added dh
+  | o  4:db0b7bba0aae added dh
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -1653,14 +1634,13 @@
   1 changesets pruned
   $ hg prune 3 -s 5 --hidden
   1 changesets pruned
-  2 new content-divergent changesets
   $ hg phase --public -r 5
 
   $ hg glog
   @  5:e800202333a4 added d
   |   public
   |
-  | *  4:67b19bbd770f added dh
+  | o  4:67b19bbd770f added dh
   | |   draft content-divergent
   | |
   o |  2:155349b645be added c
@@ -1755,7 +1735,6 @@
   $ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes
   rebasing 5:4ab2719bbab9 "c_E"
   rebasing 6:77ccbf8d837e "c_F"
-  2 new content-divergent changesets
 
   $ hg sum
   parent: 8:a52ac76b45f5 
@@ -1773,7 +1752,7 @@
     content-divergent: a52ac76b45f5 (public) (precursor 77ccbf8d837e)
   
   $ hg log -G --patch
-  *  changeset:   10:8ae8db670b4a
+  o  changeset:   10:8ae8db670b4a
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -1786,7 +1765,7 @@
   |  @@ -0,0 +1,1 @@
   |  +c_F
   |
-  *  changeset:   9:b4a584aea4bd
+  o  changeset:   9:b4a584aea4bd
   |  parent:      3:abb77b893f28
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -1888,7 +1867,6 @@
   updating to "local" side of the conflict: c7d2d47c7240
   merging "other" content-divergent changeset '0773642cfa95'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  1 new orphan changesets
   merge:[8] c_F
   with: [10] c_F
   base: [6] c_F
--- a/tests/test-extension-isolation.t	Sat Apr 20 03:55:11 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-============================
-Testing extensions isolation
-============================
-
-In this test case, we check that a repository using the extensions can co-exist
-with a repository not using the extension.
-
-  $ . $TESTDIR/testlib/common.sh
-
-Setup
-=====
-
-Create repo
-
-  $ hg init repo-evo
-  $ cat > repo-evo/.hg/hgrc << EOF
-  > [extensions]
-  > evolve=
-  > EOF
-  $ hg init repo-topic
-  $ cat > repo-topic/.hg/hgrc << EOF
-  > [extensions]
-  > topic=
-  > EOF
-  $ hg init repo-both
-  $ cat > repo-both/.hg/hgrc << EOF
-  > [extensions]
-  > evolve=
-  > topic=
-  > EOF
-  $ hg init repo-no-ext
-
-check setup
-
-  $ hg -R repo-evo  help -e evolve | head -n 1
-  warning: --repository ignored
-  evolve extension - extends Mercurial feature related to Changeset Evolution
-  $ hg -R repo-both  help -e evolve | head -n 1
-  warning: --repository ignored
-  evolve extension - extends Mercurial feature related to Changeset Evolution
-  $ hg -R repo-no-ext help -e evolve
-  warning: --repository ignored
-  abort: no such help topic: evolve
-  (try 'hg help --keyword evolve')
-  [255]
-  $ hg -R repo-no-ext help -e topic
-  warning: --repository ignored
-  abort: no such help topic: topic
-  (try 'hg help --keyword topic')
-  [255]
-
-start hgweb dir for all repo
-
-  $ cat > hgweb.conf << EOF
-  > [paths]
-  > / = *
-  > EOF
-
-  $ hg serve -p $HGPORT -d --pid-file=hg.pid --web-conf hgweb.conf -A access.log -E error.log
-  $ cat hg.pid >> $DAEMON_PIDS
-
-Test isolation
---------------
-
-As of 4.9 (and previous version). It seems like extensions are displayed as
-enabled even for repository where they are not supposed to be. See the output
-tagged `no-false`.
-
-(however, topic and evolve are not supposed to affect other repository as shown
-in the rest of this test).
-
-  $ get-with-headers.py $LOCALIP:$HGPORT 'repo-no-ext/help/extensions' | grep 'enabled extensions' -A 7
-  [1]
-  $ get-with-headers.py $LOCALIP:$HGPORT 'repo-evo/help/extensions' | grep 'enabled extensions' -A 7
-  enabled extensions:
-  </p>
-  <dl>
-   <dt>evolve
-   <dd>extends Mercurial feature related to Changeset Evolution
-  </dl>
-  <p>
-  disabled extensions:
-  $ get-with-headers.py $LOCALIP:$HGPORT 'repo-topic/help/extensions' | grep 'enabled extensions' -A 7
-  enabled extensions:
-  </p>
-  <dl>
-   <dt>evolve (no-false !)
-   <dd>extends Mercurial feature related to Changeset Evolution (no-false !)
-   <dt>topic
-   <dd>support for topic branches
-  </dl>
-  $ get-with-headers.py $LOCALIP:$HGPORT 'repo-both/help/extensions' | grep 'enabled extensions' -A 9
-  enabled extensions:
-  </p>
-  <dl>
-   <dt>evolve
-   <dd>extends Mercurial feature related to Changeset Evolution
-   <dt>topic
-   <dd>support for topic branches
-  </dl>
-  <p>
-  disabled extensions:
-  $ get-with-headers.py $LOCALIP:$HGPORT 'repo-no-ext/help/extensions' | grep 'enabled extensions' -A 9
-  enabled extensions: (no-false !)
-  </p> (no-false !)
-  <dl> (no-false !)
-   <dt>evolve (no-false !)
-   <dd>extends Mercurial feature related to Changeset Evolution (no-false !)
-   <dt>topic (no-false !)
-   <dd>support for topic branches (no-false !)
-  </dl> (no-false !)
-  <p> (no-false !)
-  disabled extensions: (no-false !)
-
-make sure repos don't affect each other (and check both ways)
-
-Check evolve isolation
------------------------
-
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext'
-  [1]
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-evo | egrep 'topics|evoext'
-    _evoext_getbundle_obscommon
-    _evoext_obshash_0
-    _evoext_obshash_1
-    _evoext_obshashrange_v1
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext'
-  [1]
-
-Check topic isolation
----------------------
-
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext'
-  [1]
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-topic | egrep 'topics|evoext'
-    topics
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext'
-  [1]
-
-Check coupled isolation
------------------------
-
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext'
-  [1]
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-both | egrep 'topics|evoext'
-    _evoext_getbundle_obscommon
-    _evoext_obshash_0
-    _evoext_obshash_1
-    _evoext_obshashrange_v1
-    topics
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-evo | egrep 'topics|evoext'
-    _evoext_getbundle_obscommon
-    _evoext_obshash_0
-    _evoext_obshash_1
-    _evoext_obshashrange_v1
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-topic | egrep 'topics|evoext'
-    topics
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-evo | egrep 'topics|evoext'
-    _evoext_getbundle_obscommon
-    _evoext_obshash_0
-    _evoext_obshash_1
-    _evoext_obshashrange_v1
-  $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext'
-  [1]
-
-Final cleanup
--------------
-
-  $ cat error.log
-
-  $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS