Mercurial > evolve

changeset 4863:5cd7d16b8733 mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-5.0
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 27 Sep 2019 13:03:12 +0200
parents 40795751be1c (current diff) f1af4909c6dc (diff)
children 9710597f0155 563a22b7092e
files tests/test-discovery-obshashrange.t tests/test-evolve-abort-orphan.t tests/test-evolve-abort-phasediv.t tests/test-evolve-templates.t tests/test-pick.t tests/test-rewind.t tests/test-topic-stack.t
diffstat 17 files changed, 177 insertions(+), 330 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-discovery-obshashrange.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-discovery-obshashrange.t	Fri Sep 27 13:03:12 2019 +0200
@@ -40,8 +40,8 @@
   * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> debugbuilddag .+7 (glob) (no-windows !)
   * @0000000000000000000000000000000000000000 (*)> debugbuilddag ".+7" (glob) (windows !)
-  * @0000000000000000000000000000000000000000 (*)> updated branch cache (served) in *.???? seconds (glob)
-  * @0000000000000000000000000000000000000000 (*)> wrote branch cache (served) with 1 labels and 1 nodes (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (8r, 0o) (glob)
   * @0000000000000000000000000000000000000000 (*)> debugbuilddag .+7 exited 0 after *.?? seconds (glob) (no-windows !)
   * @0000000000000000000000000000000000000000 (*)> debugbuilddag ".+7" exited 0 after *.?? seconds (glob) (windows !)
@@ -162,8 +162,8 @@
   $ hg blackbox
   * @0000000000000000000000000000000000000000 (*)> clone *ssh://user@dummy/server* client exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> pull --rev 4 (glob)
-  * @0000000000000000000000000000000000000000 (*)> updated branch cache (base) in *.???? seconds (glob)
-  * @0000000000000000000000000000000000000000 (*)> wrote branch cache (base) with 1 labels and 1 nodes (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated base branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote base branch cache with 1 labels and 1 nodes (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (5r, 3o) (glob)
   * @0000000000000000000000000000000000000000 (*)> 5 incoming changes - new heads: bebd167eb94d (glob)
   * @0000000000000000000000000000000000000000 (*)> pull --rev 4 exited 0 after *.?? seconds (glob)
@@ -247,8 +247,8 @@
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (1r) (glob)
   1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 1o) (glob)
   * @0000000000000000000000000000000000000000 (*)> obscache is out of date, falling back to slower obsstore version (glob)
-  * @0000000000000000000000000000000000000000 (*)> updated branch cache (served) in *.???? seconds (glob)
-  * @0000000000000000000000000000000000000000 (*)> wrote branch cache (served) with 1 labels and 2 nodes (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (1r, 1o) (glob)
   * @0000000000000000000000000000000000000000 (*)> 1 incoming changes - new heads: 45f8b879de92 (glob)
   * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
@@ -307,8 +307,8 @@
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> add foo exited 0 after *.?? seconds (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> commit -m foo (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obscache is out of date, falling back to slower obsstore version (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated branch cache (served) in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote branch cache (served) with 1 labels and 1 nodes (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated served branch cache in *.???? seconds (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> commit -m foo exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e (glob)
@@ -465,8 +465,8 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull -r 6 (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 2/6 mismatch - 1 obshashrange queries in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated branch cache (served) in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote branch cache (served) with 1 labels and 2 nodes (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated served branch cache in *.???? seconds (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (2r, 3o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 2 incoming changes - new heads: f69452c5b1af (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull -r 6 exited 0 after *.?? seconds (glob)
@@ -902,14 +902,14 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev "heads(all())" exited 0 after *.?? seconds (glob) (windows !)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull (glob)
   1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated branch cache (served) in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote branch cache (served) with 1 labels and 2 nodes (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated served branch cache in *.???? seconds (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
   1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 1o) (glob)
   1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 1 incoming changes - new heads: 4de32a90b66c (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> rollback (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated branch cache (base) in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote branch cache (base) with 1 labels and 2 nodes (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated base branch cache in *.???? seconds (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote base branch cache with 1 labels and 2 nodes (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-obscache cache reset (glob)
   1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (8r, 15o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> rollback exited 0 after *.?? seconds (glob)
@@ -1071,8 +1071,8 @@
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-obscache cache reset (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (5r, 11o) (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (3r, 0o) (glob)
-  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated branch cache (base) in *.???? seconds (glob)
-  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote branch cache (base) with 1 labels and 1 nodes (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated base branch cache in *.???? seconds (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote base branch cache with 1 labels and 1 nodes (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> 3 incoming changes - new heads: 4de32a90b66c (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> --config "extensions.strip=" strip -r "desc(\"foo\")" exited 0 after *.?? seconds (glob) (windows !)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> --config 'extensions.strip=' strip -r 'desc("foo")' exited 0 after *.?? seconds (glob) (no-windows !)
@@ -1091,8 +1091,8 @@
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-firstmerge cache reset (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-firstmerge in *.???? seconds (8r) (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> obsdiscovery, 1/8 mismatch - 1 obshashrange queries in *.???? seconds (glob)
-  1970/01/01 00:00:00 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated branch cache (base) in *.???? seconds (glob)
-  1970/01/01 00:00:00 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote branch cache (base) with 1 labels and 2 nodes (glob)
+  1970/01/01 00:00:00 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated base branch cache in *.???? seconds (glob)
+  1970/01/01 00:00:00 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote base branch cache with 1 labels and 2 nodes (glob)
   1970/01/01 00:00:00 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (1r, 5o) (glob)
   1970/01/01 00:00:00 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> 1 incoming changes - new heads: 45f8b879de92 (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> pull exited 0 after *.?? seconds (glob)
@@ -1142,7 +1142,7 @@
   [1]
   $ hg debugupdatecache --debug
   updating the branch cache
-  invalid branch cache (served): tip differs
+  invalid branchheads cache (served): tip differs
   $ f -s .hg/cache/evoext*
   .hg/cache/evoext-depthcache-00: size=96
   .hg/cache/evoext-firstmerge-00: size=96
--- a/tests/test-evolve-abort-orphan.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-evolve-abort-orphan.t	Fri Sep 27 13:03:12 2019 +0200
@@ -10,7 +10,6 @@
 Setup
 =====
 
-#testcases abortcommand abortflag
   $ cat >> $HGRCPATH <<EOF
   > [phases]
   > publish = False
@@ -20,12 +19,10 @@
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
-#if abortflag
   $ cat >> $HGRCPATH <<EOF
   > [alias]
   > abort = evolve --abort
   > EOF
-#endif
 
   $ hg init abortrepo
   $ cd abortrepo
@@ -49,15 +46,9 @@
 Testing --abort when no evolve is interrupted
 =============================================
 
-#if abortflag
   $ hg evolve --abort
   abort: no interrupted evolve to abort
   [255]
-#else
-  $ hg abort
-  abort: no operation in progress
-  [255]
-#endif
 
 Testing with wrong combination of flags
 =======================================
@@ -117,11 +108,6 @@
   instability: orphan
   summary:     added d
   
-#if abortcommand
-when in dry-run mode
-  $ hg abort --dry-run
-  evolve in progress, will be aborted
-#endif
 
   $ hg abort
   evolve aborted
--- a/tests/test-evolve-abort-phasediv.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-evolve-abort-phasediv.t	Fri Sep 27 13:03:12 2019 +0200
@@ -10,7 +10,6 @@
 Setup
 =====
 
-#testcases abortcommand abortflag
   $ cat >> $HGRCPATH <<EOF
   > [phases]
   > publish = False
@@ -20,12 +19,10 @@
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
-#if abortflag
   $ cat >> $HGRCPATH <<EOF
   > [alias]
   > abort = evolve --abort
   > EOF
-#endif
 
   $ hg init abortrepo
   $ cd abortrepo
--- a/tests/test-evolve-obshistory-complex.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-evolve-obshistory-complex.t	Fri Sep 27 13:03:12 2019 +0200
@@ -153,30 +153,25 @@
   adding B
   diff --git a/A b/A
   new file mode 100644
-  examine changes to 'A'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'A'? [Ynesfdaq?] Y
   
   @@ -0,0 +1,1 @@
   +A
-  record change 1/2 to 'A'?
-  (enter ? for help) [Ynesfdaq?] Y
+  record change 1/2 to 'A'? [Ynesfdaq?] Y
   
   diff --git a/B b/B
   new file mode 100644
-  examine changes to 'B'?
-  (enter ? for help) [Ynesfdaq?] N
+  examine changes to 'B'? [Ynesfdaq?] N
   
   created new head
   continue splitting? [Ycdq?] Y
   diff --git a/B b/B
   new file mode 100644
-  examine changes to 'B'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'B'? [Ynesfdaq?] Y
   
   @@ -0,0 +1,1 @@
   +B
-  record this change to 'B'?
-  (enter ? for help) [Ynesfdaq?] Y
+  record this change to 'B'? [Ynesfdaq?] Y
   
   no more change to split
   $ hg split --rev "desc(fold1)" -d "0 0" << EOF
@@ -192,30 +187,25 @@
   adding D
   diff --git a/C b/C
   new file mode 100644
-  examine changes to 'C'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'C'? [Ynesfdaq?] Y
   
   @@ -0,0 +1,1 @@
   +C
-  record change 1/2 to 'C'?
-  (enter ? for help) [Ynesfdaq?] Y
+  record change 1/2 to 'C'? [Ynesfdaq?] Y
   
   diff --git a/D b/D
   new file mode 100644
-  examine changes to 'D'?
-  (enter ? for help) [Ynesfdaq?] N
+  examine changes to 'D'? [Ynesfdaq?] N
   
   created new head
   continue splitting? [Ycdq?] Y
   diff --git a/D b/D
   new file mode 100644
-  examine changes to 'D'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'D'? [Ynesfdaq?] Y
   
   @@ -0,0 +1,1 @@
   +D
-  record this change to 'D'?
-  (enter ? for help) [Ynesfdaq?] Y
+  record this change to 'D'? [Ynesfdaq?] Y
   
   no more change to split
   1 new orphan changesets
@@ -232,30 +222,25 @@
   adding F
   diff --git a/E b/E
   new file mode 100644
-  examine changes to 'E'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'E'? [Ynesfdaq?] Y
   
   @@ -0,0 +1,1 @@
   +E
-  record change 1/2 to 'E'?
-  (enter ? for help) [Ynesfdaq?] Y
+  record change 1/2 to 'E'? [Ynesfdaq?] Y
   
   diff --git a/F b/F
   new file mode 100644
-  examine changes to 'F'?
-  (enter ? for help) [Ynesfdaq?] N
+  examine changes to 'F'? [Ynesfdaq?] N
   
   created new head
   continue splitting? [Ycdq?] Y
   diff --git a/F b/F
   new file mode 100644
-  examine changes to 'F'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'F'? [Ynesfdaq?] Y
   
   @@ -0,0 +1,1 @@
   +F
-  record this change to 'F'?
-  (enter ? for help) [Ynesfdaq?] Y
+  record this change to 'F'? [Ynesfdaq?] Y
   
   no more change to split
   1 new orphan changesets
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Fri Sep 27 13:03:12 2019 +0200
@@ -63,77 +63,63 @@
   adding d
   diff --git a/a b/a
   new file mode 100644
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +42
-  record change 1/4 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/4 to 'a'? [Ynesfdaq?] y
   
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'b'? [Ynesfdaq?] n
   
   diff --git a/c b/c
   new file mode 100644
-  examine changes to 'c'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'c'? [Ynesfdaq?] n
   
   diff --git a/d b/d
   new file mode 100644
-  examine changes to 'd'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'd'? [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] y
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'b'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +43
-  record change 1/3 to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/3 to 'b'? [Ynesfdaq?] y
   
   diff --git a/c b/c
   new file mode 100644
-  examine changes to 'c'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'c'? [Ynesfdaq?] n
   
   diff --git a/d b/d
   new file mode 100644
-  examine changes to 'd'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'd'? [Ynesfdaq?] n
   
   continue splitting? [Ycdq?] y
   diff --git a/c b/c
   new file mode 100644
-  examine changes to 'c'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'c'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +44
-  record change 1/2 to 'c'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'c'? [Ynesfdaq?] y
   
   diff --git a/d b/d
   new file mode 100644
-  examine changes to 'd'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'd'? [Ynesfdaq?] n
   
   continue splitting? [Ycdq?] y
   diff --git a/d b/d
   new file mode 100644
-  examine changes to 'd'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'd'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +45
-  record this change to 'd'?
-  (enter ? for help) [Ynesfdaq?] y
+  record this change to 'd'? [Ynesfdaq?] y
   
   no more change to split
 
--- a/tests/test-evolve-obshistory-split.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-evolve-obshistory-split.t	Fri Sep 27 13:03:12 2019 +0200
@@ -47,30 +47,25 @@
   adding b
   diff --git a/a b/a
   new file mode 100644
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +42
-  record change 1/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'a'? [Ynesfdaq?] y
   
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'b'? [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] y
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'b'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +43
-  record this change to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  record this change to 'b'? [Ynesfdaq?] y
   
   no more change to split
 
--- a/tests/test-evolve-orphan-split.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-evolve-orphan-split.t	Fri Sep 27 13:03:12 2019 +0200
@@ -48,18 +48,15 @@
   adding b
   diff --git a/a b/a
   new file mode 100644
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +foo
-  record change 1/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'a'? [Ynesfdaq?] y
   
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'b'? [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] c
@@ -132,33 +129,27 @@
   adding c
   diff --git a/a b/a
   new file mode 100644
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +foo
-  record change 1/3 to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  record change 1/3 to 'a'? [Ynesfdaq?] n
   
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'b'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +foo
-  record change 2/3 to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 2/3 to 'b'? [Ynesfdaq?] y
   
   diff --git a/c b/c
   new file mode 100644
-  examine changes to 'c'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'c'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +foo
-  record change 3/3 to 'c'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 3/3 to 'c'? [Ynesfdaq?] y
   
   created new head
   continue splitting? [Ycdq?] c
--- a/tests/test-evolve-progress.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-evolve-progress.t	Fri Sep 27 13:03:12 2019 +0200
@@ -28,6 +28,7 @@
   atop:[4] first v2
   hg rebase -r 4f60c78b6d58 -d fd0a2402f834
   evolve: 1/3 changesets (33.33%)
+    searching for copies back to rev 0
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58
@@ -42,7 +43,10 @@
   move:[2] third
   hg rebase -r 769574b07a96 -d 5f16d91ecde0
   evolve: 2/3 changesets (66.67%)
-    unmatched files in other:
+    searching for copies back to rev 0
+    unmatched files in other (from base):
+     b
+    unmatched files in other (from topological common ancestor):
      b
   resolving manifests
    branchmerge: True, force: True, partial: False
@@ -58,6 +62,7 @@
   move:[3] fourth
   hg rebase -r 22782fddc0ab -d 53c0008d98a0
   evolve: 3/3 changesets (100.00%)
+    searching for copies back to rev 0
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab
@@ -70,7 +75,7 @@
   committing changelog
   updating the branch cache
   obscache is out of date
-  invalid branch cache (served): tip differs
+  invalid branchheads cache (served): tip differs
   resolving manifests
    branchmerge: False, force: False, partial: False
    ancestor: 385376d04062, local: 385376d04062+, remote: fd0a2402f834
@@ -91,6 +96,7 @@
   atop:[8] first v3
   hg rebase -r 5f16d91ecde0 -d 152c368c622b
   evolve: 1/1 changesets (100.00%)
+    searching for copies back to rev 4
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0
@@ -121,6 +127,7 @@
   atop:[10] first v4
   hg rebase -r df5d742141b0 -d f8d7d38c0a88
   evolve: 1/3 changesets (33.33%)
+    searching for copies back to rev 8
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0
@@ -154,7 +161,10 @@
   atop:[11] second
   hg rebase -r 53c0008d98a0 -d 60a86497fbfe
   evolve: 2/3 changesets (66.67%)
-    unmatched files in other:
+    searching for copies back to rev 4
+    unmatched files in other (from base):
+     b
+    unmatched files in other (from topological common ancestor):
      b
   resolving manifests
    branchmerge: True, force: True, partial: False
@@ -169,6 +179,7 @@
   move:[7] fourth
   hg rebase -r 385376d04062 -d b2de95304e32
   evolve: 3/3 changesets (100.00%)
+    searching for copies back to rev 4
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062
@@ -181,7 +192,7 @@
   committing changelog
   updating the branch cache
   obscache is out of date
-  invalid branch cache (served): tip differs
+  invalid branchheads cache (served): tip differs
   resolving manifests
    branchmerge: False, force: False, partial: False
    ancestor: c6e6fdb1d046, local: c6e6fdb1d046+, remote: f8d7d38c0a88
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Fri Sep 27 13:03:12 2019 +0200
@@ -417,8 +417,8 @@
   $ hg evolve --continue
   evolving 4:e568fd1029bb "added c e"
   file 'd' was deleted in other but was modified in local.
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? u
+  What do you want to do?
+  use (c)hanged version, (d)elete, or leave (u)nresolved? u
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
--- a/tests/test-evolve-templates.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-evolve-templates.t	Fri Sep 27 13:03:12 2019 +0200
@@ -281,30 +281,25 @@
   adding b
   diff --git a/a b/a
   new file mode 100644
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +42
-  record change 1/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'a'? [Ynesfdaq?] y
   
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'b'? [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] y
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'b'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +43
-  record this change to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  record this change to 'b'? [Ynesfdaq?] y
   
   no more change to split
 
--- a/tests/test-pick.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-pick.t	Fri Sep 27 13:03:12 2019 +0200
@@ -1,4 +1,4 @@
-#testcases abortcommand abortflag
+#testcases abortflag
 Test for the pick command
 
   $ cat >> $HGRCPATH <<EOF
@@ -87,11 +87,6 @@
   $ hg pick --abort
   abort: no interrupted pick state exists
   [255]
-#if abortcommand
-  $ hg abort
-  abort: no operation in progress
-  [255]
-#endif
 
 Specifying both continue and revs
 
@@ -248,10 +243,6 @@
   unresolved merge conflicts (see hg help resolve)
   [1]
 
-#if abortcommand
-  $ hg abort --dry-run
-  pick in progress, will be aborted
-#endif
   $ hg abort
   aborting pick, updating to c437988de89f
 
--- a/tests/test-prev-next.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-prev-next.t	Fri Sep 27 13:03:12 2019 +0200
@@ -470,8 +470,8 @@
   [255]
   $ hg prev --merge --config commands.update.check=abort
   file 'bar' was deleted in other [destination] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? 
+  What do you want to do?
+  use (c)hanged version, (d)elete, or leave (u)nresolved? 
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1] added foo
@@ -534,31 +534,26 @@
   adding b
   diff --git a/a b/a
   1 hunks, 1 lines changed
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -1,1 +1,2 @@
    firstline
   +secondline
-  record change 1/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'a'? [Ynesfdaq?] y
   
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'b'? [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] Y
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'b'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +bbbbb
-  record this change to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  record this change to 'b'? [Ynesfdaq?] y
   
   no more change to split
   1 new orphan changesets
--- a/tests/test-rewind.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-rewind.t	Fri Sep 27 13:03:12 2019 +0200
@@ -469,18 +469,15 @@
   adding D
   diff --git a/C b/C
   new file mode 100644
-  examine changes to 'C'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'C'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +C
-  record change 1/2 to 'C'?
-  (enter ? for help) [Ynesfdaq?] f
+  record change 1/2 to 'C'? [Ynesfdaq?] f
   
   diff --git a/D b/D
   new file mode 100644
-  examine changes to 'D'?
-  (enter ? for help) [Ynesfdaq?] d
+  examine changes to 'D'? [Ynesfdaq?] d
   
   created new head
   continue splitting? [Ycdq?] c
--- a/tests/test-split.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-split.t	Fri Sep 27 13:03:12 2019 +0200
@@ -68,35 +68,29 @@
   adding _d
   diff --git a/_a b/_a
   1 hunks, 1 lines changed
-  examine changes to '_a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to '_a'? [Ynesfdaq?] y
   
   @@ -1,0 +2,1 @@
   +change to a
-  record change 1/2 to '_a'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to '_a'? [Ynesfdaq?] y
   
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to '_d'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +_d
-  record change 2/2 to '_d'?
-  (enter ? for help) [Ynesfdaq?] n
+  record change 2/2 to '_d'? [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] Y
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to '_d'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +_d
-  record this change to '_d'?
-  (enter ? for help) [Ynesfdaq?] y
+  record this change to '_d'? [Ynesfdaq?] y
   
   no more change to split
 
@@ -196,23 +190,19 @@
   adding _c
   diff --git a/_b b/_b
   1 hunks, 1 lines changed
-  examine changes to '_b'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to '_b'? [Ynesfdaq?] y
   
   @@ -1,0 +2,1 @@
   +change to b
-  record change 1/2 to '_b'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to '_b'? [Ynesfdaq?] y
   
   diff --git a/_c b/_c
   new file mode 100644
-  examine changes to '_c'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to '_c'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +_c
-  record change 2/2 to '_c'?
-  (enter ? for help) [Ynesfdaq?] n
+  record change 2/2 to '_c'? [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] c
@@ -303,20 +293,17 @@
   adding _d
   diff --git a/_a b/_a
   1 hunks, 2 lines changed
-  examine changes to '_a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to '_a'? [Ynesfdaq?] y
   
   @@ -1,2 +1,1 @@
   -_a
   -change to a
   +changetofilea
-  record change 1/2 to '_a'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to '_a'? [Ynesfdaq?] y
   
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to '_d'? [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] c
@@ -351,8 +338,7 @@
   adding _d
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'?
-  (enter ? for help) [Ynesfdaq?] abort: response expected
+  examine changes to '_d'? [Ynesfdaq?] abort: response expected
   [255]
 
 Cannot split a commit that is not a head if instability is not allowed
@@ -378,8 +364,7 @@
   adding _d
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'?
-  (enter ? for help) [Ynesfdaq?] q
+  examine changes to '_d'? [Ynesfdaq?] q
   
   abort: user quit
   [255]
@@ -392,8 +377,7 @@
   adding _d
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'?
-  (enter ? for help) [Ynesfdaq?] q
+  examine changes to '_d'? [Ynesfdaq?] q
   
   abort: user quit
   [255]
@@ -463,18 +447,15 @@
   adding celeste
   diff --git a/babar b/babar
   new file mode 100644
-  examine changes to 'babar'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'babar'? [Ynesfdaq?] Y
   
   @@ -0,0 +1,1 @@
   +babar
-  record change 1/2 to 'babar'?
-  (enter ? for help) [Ynesfdaq?] Y
+  record change 1/2 to 'babar'? [Ynesfdaq?] Y
   
   diff --git a/celeste b/celeste
   new file mode 100644
-  examine changes to 'celeste'?
-  (enter ? for help) [Ynesfdaq?] N
+  examine changes to 'celeste'? [Ynesfdaq?] N
   
   continue splitting? [Ycdq?] c
 
@@ -558,19 +539,16 @@
   adding SPLIT2
   diff --git a/SPLIT1 b/SPLIT1
   new file mode 100644
-  examine changes to 'SPLIT1'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'SPLIT1'? [Ynesfdaq?] Y
   
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'?
-  (enter ? for help) [Ynesfdaq?] N
+  examine changes to 'SPLIT2'? [Ynesfdaq?] N
   
   continue splitting? [Ycdq?] Y
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'SPLIT2'? [Ynesfdaq?] Y
   
   no more change to split
 
@@ -639,13 +617,11 @@
   adding SPLIT4
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'SPLIT3'? [Ynesfdaq?] Y
   
   diff --git a/SPLIT4 b/SPLIT4
   new file mode 100644
-  examine changes to 'SPLIT4'?
-  (enter ? for help) [Ynesfdaq?] q
+  examine changes to 'SPLIT4'? [Ynesfdaq?] q
   
   abort: user quit
   [255]
@@ -687,13 +663,11 @@
   adding SPLIT4
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'SPLIT3'? [Ynesfdaq?] Y
   
   diff --git a/SPLIT4 b/SPLIT4
   new file mode 100644
-  examine changes to 'SPLIT4'?
-  (enter ? for help) [Ynesfdaq?] ?
+  examine changes to 'SPLIT4'? [Ynesfdaq?] ?
   
   y - yes, record this change
   n - no, skip this change
@@ -704,8 +678,7 @@
   a - record all changes to all remaining files
   q - quit, recording no changes
   ? - ? (display help)
-  examine changes to 'SPLIT4'?
-  (enter ? for help) [Ynesfdaq?] d
+  examine changes to 'SPLIT4'? [Ynesfdaq?] d
   
   continue splitting? [Ycdq?] ?
   y - yes, continue selection
@@ -768,13 +741,11 @@
   adding SPLIT3
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'?
-  (enter ? for help) [Ynesfdaq?] Y
+  examine changes to 'SPLIT2'? [Ynesfdaq?] Y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'?
-  (enter ? for help) [Ynesfdaq?] d
+  examine changes to 'SPLIT3'? [Ynesfdaq?] d
   
   continue splitting? [Ycdq?] d
   discarding remaining changes
@@ -830,15 +801,13 @@
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp2
-  record change 1/2 to 'SPLIT2'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp3
-  record change 2/2 to 'SPLIT3'?
-  (enter ? for help) [Ynesfdaq?] s
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] c
 
@@ -867,23 +836,20 @@
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp2
-  record change 1/2 to 'SPLIT2'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp3
-  record change 2/2 to 'SPLIT3'?
-  (enter ? for help) [Ynesfdaq?] s
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] y
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp3
-  record this change to 'SPLIT3'?
-  (enter ? for help) [Ynesfdaq?] y
+  record this change to 'SPLIT3'? [Ynesfdaq?] y
   
   no more change to split
 
@@ -911,15 +877,13 @@
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp2
-  record change 1/2 to 'SPLIT2'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp3
-  record change 2/2 to 'SPLIT3'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y
   
   no more change to split
   $ hg status --change '.~1'
@@ -946,15 +910,13 @@
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp2
-  record change 1/2 to 'SPLIT2'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp3
-  record change 2/2 to 'SPLIT3'?
-  (enter ? for help) [Ynesfdaq?] s
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] d
   discarding remaining changes
@@ -1096,31 +1058,26 @@
   adding b
   diff --git a/a b/a
   new file mode 100644
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +a
-  record change 1/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'a'? [Ynesfdaq?] y
   
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'b'? [Ynesfdaq?] n
   
   created new head
   (consider using topic for lightweight branches. See 'hg help topic')
   continue splitting? [Ycdq?] y
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'b'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +b
-  record this change to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  record this change to 'b'? [Ynesfdaq?] y
   
   no more change to split
   1 new orphan changesets
@@ -1243,18 +1200,15 @@
   adding c
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'b'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +b
-  record change 1/2 to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'b'? [Ynesfdaq?] y
   
   diff --git a/c b/c
   new file mode 100644
-  examine changes to 'c'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'c'? [Ynesfdaq?] n
   
   created new head
   (consider using topic for lightweight branches. See 'hg help topic')
--- a/tests/test-topic-stack-complex.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-topic-stack-complex.t	Fri Sep 27 13:03:12 2019 +0200
@@ -70,18 +70,15 @@
   adding d
   diff --git a/c b/c
   new file mode 100644
-  examine changes to 'c'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'c'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +c
-  record change 1/2 to 'c'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'c'? [Ynesfdaq?] y
   
   diff --git a/d b/d
   new file mode 100644
-  examine changes to 'd'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'd'? [Ynesfdaq?] n
   
   continue splitting? [Ycdq?] c
   1 new orphan changesets
--- a/tests/test-topic-stack.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-topic-stack.t	Fri Sep 27 13:03:12 2019 +0200
@@ -940,18 +940,15 @@
   adding ggg
   diff --git a/Z b/Z
   new file mode 100644
-  examine changes to 'Z'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'Z'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +zzz
-  record change 1/2 to 'Z'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'Z'? [Ynesfdaq?] y
   
   diff --git a/ggg b/ggg
   new file mode 100644
-  examine changes to 'ggg'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'ggg'? [Ynesfdaq?] n
   
   continue splitting? [Ycdq?] c
 
--- a/tests/test-uncommit-interactive.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-uncommit-interactive.t	Fri Sep 27 13:03:12 2019 +0200
@@ -41,8 +41,7 @@
   > EOF
   diff --git a/a b/a
   new file mode 100644
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] q
+  examine changes to 'a'? [Ynesfdaq?] q
   
   abort: user quit
   [255]
@@ -95,8 +94,7 @@
   > EOF
   diff --git a/a b/a
   3 hunks, 6 lines changed
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -1,3 +1,6 @@
   +-2
@@ -105,8 +103,7 @@
    1
    2
    3
-  discard change 1/3 to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  discard change 1/3 to 'a'? [Ynesfdaq?] n
   
   @@ -1,5 +4,7 @@
    1
@@ -116,15 +113,13 @@
   +bar
    4
    5
-  discard change 2/3 to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  discard change 2/3 to 'a'? [Ynesfdaq?] n
   
   @@ -4,2 +9,3 @@
    4
    5
   +babar
-  discard change 3/3 to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  discard change 3/3 to 'a'? [Ynesfdaq?] n
   
   abort: nothing selected to uncommit
   [255]
@@ -141,8 +136,7 @@
   > EOF
   diff --git a/a b/a
   3 hunks, 6 lines changed
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -1,3 +1,6 @@
   +-2
@@ -151,8 +145,7 @@
    1
    2
    3
-  discard change 1/3 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  discard change 1/3 to 'a'? [Ynesfdaq?] y
   
   @@ -1,5 +4,7 @@
    1
@@ -162,15 +155,13 @@
   +bar
    4
    5
-  discard change 2/3 to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  discard change 2/3 to 'a'? [Ynesfdaq?] n
   
   @@ -4,2 +9,3 @@
    4
    5
   +babar
-  discard change 3/3 to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  discard change 3/3 to 'a'? [Ynesfdaq?] n
   
 
   $ hg obslog
@@ -244,8 +235,7 @@
   > EOF
   diff --git a/a b/a
   2 hunks, 3 lines changed
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -1,5 +1,7 @@
    1
@@ -255,15 +245,13 @@
   +bar
    4
    5
-  discard change 1/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  discard change 1/2 to 'a'? [Ynesfdaq?] n
   
   @@ -4,2 +6,3 @@
    4
    5
   +babar
-  discard change 2/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  discard change 2/2 to 'a'? [Ynesfdaq?] y
   
   patching file a
   Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
@@ -342,13 +330,11 @@
   > EOF
   diff --git a/foo b/foo
   new file mode 100644
-  examine changes to 'foo'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'foo'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +hey
-  discard this change to 'foo'?
-  (enter ? for help) [Ynesfdaq?] y
+  discard this change to 'foo'? [Ynesfdaq?] y
   
   new changeset is empty
   (use 'hg prune .' to remove it)
@@ -411,8 +397,7 @@
   > EOF
   diff --git a/a b/a
   deleted file mode 100644
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'a'? [Ynesfdaq?] n
   
   abort: nothing selected to uncommit
   [255]
@@ -429,8 +414,7 @@
   > EOF
   diff --git a/a b/a
   deleted file mode 100644
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   new changeset is empty
   (use 'hg prune .' to remove it)
@@ -494,24 +478,20 @@
   > EOF
   diff --git a/foo b/foo
   1 hunks, 1 lines changed
-  examine changes to 'foo'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'foo'? [Ynesfdaq?] y
   
   @@ -1,1 +1,2 @@
    hey
   +foo
-  discard change 1/2 to 'foo'?
-  (enter ? for help) [Ynesfdaq?] y
+  discard change 1/2 to 'foo'? [Ynesfdaq?] y
   
   diff --git a/x b/x
   new file mode 100644
-  examine changes to 'x'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'x'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +abcd
-  discard change 2/2 to 'x'?
-  (enter ? for help) [Ynesfdaq?] n
+  discard change 2/2 to 'x'? [Ynesfdaq?] n
   
 
   $ hg exp
@@ -598,8 +578,7 @@
   > EOF
   diff --git a/a b/a
   3 hunks, 6 lines changed
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -1,3 +1,6 @@
   +-2
@@ -608,8 +587,7 @@
    1
    2
    3
-  discard change 1/3 to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  discard change 1/3 to 'a'? [Ynesfdaq?] n
   
   @@ -1,5 +4,7 @@
    1
@@ -619,15 +597,13 @@
   +bar
    4
    5
-  discard change 2/3 to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  discard change 2/3 to 'a'? [Ynesfdaq?] n
   
   @@ -4,2 +9,3 @@
    4
    5
   +babar
-  discard change 3/3 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  discard change 3/3 to 'a'? [Ynesfdaq?] y
   
   patching file a
   Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
@@ -686,8 +662,7 @@
   > EOF
   diff --git a/a b/a
   2 hunks, 5 lines changed
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -1,3 +1,6 @@
   +-2
@@ -696,8 +671,7 @@
    1
    2
    3
-  discard change 1/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  discard change 1/2 to 'a'? [Ynesfdaq?] y
   
   @@ -1,5 +4,7 @@
    1
@@ -707,8 +681,7 @@
   +bar
    4
    5
-  discard change 2/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  discard change 2/2 to 'a'? [Ynesfdaq?] n
   
 
   $ hg exp
@@ -815,8 +788,7 @@
    5
    babar
   +celeste
-  discard this change to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  discard this change to 'a'? [Ynesfdaq?] y
   
   $ hg status
   M a
@@ -880,16 +852,14 @@
    -2
    -1
    0
-  discard change 1/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  discard change 1/2 to 'a'? [Ynesfdaq?] y
   
   @@ -9,3 +10,4 @@
    4
    5
    babar
   +celeste
-  discard change 2/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] n
+  discard change 2/2 to 'a'? [Ynesfdaq?] n
   
   $ hg status
   M a