Mercurial > hg
diff tests/test-qrecord.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 | c1d93edcf004 |
children | f1eaf03dd608 |
line wrap: on
line diff
--- a/tests/test-qrecord.t Tue Sep 30 18:22:58 2014 -0500 +++ b/tests/test-qrecord.t Wed Oct 01 01:04:18 2014 +0200 @@ -246,22 +246,26 @@ > EOF diff --git a/1.txt b/1.txt 2 hunks, 2 lines changed - examine changes to '1.txt'? [Ynesfdaq?] + examine changes to '1.txt'? [Ynesfdaq?] y + @@ -1,3 +1,3 @@ 1 -2 +2 2 3 - record change 1/4 to '1.txt'? [Ynesfdaq?] + record change 1/4 to '1.txt'? [Ynesfdaq?] y + @@ -3,3 +3,3 @@ 3 -4 +4 4 5 - record change 2/4 to '1.txt'? [Ynesfdaq?] + record change 2/4 to '1.txt'? [Ynesfdaq?] n + diff --git a/2.txt b/2.txt 1 hunks, 1 lines changed - examine changes to '2.txt'? [Ynesfdaq?] + examine changes to '2.txt'? [Ynesfdaq?] y + @@ -1,5 +1,5 @@ a -b @@ -269,10 +273,12 @@ c d e - record change 3/4 to '2.txt'? [Ynesfdaq?] + record change 3/4 to '2.txt'? [Ynesfdaq?] y + diff --git a/dir/a.txt b/dir/a.txt 1 hunks, 1 lines changed - examine changes to 'dir/a.txt'? [Ynesfdaq?] + examine changes to 'dir/a.txt'? [Ynesfdaq?] n + After qrecord a.patch 'tip'" @@ -341,7 +347,8 @@ > EOF diff --git a/1.txt b/1.txt 1 hunks, 1 lines changed - examine changes to '1.txt'? [Ynesfdaq?] + examine changes to '1.txt'? [Ynesfdaq?] y + @@ -1,5 +1,5 @@ 1 2 2 @@ -349,17 +356,20 @@ -4 +4 4 5 - record change 1/2 to '1.txt'? [Ynesfdaq?] + record change 1/2 to '1.txt'? [Ynesfdaq?] y + diff --git a/dir/a.txt b/dir/a.txt 1 hunks, 1 lines changed - examine changes to 'dir/a.txt'? [Ynesfdaq?] + examine changes to 'dir/a.txt'? [Ynesfdaq?] y + @@ -1,4 +1,4 @@ -hello world +hello world! someone up - record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] + record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y + After qrecord b.patch 'tip'