comparison tests/test-mq-qrefresh-interactive.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 cc9fb45986d4
comparison
equal deleted inserted replaced
22588:cd1b43226b34 22589:9ab18a912c44
179 > y 179 > y
180 > n 180 > n
181 > EOF 181 > EOF
182 diff --git a/1.txt b/1.txt 182 diff --git a/1.txt b/1.txt
183 2 hunks, 2 lines changed 183 2 hunks, 2 lines changed
184 examine changes to '1.txt'? [Ynesfdaq?] 184 examine changes to '1.txt'? [Ynesfdaq?] y
185
185 @@ -1,3 +1,3 @@ 186 @@ -1,3 +1,3 @@
186 1 187 1
187 -2 188 -2
188 +2 2 189 +2 2
189 3 190 3
190 record change 1/4 to '1.txt'? [Ynesfdaq?] 191 record change 1/4 to '1.txt'? [Ynesfdaq?] y
192
191 @@ -3,3 +3,3 @@ 193 @@ -3,3 +3,3 @@
192 3 194 3
193 -4 195 -4
194 +4 4 196 +4 4
195 5 197 5
196 record change 2/4 to '1.txt'? [Ynesfdaq?] 198 record change 2/4 to '1.txt'? [Ynesfdaq?] n
199
197 diff --git a/2.txt b/2.txt 200 diff --git a/2.txt b/2.txt
198 1 hunks, 1 lines changed 201 1 hunks, 1 lines changed
199 examine changes to '2.txt'? [Ynesfdaq?] 202 examine changes to '2.txt'? [Ynesfdaq?] y
203
200 @@ -1,5 +1,5 @@ 204 @@ -1,5 +1,5 @@
201 a 205 a
202 -b 206 -b
203 +b b 207 +b b
204 c 208 c
205 d 209 d
206 e 210 e
207 record change 3/4 to '2.txt'? [Ynesfdaq?] 211 record change 3/4 to '2.txt'? [Ynesfdaq?] y
212
208 diff --git a/dir/a.txt b/dir/a.txt 213 diff --git a/dir/a.txt b/dir/a.txt
209 1 hunks, 1 lines changed 214 1 hunks, 1 lines changed
210 examine changes to 'dir/a.txt'? [Ynesfdaq?] 215 examine changes to 'dir/a.txt'? [Ynesfdaq?] n
216
211 217
212 After partial qrefresh 'tip' 218 After partial qrefresh 'tip'
213 219
214 $ hg tip -p 220 $ hg tip -p
215 changeset: 1:0738af1a8211 221 changeset: 1:0738af1a8211
273 > y 279 > y
274 > y 280 > y
275 > EOF 281 > EOF
276 diff --git a/1.txt b/1.txt 282 diff --git a/1.txt b/1.txt
277 1 hunks, 1 lines changed 283 1 hunks, 1 lines changed
278 examine changes to '1.txt'? [Ynesfdaq?] 284 examine changes to '1.txt'? [Ynesfdaq?] y
285
279 @@ -1,5 +1,5 @@ 286 @@ -1,5 +1,5 @@
280 1 287 1
281 2 2 288 2 2
282 3 289 3
283 -4 290 -4
284 +4 4 291 +4 4
285 5 292 5
286 record change 1/2 to '1.txt'? [Ynesfdaq?] 293 record change 1/2 to '1.txt'? [Ynesfdaq?] y
294
287 diff --git a/dir/a.txt b/dir/a.txt 295 diff --git a/dir/a.txt b/dir/a.txt
288 1 hunks, 1 lines changed 296 1 hunks, 1 lines changed
289 examine changes to 'dir/a.txt'? [Ynesfdaq?] 297 examine changes to 'dir/a.txt'? [Ynesfdaq?] y
298
290 @@ -1,4 +1,4 @@ 299 @@ -1,4 +1,4 @@
291 -hello world 300 -hello world
292 +hello world! 301 +hello world!
293 302
294 someone 303 someone
295 up 304 up
296 record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] 305 record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y
306
297 307
298 After final qrefresh 'tip' 308 After final qrefresh 'tip'
299 309
300 $ hg tip -p 310 $ hg tip -p
301 changeset: 1:2c3f66afeed9 311 changeset: 1:2c3f66afeed9