Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
22588:cd1b43226b34 | 22589:9ab18a912c44 |
---|---|
341 > y | 341 > y |
342 > n | 342 > n |
343 > EOF | 343 > EOF |
344 diff --git a/a b/a | 344 diff --git a/a b/a |
345 2 hunks, 2 lines changed | 345 2 hunks, 2 lines changed |
346 examine changes to 'a'? [Ynesfdaq?] | 346 examine changes to 'a'? [Ynesfdaq?] y |
347 | |
347 @@ -1,3 +1,4 @@ | 348 @@ -1,3 +1,4 @@ |
348 expand $Id$ | 349 expand $Id$ |
349 +foo | 350 +foo |
350 do not process $Id: | 351 do not process $Id: |
351 xxx $ | 352 xxx $ |
352 record change 1/2 to 'a'? [Ynesfdaq?] | 353 record change 1/2 to 'a'? [Ynesfdaq?] y |
354 | |
353 @@ -2,2 +3,3 @@ | 355 @@ -2,2 +3,3 @@ |
354 do not process $Id: | 356 do not process $Id: |
355 xxx $ | 357 xxx $ |
356 +bar | 358 +bar |
357 record change 2/2 to 'a'? [Ynesfdaq?] | 359 record change 2/2 to 'a'? [Ynesfdaq?] n |
360 | |
358 | 361 |
359 $ hg identify | 362 $ hg identify |
360 5f5eb23505c3+ tip | 363 5f5eb23505c3+ tip |
361 $ hg status | 364 $ hg status |
362 M a | 365 M a |
398 > y | 401 > y |
399 > y | 402 > y |
400 > EOF | 403 > EOF |
401 diff --git a/a b/a | 404 diff --git a/a b/a |
402 2 hunks, 2 lines changed | 405 2 hunks, 2 lines changed |
403 examine changes to 'a'? [Ynesfdaq?] | 406 examine changes to 'a'? [Ynesfdaq?] y |
407 | |
404 @@ -1,3 +1,4 @@ | 408 @@ -1,3 +1,4 @@ |
405 expand $Id$ | 409 expand $Id$ |
406 +foo | 410 +foo |
407 do not process $Id: | 411 do not process $Id: |
408 xxx $ | 412 xxx $ |
409 record change 1/2 to 'a'? [Ynesfdaq?] | 413 record change 1/2 to 'a'? [Ynesfdaq?] y |
414 | |
410 @@ -2,2 +3,3 @@ | 415 @@ -2,2 +3,3 @@ |
411 do not process $Id: | 416 do not process $Id: |
412 xxx $ | 417 xxx $ |
413 +bar | 418 +bar |
414 record change 2/2 to 'a'? [Ynesfdaq?] | 419 record change 2/2 to 'a'? [Ynesfdaq?] y |
420 | |
415 | 421 |
416 File a should be clean | 422 File a should be clean |
417 | 423 |
418 $ hg status -A a | 424 $ hg status -A a |
419 C a | 425 C a |
465 $ hg -v record -l msg -d '12 2' r<<EOF | 471 $ hg -v record -l msg -d '12 2' r<<EOF |
466 > y | 472 > y |
467 > EOF | 473 > EOF |
468 diff --git a/r b/r | 474 diff --git a/r b/r |
469 new file mode 100644 | 475 new file mode 100644 |
470 examine changes to 'r'? [Ynesfdaq?] | 476 examine changes to 'r'? [Ynesfdaq?] y |
477 | |
471 r | 478 r |
472 committed changeset 3:82a2f715724d | 479 committed changeset 3:82a2f715724d |
473 overwriting r expanding keywords | 480 overwriting r expanding keywords |
474 - status call required for dirstate.normallookup() check | 481 - status call required for dirstate.normallookup() check |
475 $ hg status r | 482 $ hg status r |
489 $ hg --verbose record -d '13 1' -m recignored<<EOF | 496 $ hg --verbose record -d '13 1' -m recignored<<EOF |
490 > y | 497 > y |
491 > EOF | 498 > EOF |
492 diff --git a/i b/i | 499 diff --git a/i b/i |
493 new file mode 100644 | 500 new file mode 100644 |
494 examine changes to 'i'? [Ynesfdaq?] | 501 examine changes to 'i'? [Ynesfdaq?] y |
502 | |
495 i | 503 i |
496 committed changeset 3:9f40ceb5a072 | 504 committed changeset 3:9f40ceb5a072 |
497 $ cat i | 505 $ cat i |
498 $Id$ | 506 $Id$ |
499 $ hg -q rollback | 507 $ hg -q rollback |