Mercurial > hg
diff tests/test-keyword.t @ 42566:f802a75da585
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
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Thu, 20 Jun 2019 14:45:52 -0700 |
parents | 3de4f17f4824 |
children | 4128ffba4431 |
line wrap: on
line diff
--- a/tests/test-keyword.t Thu Jun 20 11:40:47 2019 -0700 +++ b/tests/test-keyword.t Thu Jun 20 14:45:52 2019 -0700 @@ -392,13 +392,15 @@ +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 @@ +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 @@ 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 @@ > 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