patch: use a short, fixed-size message for last line of prompt (issue6158)

See issue6158 and the previous commit for examples of what might go wrong if we
have some combinations of readline version and terminal and need to wrap the
line.

Briefly: readline may not display the beginning of the last line of the prompt,
or it may print over it with the end of the prompt, making it difficult for
users to know what's going on.

Differential Revision: https://phab.mercurial-scm.org/D6563

mercurial/patch.py

@@ -1089,7 +1089,9 b' def filterpatch(ui, headers, match, oper'
             return skipfile, skipfile, skipall, newpatches
         while True:
             resps = messages['help'][operation]
-            r = ui.promptchoice("%s %s" % (query, resps))
+            # IMPORTANT: keep the last line of this prompt short (<40 english
+            # chars is a good target) because of issue6158.
+            r = ui.promptchoice("%s\n(enter ? for help) %s" % (query, resps))
             ui.write("\n")
             if r == 8: # ?
                 for c, t in ui.extractchoices(resps)[1]:

tests/test-absorb.t

@@ -402,12 +402,14 b' Executable files:'
   $ hg absorb --dry-run --interactive --print-changes
   diff -r 99b4ae712f84 foo.py
   1 hunks, 1 lines changed
-  examine changes to 'foo.py'? [Ynesfdaq?] y
+  examine changes to 'foo.py'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,1 +1,1 @@
   -
   +bla
-  record this change to 'foo.py'? [Ynesfdaq?] y
+  record this change to 'foo.py'?
+  (enter ? for help) [Ynesfdaq?] y
   
   showing changes for foo.py
           @@ -0,1 +0,1 @@

tests/test-amend.t

@@ -146,11 +146,13 b' Interactive mode'
   > EOS
   diff --git a/F b/F
   new file mode 100644
-  examine changes to 'F'? [Ynesfdaq?] y
+  examine changes to 'F'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/G b/G
   new file mode 100644
-  examine changes to 'G'? [Ynesfdaq?] n
+  examine changes to 'G'?
+  (enter ? for help) [Ynesfdaq?] n
   
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/507be9bdac71-c8077452-amend.hg (obsstore-off !)
   $ hg log -r . -T '{files}\n'

tests/test-commit-interactive.t

@@ -100,7 +100,8 b' Rename empty file'
   diff --git a/empty-rw b/empty-rename
   rename from empty-rw
   rename to empty-rename
-  examine changes to 'empty-rw' and 'empty-rename'? [Ynesfdaq?] y
+  examine changes to 'empty-rw' and 'empty-rename'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip -p
@@ -121,7 +122,8 b' Copy empty file'
   diff --git a/empty-rename b/empty-copy
   copy from empty-rename
   copy to empty-copy
-  examine changes to 'empty-rename' and 'empty-copy'? [Ynesfdaq?] y
+  examine changes to 'empty-rename' and 'empty-copy'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip -p
@@ -141,7 +143,8 b' Delete empty file'
   > EOF
   diff --git a/empty-copy b/empty-copy
   deleted file mode 100644
-  examine changes to 'empty-copy'? [Ynesfdaq?] y
+  examine changes to 'empty-copy'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip -p
@@ -164,7 +167,8 b' Add binary file'
   diff --git a/tip.bundle b/tip.bundle
   new file mode 100644
   this is a binary file
-  examine changes to 'tip.bundle'? [Ynesfdaq?] y
+  examine changes to 'tip.bundle'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip -p
@@ -187,7 +191,8 b' Change binary file'
   > EOF
   diff --git a/tip.bundle b/tip.bundle
   this modifies a binary file (all or nothing)
-  examine changes to 'tip.bundle'? [Ynesfdaq?] y
+  examine changes to 'tip.bundle'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip -p
@@ -213,7 +218,8 b' Rename and change binary file'
   rename from tip.bundle
   rename to top.bundle
   this modifies a binary file (all or nothing)
-  examine changes to 'tip.bundle' and 'top.bundle'? [Ynesfdaq?] y
+  examine changes to 'tip.bundle' and 'top.bundle'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip -p
@@ -253,7 +259,8 b' Add plain file'
   +8
   +9
   +10
-  record this change to 'plain'? [Ynesfdaq?] y
+  record this change to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
   $ hg tip -p
   changeset:   7:11fb457c1be4
@@ -302,7 +309,8 b' Modify end of plain file, also test that'
    9
    10
   +11
-  record this change to 'plain'? [Ynesfdaq?] y
+  record this change to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
 Modify end of plain file, no EOL
@@ -320,7 +328,8 b' Modify end of plain file, no EOL'
    11
   +7264f99c5f5ff3261504828afa4fb4d406c3af54
   \ No newline at end of file
-  record this change to 'plain'? [Ynesfdaq?] y
+  record this change to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
 Record showfunc should preserve function across sections
@@ -401,7 +410,8 b' Record showfunc should preserve function'
   > EOF
   diff --git a/f1.py b/f1.py
   3 hunks, 6 lines changed
-  examine changes to 'f1.py'? [Ynesfdaq?] y
+  examine changes to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,8 +2,8 @@ def annotate(ui, repo, *pats, **opts):
        """show changeset information by line for each file
@@ -413,7 +423,8 b' Record showfunc should preserve function'
        This command is useful for discovering when a change was made and
        by whom.
    
-  record change 1/3 to 'f1.py'? [Ynesfdaq?] y
+  record change 1/3 to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -6,11 +6,7 @@ def annotate(ui, repo, *pats, **opts):
    
@@ -427,7 +438,8 b' Record showfunc should preserve function'
        Without the -a/--text option, annotate will avoid processing files
        it detects as binary. With -a, annotate will annotate the file
        anyway, although the results will probably be neither useful
-  record change 2/3 to 'f1.py'? [Ynesfdaq?] y
+  record change 2/3 to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -26,7 +22,7 @@ def archive(ui, repo, dest, **opts):
        directory; use -r/--rev to specify a different revision.
@@ -438,7 +450,8 b' Record showfunc should preserve function'
    
        .. container:: verbose
    
-  record change 3/3 to 'f1.py'? [Ynesfdaq?] y
+  record change 3/3 to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
 Modify end of plain file, add EOL
@@ -461,13 +474,15 b' Modify end of plain file, add EOL'
   -7264f99c5f5ff3261504828afa4fb4d406c3af54
   \ No newline at end of file
   +7264f99c5f5ff3261504828afa4fb4d406c3af54
-  record change 1/2 to 'plain'? [Ynesfdaq?] y
+  record change 1/2 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/plain2 b/plain2
   new file mode 100644
   @@ -0,0 +1,1 @@
   +1
-  record change 2/2 to 'plain2'? [Ynesfdaq?] y
+  record change 2/2 to 'plain2'?
+  (enter ? for help) [Ynesfdaq?] y
   
 Modify beginning, trim end, record both, add another file to test
 changes numbering
@@ -493,7 +508,8 b' changes numbering'
    2
    3
    4
-  record change 1/3 to 'plain'? [Ynesfdaq?] y
+  record change 1/3 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -8,5 +8,3 @@ 7
    8
@@ -501,14 +517,16 b' changes numbering'
    10
   -11
   -7264f99c5f5ff3261504828afa4fb4d406c3af54
-  record change 2/3 to 'plain'? [Ynesfdaq?] y
+  record change 2/3 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/plain2 b/plain2
   1 hunks, 1 lines changed
   @@ -1,1 +1,2 @@
    1
   +2
-  record change 3/3 to 'plain2'? [Ynesfdaq?] y
+  record change 3/3 to 'plain2'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip -p
@@ -566,7 +584,8 b' Record end'
    7
    8
    9
-  record change 1/2 to 'plain'? [Ynesfdaq?] n
+  record change 1/2 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] n
   
   @@ -4,7 +1,7 @@
    4
@@ -577,7 +596,8 b' Record end'
    9
   -10
   +10.new
-  record change 2/2 to 'plain'? [Ynesfdaq?] y
+  record change 2/2 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip -p
@@ -613,7 +633,8 b' Record beginning'
    4
    5
    6
-  record this change to 'plain'? [Ynesfdaq?] y
+  record this change to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip -p
@@ -660,7 +681,8 b' Record end'
    7
    8
    9
-  record change 1/2 to 'plain'? [Ynesfdaq?] n
+  record change 1/2 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] n
   
   @@ -1,7 +4,6 @@
    4
@@ -670,7 +692,8 b' Record end'
    8
    9
   -10.new
-  record change 2/2 to 'plain'? [Ynesfdaq?] y
+  record change 2/2 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
 Add to beginning, middle, end
@@ -695,7 +718,8 b' Record beginning, middle, and test that '
   +3
    4
    5
-  record change 1/3 to 'plain'? [Ynesfdaq?] y
+  record change 1/3 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,6 +4,8 @@
    4
@@ -706,7 +730,8 b' Record beginning, middle, and test that '
    7
    8
    9
-  record change 2/3 to 'plain'? [Ynesfdaq?] y
+  record change 2/3 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -3,4 +8,6 @@
    6
@@ -715,7 +740,8 b' Record beginning, middle, and test that '
    9
   +10
   +11
-  record change 3/3 to 'plain'? [Ynesfdaq?] n
+  record change 3/3 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] n
   
 
   $ hg tip -p
@@ -755,7 +781,8 b' Record end'
    9
   +10
   +11
-  record this change to 'plain'? [Ynesfdaq?] y
+  record this change to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip -p
@@ -786,11 +813,13 b' Interactive commit can name a directory '
   adding subdir/a
   diff --git a/subdir/a b/subdir/a
   new file mode 100644
-  examine changes to 'subdir/a'? [Ynesfdaq?] y
+  examine changes to 'subdir/a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +a
-  record this change to 'subdir/a'? [Ynesfdaq?] y
+  record this change to 'subdir/a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   $ cd subdir
 
@@ -804,7 +833,8 b' Interactive commit can name a directory '
   @@ -1,1 +1,2 @@
    a
   +a
-  record this change to 'subdir/a'? [Ynesfdaq?] y
+  record this change to 'subdir/a'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip -p
@@ -839,7 +869,8 b' Help, quit'
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] ?
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] ?
   
   y - yes, record this change
   n - no, skip this change
@@ -850,7 +881,8 b' Help, quit'
   a - record all changes to all remaining files
   q - quit, recording no changes
   ? - ? (display help)
-  examine changes to 'subdir/f1'? [Ynesfdaq?] q
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
   [255]
@@ -865,21 +897,25 b' Patterns'
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] y
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,1 +1,2 @@
    a
   +a
-  record change 1/2 to 'subdir/f1'? [Ynesfdaq?] n
+  record change 1/2 to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] n
   
   diff --git a/subdir/f2 b/subdir/f2
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f2'? [Ynesfdaq?] y
+  examine changes to 'subdir/f2'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,1 +1,2 @@
    b
   +b
-  record change 2/2 to 'subdir/f2'? [Ynesfdaq?] n
+  record change 2/2 to 'subdir/f2'?
+  (enter ? for help) [Ynesfdaq?] n
   
   no changes to record
   [1]
@@ -936,11 +972,13 b' Skip'
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] s
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] s
   
   diff --git a/subdir/f2 b/subdir/f2
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected
+  examine changes to 'subdir/f2'?
+  (enter ? for help) [Ynesfdaq?] abort: response expected
   [255]
 
 No
@@ -950,11 +988,13 b' No'
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] n
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] n
   
   diff --git a/subdir/f2 b/subdir/f2
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected
+  examine changes to 'subdir/f2'?
+  (enter ? for help) [Ynesfdaq?] abort: response expected
   [255]
 
 f, quit
@@ -965,11 +1005,13 b' f, quit'
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] f
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] f
   
   diff --git a/subdir/f2 b/subdir/f2
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f2'? [Ynesfdaq?] q
+  examine changes to 'subdir/f2'?
+  (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
   [255]
@@ -982,11 +1024,13 b' s, all'
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] s
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] s
   
   diff --git a/subdir/f2 b/subdir/f2
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f2'? [Ynesfdaq?] a
+  examine changes to 'subdir/f2'?
+  (enter ? for help) [Ynesfdaq?] a
   
 
   $ hg tip -p
@@ -1011,7 +1055,8 b' f'
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] f
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] f
   
 
   $ hg tip -p
@@ -1044,13 +1089,15 b' Preserve chmod +x'
   old mode 100644
   new mode 100755
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] y
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,2 +1,3 @@
    a
    a
   +a
-  record this change to 'subdir/f1'? [Ynesfdaq?] y
+  record this change to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip --config diff.git=True -p
@@ -1081,14 +1128,16 b' Preserve execute permission on original'
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] y
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +1,4 @@
    a
    a
    a
   +b
-  record this change to 'subdir/f1'? [Ynesfdaq?] y
+  record this change to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip --config diff.git=True -p
@@ -1121,14 +1170,16 b' Preserve chmod -x'
   old mode 100755
   new mode 100644
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] y
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,3 +2,4 @@ a
    a
    a
    b
   +c
-  record this change to 'subdir/f1'? [Ynesfdaq?] y
+  record this change to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg tip --config diff.git=True -p
@@ -1323,7 +1374,8 b' Editing patch (and ignoring trailing tex'
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 2 lines changed
-  examine changes to 'editedfile'? [Ynesfdaq?] y
+  examine changes to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +1,3 @@
   -This is the first line
@@ -1331,7 +1383,8 b' Editing patch (and ignoring trailing tex'
   +This line has changed
   +This change will be committed
    This is the third line
-  record this change to 'editedfile'? [Ynesfdaq?] e
+  record this change to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] e
   
   $ cat editedfile
   This line has changed
@@ -1352,10 +1405,12 b' Trying to edit patch for whole file'
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 1 lines changed
-  examine changes to 'editedfile'? [Ynesfdaq?] e
+  examine changes to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] e
   
   cannot edit patch for whole file
-  examine changes to 'editedfile'? [Ynesfdaq?] q
+  examine changes to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
   [255]
@@ -1376,7 +1431,8 b' Removing changes from patch'
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 3 lines changed
-  examine changes to 'editedfile'? [Ynesfdaq?] y
+  examine changes to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +1,3 @@
   -This is the first line
@@ -1385,7 +1441,8 b' Removing changes from patch'
   +This change will not be committed
   +This is the second line
   +This line has been added
-  record this change to 'editedfile'? [Ynesfdaq?] e
+  record this change to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] e
   
   no changes to record
   [1]
@@ -1414,7 +1471,8 b' Invalid patch'
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 3 lines changed
-  examine changes to 'editedfile'? [Ynesfdaq?] y
+  examine changes to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +1,3 @@
   -This is the first line
@@ -1423,7 +1481,8 b' Invalid patch'
   +This change will not be committed
   +This is the second line
   +This line has been added
-  record this change to 'editedfile'? [Ynesfdaq?] e
+  record this change to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] e
   
   patching file editedfile
   Hunk #1 FAILED at 0
@@ -1461,7 +1520,8 b' Malformed patch - error handling'
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 3 lines changed
-  examine changes to 'editedfile'? [Ynesfdaq?] y
+  examine changes to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +1,3 @@
   -This is the first line
@@ -1470,7 +1530,8 b' Malformed patch - error handling'
   +This change will not be committed
   +This is the second line
   +This line has been added
-  record this change to 'editedfile'? [Ynesfdaq?] e
+  record this change to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] e
   
   abort: error parsing patch: unhandled transition: range -> range
   [255]
@@ -1485,7 +1546,8 b' session'
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 3 lines changed
-  examine changes to 'editedfile'? [Ynesfdaq?] y
+  examine changes to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +1,3 @@
   -This is the first line
@@ -1494,10 +1556,12 b' session'
   +This change will not be committed
   +This is the second line
   +This line has been added
-  record this change to 'editedfile'? [Ynesfdaq?] e
+  record this change to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] e
   
   editor exited with exit code 1
-  record this change to 'editedfile'? [Ynesfdaq?] n
+  record this change to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] n
   
   no changes to record
   [1]
@@ -1516,7 +1580,8 b' random text in random positions is still'
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 3 lines changed
-  examine changes to 'editedfile'? [Ynesfdaq?] y
+  examine changes to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +1,3 @@
   -This is the first line
@@ -1525,7 +1590,8 b' random text in random positions is still'
   +This change will not be committed
   +This is the second line
   +This line has been added
-  record this change to 'editedfile'? [Ynesfdaq?] e
+  record this change to 'editedfile'?
+  (enter ? for help) [Ynesfdaq?] e
   
   abort: error parsing patch: unhandled transition: file -> other
   [255]
@@ -1556,14 +1622,16 b' Ignore win32text deprecation warning for'
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] y
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -3,3 +3,4 @@ a
    a
    b
    c
   +d
-  record this change to 'subdir/f1'? [Ynesfdaq?] y
+  record this change to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
   $ hg status -A subdir/f1
@@ -1595,14 +1663,16 b' Test --user when ui.username not set'
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] y
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -4,3 +4,4 @@ a
    b
    c
    d
   +e
-  record this change to 'subdir/f1'? [Ynesfdaq?] y
+  record this change to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
   $ hg status -A subdir/f1
   C subdir/f1
@@ -1626,14 +1696,16 b' Moving files'
   rename from plain
   rename to plain3
   1 hunks, 1 lines changed
-  examine changes to 'plain' and 'plain3'? [Ynesfdaq?] y
+  examine changes to 'plain' and 'plain3'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -11,3 +11,4 @@ 8
    9
    10
    11
   +somechange
-  record this change to 'plain3'? [Ynesfdaq?] y
+  record this change to 'plain3'?
+  (enter ? for help) [Ynesfdaq?] y
   
 The #if execbit block above changes the hash here on some systems
   $ hg status -A plain3
@@ -1665,13 +1737,15 b' Editing patch of newly added file'
   > EOF
   diff --git a/newfile b/newfile
   new file mode 100644
-  examine changes to 'newfile'? [Ynesfdaq?] y
+  examine changes to 'newfile'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,3 @@
   +This is the first line
   +This is the second line
   +This is the third line
-  record this change to 'newfile'? [Ynesfdaq?] e
+  record this change to 'newfile'?
+  (enter ? for help) [Ynesfdaq?] e
   
   $ hg cat -r tip newfile
   This is the very line
@@ -1696,11 +1770,13 b' Add new file from within a subdirectory'
   > EOF
   diff --git a/folder/bar b/folder/bar
   new file mode 100644
-  examine changes to 'folder/bar'? [Ynesfdaq?] y
+  examine changes to 'folder/bar'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +foo
-  record this change to 'folder/bar'? [Ynesfdaq?] y
+  record this change to 'folder/bar'?
+  (enter ? for help) [Ynesfdaq?] y
   
 The #if execbit block above changes the hashes here on some systems
   $ hg tip -p
@@ -1781,7 +1857,8 b' even if none of mode, size and timestamp'
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   2 hunks, 2 lines changed
-  examine changes to 'subdir/f1'? [Ynesfdaq?] y
+  examine changes to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,6 +1,6 @@
   -a
@@ -1791,7 +1868,8 b' even if none of mode, size and timestamp'
    b
    c
    d
-  record change 1/2 to 'subdir/f1'? [Ynesfdaq?] y
+  record change 1/2 to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,6 +2,6 @@
    a
@@ -1801,7 +1879,8 b' even if none of mode, size and timestamp'
    d
   -e
   +E
-  record change 2/2 to 'subdir/f1'? [Ynesfdaq?] n
+  record change 2/2 to 'subdir/f1'?
+  (enter ? for help) [Ynesfdaq?] n
   
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
@@ -1837,15 +1916,18 b' Test commands.commit.interactive.unified'
   $ printf 'y\ny\ny\n' | hg ci -im initial --config commands.commit.interactive.unified=0
   diff --git a/foo b/foo
   2 hunks, 2 lines changed
-  examine changes to 'foo'? [Ynesfdaq?] y
+  examine changes to 'foo'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,0 +2,1 @@ 1
   +change1
-  record change 1/2 to 'foo'? [Ynesfdaq?] y
+  record change 1/2 to 'foo'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -3,0 +5,1 @@ 3
   +change2
-  record change 2/2 to 'foo'? [Ynesfdaq?] y
+  record change 2/2 to 'foo'?
+  (enter ? for help) [Ynesfdaq?] y
   
   $ cd $TESTTMP
 
@@ -1873,14 +1955,16 b' Test diff.ignoreblanklines=1'
   $ printf 'y\ny\ny\n' | hg ci -im initial --config diff.ignoreblanklines=1
   diff --git a/foo b/foo
   2 hunks, 2 lines changed
-  examine changes to 'foo'? [Ynesfdaq?] y
+  examine changes to 'foo'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +1,4 @@
    1
   +
    2
    3
-  record change 1/2 to 'foo'? [Ynesfdaq?] y
+  record change 1/2 to 'foo'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,4 +3,5 @@
    2
@@ -1888,6 +1972,7 b' Test diff.ignoreblanklines=1'
   +change2
    4
    5
-  record change 2/2 to 'foo'? [Ynesfdaq?] y
+  record change 2/2 to 'foo'?
+  (enter ? for help) [Ynesfdaq?] y
   
 

tests/test-diff-color.t

@@ -171,7 +171,8 b' record'
    a
    a
    c
-  \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)
+  \x1b[0;33mrecord this change to 'a'?\x1b[0m (esc)
+  \x1b[0;33m(enter ? for help) [Ynesfdaq?]\x1b[0m y (esc)
   
 
   $ echo "[extensions]" >> $HGRCPATH
@@ -190,7 +191,8 b' qrecord'
   \x1b[0;36;1mold mode 100644\x1b[0m (esc)
   \x1b[0;36;1mnew mode 100755\x1b[0m (esc)
   1 hunks, 1 lines changed
-  \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc)
+  \x1b[0;33mexamine changes to 'a'?\x1b[0m (esc)
+  \x1b[0;33m(enter ? for help) [Ynesfdaq?]\x1b[0m y (esc)
   
   \x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc)
    c
@@ -201,7 +203,8 b' qrecord'
    a
    a
    c
-  \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)
+  \x1b[0;33mrecord this change to 'a'?\x1b[0m (esc)
+  \x1b[0;33m(enter ? for help) [Ynesfdaq?]\x1b[0m y (esc)
   
 
   $ hg qpop -a

tests/test-editor-filename.t

@@ -47,15 +47,18 b' editor for a diff, the file ends in .dif'
   > EOF
   diff --git a/one b/one
   new file mode 100644
-  examine changes to 'one'? [Ynesfdaq?] y
+  examine changes to 'one'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +1
-  record change 1/2 to 'one'? [Ynesfdaq?] e
+  record change 1/2 to 'one'?
+  (enter ? for help) [Ynesfdaq?] e
   
   *.diff (glob)
   editor exited with exit code 1
-  record change 1/2 to 'one'? [Ynesfdaq?] q
+  record change 1/2 to 'one'?
+  (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
   [255]

tests/test-keyword.t

@@ -392,13 +392,15 b' record chunk'
   +foo
    do not process $Id:
    xxx $
-  record change 1/2 to 'a'? [Ynesfdaq?] y
+  record change 1/2 to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,2 +3,3 @@
    do not process $Id:
    xxx $
   +bar
-  record change 2/2 to 'a'? [Ynesfdaq?] n
+  record change 2/2 to 'a'?
+  (enter ? for help) [Ynesfdaq?] n
   
 
   $ hg identify
@@ -450,13 +452,15 b' Record all chunks in file a'
   +foo
    do not process $Id:
    xxx $
-  record change 1/2 to 'a'? [Ynesfdaq?] y
+  record change 1/2 to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,2 +3,3 @@
    do not process $Id:
    xxx $
   +bar
-  record change 2/2 to 'a'? [Ynesfdaq?] y
+  record change 2/2 to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
 File a should be clean
@@ -516,7 +520,8 b' record added file alone'
   new file mode 100644
   @@ -0,0 +1,1 @@
   +$Id$
-  record this change to 'r'? [Ynesfdaq?] y
+  record this change to 'r'?
+  (enter ? for help) [Ynesfdaq?] y
   
   resolving manifests
   patching file r
@@ -546,11 +551,13 b' record added keyword ignored file'
   > EOF
   diff --git a/i b/i
   new file mode 100644
-  examine changes to 'i'? [Ynesfdaq?] y
+  examine changes to 'i'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +$Id$
-  record this change to 'i'? [Ynesfdaq?] y
+  record this change to 'i'?
+  (enter ? for help) [Ynesfdaq?] y
   
   resolving manifests
   patching file i

tests/test-mq-qrefresh-interactive.t

@@ -190,25 +190,29 b' partial qrefresh'
   > EOF
   diff --git a/1.txt b/1.txt
   2 hunks, 2 lines changed
-  examine changes to '1.txt'? [Ynesfdaq?] y
+  examine changes to '1.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +1,3 @@
    1
   -2
   +2 2
    3
-  record change 1/4 to '1.txt'? [Ynesfdaq?] y
+  record change 1/4 to '1.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -3,3 +3,3 @@
    3
   -4
   +4 4
    5
-  record change 2/4 to '1.txt'? [Ynesfdaq?] n
+  record change 2/4 to '1.txt'?
+  (enter ? for help) [Ynesfdaq?] n
   
   diff --git a/2.txt b/2.txt
   1 hunks, 1 lines changed
-  examine changes to '2.txt'? [Ynesfdaq?] y
+  examine changes to '2.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,5 +1,5 @@
    a
@@ -217,11 +221,13 b' partial qrefresh'
    c
    d
    e
-  record change 3/4 to '2.txt'? [Ynesfdaq?] y
+  record change 3/4 to '2.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/dir/a.txt b/dir/a.txt
   1 hunks, 1 lines changed
-  examine changes to 'dir/a.txt'? [Ynesfdaq?] n
+  examine changes to 'dir/a.txt'?
+  (enter ? for help) [Ynesfdaq?] n
   
 
 After partial qrefresh 'tip'
@@ -290,7 +296,8 b' qrefresh interactively everything else'
   > EOF
   diff --git a/1.txt b/1.txt
   1 hunks, 1 lines changed
-  examine changes to '1.txt'? [Ynesfdaq?] y
+  examine changes to '1.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,5 +1,5 @@
    1
@@ -299,11 +306,13 b' qrefresh interactively everything else'
   -4
   +4 4
    5
-  record change 1/2 to '1.txt'? [Ynesfdaq?] y
+  record change 1/2 to '1.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/dir/a.txt b/dir/a.txt
   1 hunks, 1 lines changed
-  examine changes to 'dir/a.txt'? [Ynesfdaq?] y
+  examine changes to 'dir/a.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,4 +1,4 @@
   -hello world
@@ -311,7 +320,8 b' qrefresh interactively everything else'
    
    someone
    up
-  record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y
+  record change 2/2 to 'dir/a.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
 After final qrefresh 'tip'

tests/test-mq-subrepo.t

@@ -303,11 +303,13 b' handle subrepos safely on qrecord'
   % qrecord --config ui.interactive=1 -m0 0.diff
   diff --git a/.hgsub b/.hgsub
   new file mode 100644
-  examine changes to '.hgsub'? [Ynesfdaq?] y
+  examine changes to '.hgsub'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +sub = sub
-  record this change to '.hgsub'? [Ynesfdaq?] y
+  record this change to '.hgsub'?
+  (enter ? for help) [Ynesfdaq?] y
   
   warning: subrepo spec file '.hgsub' not found
   warning: subrepo spec file '.hgsub' not found
@@ -331,12 +333,14 b' handle subrepos safely on qrecord'
   % qrecord --config ui.interactive=1 -m1 1.diff
   diff --git a/.hgsub b/.hgsub
   1 hunks, 1 lines changed
-  examine changes to '.hgsub'? [Ynesfdaq?] y
+  examine changes to '.hgsub'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,1 +1,2 @@
    sub = sub
   +sub2 = sub2
-  record this change to '.hgsub'? [Ynesfdaq?] y
+  record this change to '.hgsub'?
+  (enter ? for help) [Ynesfdaq?] y
   
   path sub
    source   sub
@@ -358,7 +362,8 b' handle subrepos safely on qrecord'
   % qrecord --config ui.interactive=1 -m2 2.diff
   diff --git a/.hgsub b/.hgsub
   deleted file mode 100644
-  examine changes to '.hgsub'? [Ynesfdaq?] y
+  examine changes to '.hgsub'?
+  (enter ? for help) [Ynesfdaq?] y
   
   % debugsub should be empty
 
@@ -374,7 +379,8 b' handle subrepos safely on qrecord'
   % qrecord --config ui.interactive=1 -m3 3.diff
   diff --git a/.hgsub b/.hgsub
   deleted file mode 100644
-  examine changes to '.hgsub'? [Ynesfdaq?] y
+  examine changes to '.hgsub'?
+  (enter ? for help) [Ynesfdaq?] y
   
   % debugsub should be empty
 

tests/test-qrecord.t

@@ -260,25 +260,29 b' qrecord a.patch'
   > EOF
   diff --git a/1.txt b/1.txt
   2 hunks, 2 lines changed
-  examine changes to '1.txt'? [Ynesfdaq?] y
+  examine changes to '1.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +1,3 @@
    1
   -2
   +2 2
    3
-  record change 1/4 to '1.txt'? [Ynesfdaq?] y
+  record change 1/4 to '1.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -3,3 +3,3 @@
    3
   -4
   +4 4
    5
-  record change 2/4 to '1.txt'? [Ynesfdaq?] n
+  record change 2/4 to '1.txt'?
+  (enter ? for help) [Ynesfdaq?] n
   
   diff --git a/2.txt b/2.txt
   1 hunks, 1 lines changed
-  examine changes to '2.txt'? [Ynesfdaq?] y
+  examine changes to '2.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,5 +1,5 @@
    a
@@ -287,11 +291,13 b' qrecord a.patch'
    c
    d
    e
-  record change 3/4 to '2.txt'? [Ynesfdaq?] y
+  record change 3/4 to '2.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/dir/a.txt b/dir/a.txt
   1 hunks, 1 lines changed
-  examine changes to 'dir/a.txt'? [Ynesfdaq?] n
+  examine changes to 'dir/a.txt'?
+  (enter ? for help) [Ynesfdaq?] n
   
 
 After qrecord a.patch 'tip'"
@@ -361,7 +367,8 b' qrecord b.patch'
   > EOF
   diff --git a/1.txt b/1.txt
   1 hunks, 1 lines changed
-  examine changes to '1.txt'? [Ynesfdaq?] y
+  examine changes to '1.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,5 +1,5 @@
    1
@@ -370,11 +377,13 b' qrecord b.patch'
   -4
   +4 4
    5
-  record change 1/2 to '1.txt'? [Ynesfdaq?] y
+  record change 1/2 to '1.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/dir/a.txt b/dir/a.txt
   1 hunks, 1 lines changed
-  examine changes to 'dir/a.txt'? [Ynesfdaq?] y
+  examine changes to 'dir/a.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,4 +1,4 @@
   -hello world
@@ -382,7 +391,8 b' qrecord b.patch'
    
    someone
    up
-  record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y
+  record change 2/2 to 'dir/a.txt'?
+  (enter ? for help) [Ynesfdaq?] y
   
 
 After qrecord b.patch 'tip'

tests/test-revert-interactive.t

@@ -55,7 +55,8 b' 10 run the same test than 8 from within '
   removing folder1/i
   diff --git a/f b/f
   2 hunks, 2 lines changed
-  examine changes to 'f'? [Ynesfdaq?] y
+  examine changes to 'f'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,6 +1,5 @@
   -a
@@ -64,7 +65,8 b' 10 run the same test than 8 from within '
    3
    4
    5
-  apply change 1/6 to 'f'? [Ynesfdaq?] y
+  apply change 1/6 to 'f'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,6 +1,5 @@
    1
@@ -73,11 +75,13 b' 10 run the same test than 8 from within '
    4
    5
   -b
-  apply change 2/6 to 'f'? [Ynesfdaq?] y
+  apply change 2/6 to 'f'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/folder1/g b/folder1/g
   2 hunks, 2 lines changed
-  examine changes to 'folder1/g'? [Ynesfdaq?] y
+  examine changes to 'folder1/g'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,6 +1,5 @@
   -c
@@ -86,7 +90,8 b' 10 run the same test than 8 from within '
    3
    4
    5
-  apply change 3/6 to 'folder1/g'? [Ynesfdaq?] ?
+  apply change 3/6 to 'folder1/g'?
+  (enter ? for help) [Ynesfdaq?] ?
   
   y - yes, apply this change
   n - no, skip this change
@@ -97,7 +102,8 b' 10 run the same test than 8 from within '
   a - apply all changes to all remaining files
   q - quit, applying no changes
   ? - ? (display help)
-  apply change 3/6 to 'folder1/g'? [Ynesfdaq?] y
+  apply change 3/6 to 'folder1/g'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,6 +1,5 @@
    1
@@ -106,11 +112,13 b' 10 run the same test than 8 from within '
    4
    5
   -d
-  apply change 4/6 to 'folder1/g'? [Ynesfdaq?] n
+  apply change 4/6 to 'folder1/g'?
+  (enter ? for help) [Ynesfdaq?] n
   
   diff --git a/folder2/h b/folder2/h
   2 hunks, 2 lines changed
-  examine changes to 'folder2/h'? [Ynesfdaq?] n
+  examine changes to 'folder2/h'?
+  (enter ? for help) [Ynesfdaq?] n
   
   reverting f
   reverting folder1/g
@@ -141,7 +149,8 b' Test that --interactive lift the need fo'
   $ echo q | hg revert -i -r 2
   diff --git a/folder1/g b/folder1/g
   1 hunks, 1 lines changed
-  examine changes to 'folder1/g'? [Ynesfdaq?] q
+  examine changes to 'folder1/g'?
+  (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
   [255]
@@ -157,7 +166,8 b" Test that a noop revert doesn't do an un"
    4
    5
   -d
-  apply this change to 'folder1/g'? [Ynesfdaq?] n
+  apply this change to 'folder1/g'?
+  (enter ? for help) [Ynesfdaq?] n
   
   $ ls folder1/
   g
@@ -171,7 +181,8 b' Test --no-backup'
    4
    5
   -d
-  apply this change to 'folder1/g'? [Ynesfdaq?] y
+  apply this change to 'folder1/g'?
+  (enter ? for help) [Ynesfdaq?] y
   
   $ ls folder1/
   g
@@ -193,7 +204,8 b' Test --no-backup'
   remove added file folder1/i (Yn)? n
   diff --git a/f b/f
   2 hunks, 2 lines changed
-  examine changes to 'f'? [Ynesfdaq?] y
+  examine changes to 'f'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,6 +1,5 @@
   -a
@@ -202,7 +214,8 b' Test --no-backup'
    3
    4
    5
-  apply change 1/6 to 'f'? [Ynesfdaq?] y
+  apply change 1/6 to 'f'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,6 +1,5 @@
    1
@@ -211,11 +224,13 b' Test --no-backup'
    4
    5
   -b
-  apply change 2/6 to 'f'? [Ynesfdaq?] y
+  apply change 2/6 to 'f'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/folder1/g b/folder1/g
   2 hunks, 2 lines changed
-  examine changes to 'folder1/g'? [Ynesfdaq?] y
+  examine changes to 'folder1/g'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,6 +1,5 @@
   -c
@@ -224,7 +239,8 b' Test --no-backup'
    3
    4
    5
-  apply change 3/6 to 'folder1/g'? [Ynesfdaq?] y
+  apply change 3/6 to 'folder1/g'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,6 +1,5 @@
    1
@@ -233,11 +249,13 b' Test --no-backup'
    4
    5
   -d
-  apply change 4/6 to 'folder1/g'? [Ynesfdaq?] n
+  apply change 4/6 to 'folder1/g'?
+  (enter ? for help) [Ynesfdaq?] n
   
   diff --git a/folder2/h b/folder2/h
   2 hunks, 2 lines changed
-  examine changes to 'folder2/h'? [Ynesfdaq?] n
+  examine changes to 'folder2/h'?
+  (enter ? for help) [Ynesfdaq?] n
   
   reverting f
   reverting folder1/g
@@ -280,7 +298,8 b' Test --no-backup'
    3
    4
    5
-  discard change 1/2 to 'f'? [Ynesfdaq?] ?
+  discard change 1/2 to 'f'?
+  (enter ? for help) [Ynesfdaq?] ?
   
   y - yes, discard this change
   n - no, skip this change
@@ -291,7 +310,8 b' Test --no-backup'
   a - discard all changes to all remaining files
   q - quit, discarding no changes
   ? - ? (display help)
-  discard change 1/2 to 'f'? [Ynesfdaq?] y
+  discard change 1/2 to 'f'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,6 +1,5 @@
    1
@@ -300,7 +320,8 b' Test --no-backup'
    4
    5
   -b
-  discard change 2/2 to 'f'? [Ynesfdaq?] n
+  discard change 2/2 to 'f'?
+  (enter ? for help) [Ynesfdaq?] n
   
   $ hg st
   M f
@@ -329,14 +350,16 b' Patterns'
   > EOF
   diff --git a/f b/f
   1 hunks, 1 lines changed
-  examine changes to 'f'? [Ynesfdaq?] y
+  examine changes to 'f'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -4,4 +4,3 @@
    3
    4
    5
   -b
-  discard this change to 'f'? [Ynesfdaq?] n
+  discard this change to 'f'?
+  (enter ? for help) [Ynesfdaq?] n
   
 
   $ hg update -C .
@@ -363,13 +386,15 b' 3) Use interactive revert with editing ('
   > EOF
   diff --git a/k b/k
   1 hunks, 2 lines changed
-  examine changes to 'k'? [Ynesfdaq?] y
+  examine changes to 'k'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,1 +1,2 @@
   -1
   +0
   +2
-  discard this change to 'k'? [Ynesfdaq?] e
+  discard this change to 'k'?
+  (enter ? for help) [Ynesfdaq?] e
   
   reverting k
   $ cat k
@@ -414,13 +439,15 b' When a line without EOL is selected duri'
   > EOF
   diff --git a/a b/a
   1 hunks, 1 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
+  examine changes to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,2 +1,1 @@
    0
   -1
   \ No newline at end of file
-  apply this change to 'a'? [Ynesfdaq?] y
+  apply this change to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   reverting a
   $ cat a
@@ -488,17 +515,20 b' Test "keep" mode'
   > EOF
   diff --git a/a b/a
   2 hunks, 2 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
+  examine changes to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,1 +1,2 @@
   +x
    a
-  keep change 1/2 to 'a'? [Ynesfdaq?] n
+  keep change 1/2 to 'a'?
+  (enter ? for help) [Ynesfdaq?] n
   
   @@ -1,1 +2,2 @@
    a
   +y
-  keep change 2/2 to 'a'? [Ynesfdaq?] e
+  keep change 2/2 to 'a'?
+  (enter ? for help) [Ynesfdaq?] e
   
   reverting a
   $ cat a

tests/test-shelve.t

@@ -756,21 +756,24 b' Test interactive shelve'
   > EOF
   diff --git a/a/a b/a/a
   2 hunks, 2 lines changed
-  examine changes to 'a/a'? [Ynesfdaq?] y
+  examine changes to 'a/a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +1,4 @@
   +a
    a
    c
    x
-  record change 1/2 to 'a/a'? [Ynesfdaq?] y
+  record change 1/2 to 'a/a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,3 +2,4 @@
    a
    c
    x
   +x
-  record change 2/2 to 'a/a'? [Ynesfdaq?] n
+  record change 2/2 to 'a/a'?
+  (enter ? for help) [Ynesfdaq?] n
   
   shelved as test
   merging a/a

tests/test-split.t

@@ -135,22 +135,26 b' was always recording three commits, one '
   $ HGEDITOR=false runsplit
   diff --git a/a b/a
   3 hunks, 3 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
+  examine changes to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,1 +1,1 @@
   -1
   +11
-  record change 1/3 to 'a'? [Ynesfdaq?] n
+  record change 1/3 to 'a'?
+  (enter ? for help) [Ynesfdaq?] n
   
   @@ -3,1 +3,1 @@ 2
   -3
   +33
-  record change 2/3 to 'a'? [Ynesfdaq?] n
+  record change 2/3 to 'a'?
+  (enter ? for help) [Ynesfdaq?] n
   
   @@ -5,1 +5,1 @@ 4
   -5
   +55
-  record change 3/3 to 'a'? [Ynesfdaq?] y
+  record change 3/3 to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   transaction abort!
   rollback completed
@@ -162,22 +166,26 b' was always recording three commits, one '
   $ runsplit
   diff --git a/a b/a
   3 hunks, 3 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
+  examine changes to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,1 +1,1 @@
   -1
   +11
-  record change 1/3 to 'a'? [Ynesfdaq?] n
+  record change 1/3 to 'a'?
+  (enter ? for help) [Ynesfdaq?] n
   
   @@ -3,1 +3,1 @@ 2
   -3
   +33
-  record change 2/3 to 'a'? [Ynesfdaq?] n
+  record change 2/3 to 'a'?
+  (enter ? for help) [Ynesfdaq?] n
   
   @@ -5,1 +5,1 @@ 4
   -5
   +55
-  record change 3/3 to 'a'? [Ynesfdaq?] y
+  record change 3/3 to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   EDITOR: HG: Splitting 1df0d5c5a3ab. Write commit message for the first split changeset.
   EDITOR: a2
@@ -192,17 +200,20 b' was always recording three commits, one '
   created new head
   diff --git a/a b/a
   2 hunks, 2 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
+  examine changes to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,1 +1,1 @@
   -1
   +11
-  record change 1/2 to 'a'? [Ynesfdaq?] n
+  record change 1/2 to 'a'?
+  (enter ? for help) [Ynesfdaq?] n
   
   @@ -3,1 +3,1 @@ 2
   -3
   +33
-  record change 2/2 to 'a'? [Ynesfdaq?] y
+  record change 2/2 to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:
   EDITOR: HG: - e704349bd21b: split 1
@@ -218,12 +229,14 b' was always recording three commits, one '
   EDITOR: HG: changed a
   diff --git a/a b/a
   1 hunks, 1 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
+  examine changes to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,1 +1,1 @@
   -1
   +11
-  record this change to 'a'? [Ynesfdaq?] y
+  record this change to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:
   EDITOR: HG: - e704349bd21b: split 1
@@ -515,12 +528,14 b' Split a non-head with obsoleted descenda'
   > EOF
   diff --git a/B b/B
   new file mode 100644
-  examine changes to 'B'? [Ynesfdaq?] y
+  examine changes to 'B'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +B
   \ No newline at end of file
-  record this change to 'B'? [Ynesfdaq?] y
+  record this change to 'B'?
+  (enter ? for help) [Ynesfdaq?] y
   
   EDITOR: HG: Splitting 112478962961. Write commit message for the first split changeset.
   EDITOR: B
@@ -621,11 +636,13 b' Do not move things to secret even if pha'
   $ printf 'f\nn\nf\n' | hg --config extensions.split= --config diff.ignoreblanklines=1 split
   diff --git a/bar b/bar
   2 hunks, 2 lines changed
-  examine changes to 'bar'? [Ynesfdaq?] f
+  examine changes to 'bar'?
+  (enter ? for help) [Ynesfdaq?] f
   
   diff --git a/foo b/foo
   1 hunks, 1 lines changed
-  examine changes to 'foo'? [Ynesfdaq?] n
+  examine changes to 'foo'?
+  (enter ? for help) [Ynesfdaq?] n
   
   EDITOR: HG: Splitting dd3c45017cbf. Write commit message for the first split changeset.
   EDITOR: splitme
@@ -640,7 +657,8 b' Do not move things to secret even if pha'
   created new head
   diff --git a/foo b/foo
   1 hunks, 1 lines changed
-  examine changes to 'foo'? [Ynesfdaq?] f
+  examine changes to 'foo'?
+  (enter ? for help) [Ynesfdaq?] f
   
   EDITOR: HG: Splitting dd3c45017cbf. So far it has been split into:
   EDITOR: HG: - f205aea1c624: split 1
@@ -675,11 +693,13 b" the ignoreblanklines thing isn't somehow"
   $ printf 'f\nn\nf\n' | hg --config extensions.split= --config diff.ignoreblanklines=1 split
   diff --git a/bar b/bar
   1 hunks, 1 lines changed
-  examine changes to 'bar'? [Ynesfdaq?] f
+  examine changes to 'bar'?
+  (enter ? for help) [Ynesfdaq?] f
   
   diff --git a/foo b/foo
   2 hunks, 2 lines changed
-  examine changes to 'foo'? [Ynesfdaq?] n
+  examine changes to 'foo'?
+  (enter ? for help) [Ynesfdaq?] n
   
   EDITOR: HG: Splitting 904c80b40a4a. Write commit message for the first split changeset.
   EDITOR: splitme
@@ -694,7 +714,8 b" the ignoreblanklines thing isn't somehow"
   created new head
   diff --git a/foo b/foo
   2 hunks, 2 lines changed
-  examine changes to 'foo'? [Ynesfdaq?] f
+  examine changes to 'foo'?
+  (enter ? for help) [Ynesfdaq?] f
   
   EDITOR: HG: Splitting 904c80b40a4a. So far it has been split into:
   EDITOR: HG: - ffecf40fa954: split 1
@@ -739,7 +760,8 b' Testing the case in split when commiting'
   diff --git a/foo b/foo
   old mode 100644
   new mode 100755
-  examine changes to 'foo'? [Ynesfdaq?] y
+  examine changes to 'foo'?
+  (enter ? for help) [Ynesfdaq?] y
   
   EDITOR: HG: Splitting 3a2125f0f4cb. Write commit message for the first split changeset.
   EDITOR: make executable