Mercurial > public > mercurial-scm > hg-stable
diff tests/test-mq-subrepo.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 | aac5482db318 |
| children | e955549cd045 |
line wrap: on
line diff
--- a/tests/test-mq-subrepo.t Tue Sep 30 18:22:58 2014 -0500 +++ b/tests/test-mq-subrepo.t Wed Oct 01 01:04:18 2014 +0200 @@ -291,7 +291,8 @@ % qrecord --config ui.interactive=1 -m0 0.diff diff --git a/.hgsub b/.hgsub new file mode 100644 - examine changes to '.hgsub'? [Ynesfdaq?] + examine changes to '.hgsub'? [Ynesfdaq?] y + abort: uncommitted changes in subrepository sub [255] % update substate when adding .hgsub w/clean updated subrepo @@ -299,7 +300,8 @@ % qrecord --config ui.interactive=1 -m0 0.diff diff --git a/.hgsub b/.hgsub new file mode 100644 - examine changes to '.hgsub'? [Ynesfdaq?] + examine changes to '.hgsub'? [Ynesfdaq?] y + path sub source sub revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 @@ -315,11 +317,13 @@ % qrecord --config ui.interactive=1 -m1 1.diff diff --git a/.hgsub b/.hgsub 1 hunks, 1 lines changed - examine changes to '.hgsub'? [Ynesfdaq?] + examine changes to '.hgsub'? [Ynesfdaq?] y + @@ -1,1 +1,2 @@ sub = sub +sub2 = sub2 - record this change to '.hgsub'? [Ynesfdaq?] + record this change to '.hgsub'? [Ynesfdaq?] y + abort: uncommitted changes in subrepository sub2 [255] % update substate when modifying .hgsub w/clean updated subrepo @@ -327,11 +331,13 @@ % qrecord --config ui.interactive=1 -m1 1.diff diff --git a/.hgsub b/.hgsub 1 hunks, 1 lines changed - examine changes to '.hgsub'? [Ynesfdaq?] + examine changes to '.hgsub'? [Ynesfdaq?] y + @@ -1,1 +1,2 @@ sub = sub +sub2 = sub2 - record this change to '.hgsub'? [Ynesfdaq?] + record this change to '.hgsub'? [Ynesfdaq?] y + path sub source sub revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 @@ -352,7 +358,8 @@ % qrecord --config ui.interactive=1 -m2 2.diff diff --git a/.hgsub b/.hgsub deleted file mode 100644 - examine changes to '.hgsub'? [Ynesfdaq?] + examine changes to '.hgsub'? [Ynesfdaq?] y + % debugsub should be empty $ hg qpop -qa @@ -367,7 +374,8 @@ % qrecord --config ui.interactive=1 -m3 3.diff diff --git a/.hgsub b/.hgsub deleted file mode 100644 - examine changes to '.hgsub'? [Ynesfdaq?] + examine changes to '.hgsub'? [Ynesfdaq?] y + % debugsub should be empty $ cd ..