Mercurial > hg
diff tests/test-keyword.t @ 22589:9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
The tests often set ui.interactive to control normally interactive prompts from
stdin. That gave an output where it was non-obvious what prompts got which
which response, and the output lacked the newline users would see after input.
Instead, if the input not is a tty, write the selection and a newline.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 01 Oct 2014 01:04:18 +0200 |
parents | b081decd9062 |
children | bb679344c88d |
line wrap: on
line diff
--- a/tests/test-keyword.t Tue Sep 30 18:22:58 2014 -0500 +++ b/tests/test-keyword.t Wed Oct 01 01:04:18 2014 +0200 @@ -343,18 +343,21 @@ > EOF diff --git a/a b/a 2 hunks, 2 lines changed - examine changes to 'a'? [Ynesfdaq?] + examine changes to 'a'? [Ynesfdaq?] y + @@ -1,3 +1,4 @@ expand $Id$ +foo do not process $Id: xxx $ - record change 1/2 to 'a'? [Ynesfdaq?] + record change 1/2 to 'a'? [Ynesfdaq?] y + @@ -2,2 +3,3 @@ do not process $Id: xxx $ +bar - record change 2/2 to 'a'? [Ynesfdaq?] + record change 2/2 to 'a'? [Ynesfdaq?] n + $ hg identify 5f5eb23505c3+ tip @@ -400,18 +403,21 @@ > EOF diff --git a/a b/a 2 hunks, 2 lines changed - examine changes to 'a'? [Ynesfdaq?] + examine changes to 'a'? [Ynesfdaq?] y + @@ -1,3 +1,4 @@ expand $Id$ +foo do not process $Id: xxx $ - record change 1/2 to 'a'? [Ynesfdaq?] + record change 1/2 to 'a'? [Ynesfdaq?] y + @@ -2,2 +3,3 @@ do not process $Id: xxx $ +bar - record change 2/2 to 'a'? [Ynesfdaq?] + record change 2/2 to 'a'? [Ynesfdaq?] y + File a should be clean @@ -467,7 +473,8 @@ > EOF diff --git a/r b/r new file mode 100644 - examine changes to 'r'? [Ynesfdaq?] + examine changes to 'r'? [Ynesfdaq?] y + r committed changeset 3:82a2f715724d overwriting r expanding keywords @@ -491,7 +498,8 @@ > EOF diff --git a/i b/i new file mode 100644 - examine changes to 'i'? [Ynesfdaq?] + examine changes to 'i'? [Ynesfdaq?] y + i committed changeset 3:9f40ceb5a072 $ cat i