Mercurial > public > mercurial-scm > hg
diff tests/test-diff-color.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 | c343557a8442 |
| children | e955549cd045 |
line wrap: on
line diff
--- a/tests/test-diff-color.t Tue Sep 30 18:22:58 2014 -0500 +++ b/tests/test-diff-color.t Wed Oct 01 01:04:18 2014 +0200 @@ -85,7 +85,8 @@ \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 (esc) + \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) + \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) c a @@ -95,7 +96,8 @@ a a c - \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m (esc) + \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc) + $ echo "[extensions]" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH @@ -113,7 +115,8 @@ \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 (esc) + \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) + \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) c a @@ -123,7 +126,8 @@ a a c - \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m (esc) + \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc) + $ hg qpop -a popping patch