Mercurial > hg

comparison tests/test-record.t @ 23054:40c01f95449b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: adjust expected prompt choice outputs in test-record.t for Windows Changeset 9ab18a912c44 introduced "showing prompt choice if input is not a tty but is forced to be interactive" and adjusted expected output in test-record.t. But some tests for no-execbit platform (= Windows) were not adjusted by 9ab18a912c44. This causes unexpected failure of test-record on Windows environment. This patch adds below to prompt lines for such tests: - prompt choice at the end of prompt line, and - empty line after prompt line
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Mon, 20 Oct 2014 22:08:08 +0900
parents 9ab18a912c44
children e955549cd045
comparison
equal deleted inserted replaced
23053:5ba11ab48fcf 23054:40c01f95449b
961 > y 961 > y
962 > y 962 > y
963 > EOF 963 > EOF
964 diff --git a/subdir/f1 b/subdir/f1 964 diff --git a/subdir/f1 b/subdir/f1
965 1 hunks, 1 lines changed 965 1 hunks, 1 lines changed
966 examine changes to 'subdir/f1'? [Ynesfdaq?] 966 examine changes to 'subdir/f1'? [Ynesfdaq?] y
967
967 @@ -1,2 +1,3 @@ 968 @@ -1,2 +1,3 @@
968 a 969 a
969 a 970 a
970 +a 971 +a
971 record this change to 'subdir/f1'? [Ynesfdaq?] 972 record this change to 'subdir/f1'? [Ynesfdaq?] y
973
972 974
973 $ hg tip --config diff.git=True -p 975 $ hg tip --config diff.git=True -p
974 changeset: 22:0d463bd428f5 976 changeset: 22:0d463bd428f5
975 tag: tip 977 tag: tip
976 user: test 978 user: test
994 > y 996 > y
995 > y 997 > y
996 > EOF 998 > EOF
997 diff --git a/subdir/f1 b/subdir/f1 999 diff --git a/subdir/f1 b/subdir/f1
998 1 hunks, 1 lines changed 1000 1 hunks, 1 lines changed
999 examine changes to 'subdir/f1'? [Ynesfdaq?] 1001 examine changes to 'subdir/f1'? [Ynesfdaq?] y
1002
1000 @@ -1,3 +1,4 @@ 1003 @@ -1,3 +1,4 @@
1001 a 1004 a
1002 a 1005 a
1003 a 1006 a
1004 +b 1007 +b
1005 record this change to 'subdir/f1'? [Ynesfdaq?] 1008 record this change to 'subdir/f1'? [Ynesfdaq?] y
1009
1006 1010
1007 $ hg tip --config diff.git=True -p 1011 $ hg tip --config diff.git=True -p
1008 changeset: 23:0eab41a3e524 1012 changeset: 23:0eab41a3e524
1009 tag: tip 1013 tag: tip
1010 user: test 1014 user: test
1030 > y 1034 > y
1031 > y 1035 > y
1032 > EOF 1036 > EOF
1033 diff --git a/subdir/f1 b/subdir/f1 1037 diff --git a/subdir/f1 b/subdir/f1
1034 1 hunks, 1 lines changed 1038 1 hunks, 1 lines changed
1035 examine changes to 'subdir/f1'? [Ynesfdaq?] 1039 examine changes to 'subdir/f1'? [Ynesfdaq?] y
1040
1036 @@ -2,3 +2,4 @@ 1041 @@ -2,3 +2,4 @@
1037 a 1042 a
1038 a 1043 a
1039 b 1044 b
1040 +c 1045 +c
1041 record this change to 'subdir/f1'? [Ynesfdaq?] 1046 record this change to 'subdir/f1'? [Ynesfdaq?] y
1047
1042 1048
1043 $ hg tip --config diff.git=True -p 1049 $ hg tip --config diff.git=True -p
1044 changeset: 24:f4f718f27b7c 1050 changeset: 24:f4f718f27b7c
1045 tag: tip 1051 tag: tip
1046 user: test 1052 user: test