##// END OF EJS Templates
record: add new tests for commit interactive (same tests as record)
Laurent Charignon -
r24279:7cf9a9e0 default
parent child Browse files
Show More
@@ -15,7 +15,7 b' Select no files'
15 15 $ touch empty-rw
16 16 $ hg add empty-rw
17 17
18 $ hg record empty-rw<<EOF
18 $ hg commit -i empty-rw<<EOF
19 19 > n
20 20 > EOF
21 21 diff --git a/empty-rw b/empty-rw
@@ -34,7 +34,7 b' Select no files'
34 34
35 35 Select files but no hunks
36 36
37 $ hg record empty-rw<<EOF
37 $ hg commit -i empty-rw<<EOF
38 38 > y
39 39 > n
40 40 > EOF
@@ -55,7 +55,7 b' Select files but no hunks'
55 55
56 56 Record empty file
57 57
58 $ hg record -d '0 0' -m empty empty-rw<<EOF
58 $ hg commit -i -d '0 0' -m empty empty-rw<<EOF
59 59 > y
60 60 > y
61 61 > EOF
@@ -85,7 +85,7 b' Summary shows we updated to the new cset'
85 85 Rename empty file
86 86
87 87 $ hg mv empty-rw empty-rename
88 $ hg record -d '1 0' -m rename<<EOF
88 $ hg commit -i -d '1 0' -m rename<<EOF
89 89 > y
90 90 > EOF
91 91 diff --git a/empty-rw b/empty-rename
@@ -106,7 +106,7 b' Rename empty file'
106 106 Copy empty file
107 107
108 108 $ hg cp empty-rename empty-copy
109 $ hg record -d '2 0' -m copy<<EOF
109 $ hg commit -i -d '2 0' -m copy<<EOF
110 110 > y
111 111 > EOF
112 112 diff --git a/empty-rename b/empty-copy
@@ -127,7 +127,7 b' Copy empty file'
127 127 Delete empty file
128 128
129 129 $ hg rm empty-copy
130 $ hg record -d '3 0' -m delete<<EOF
130 $ hg commit -i -d '3 0' -m delete<<EOF
131 131 > y
132 132 > EOF
133 133 diff --git a/empty-copy b/empty-copy
@@ -149,7 +149,7 b' Add binary file'
149 149 $ hg bundle --base -2 tip.bundle
150 150 1 changesets found
151 151 $ hg add tip.bundle
152 $ hg record -d '4 0' -m binary<<EOF
152 $ hg commit -i -d '4 0' -m binary<<EOF
153 153 > y
154 154 > EOF
155 155 diff --git a/tip.bundle b/tip.bundle
@@ -173,7 +173,7 b' Change binary file'
173 173
174 174 $ hg bundle --base -2 tip.bundle
175 175 1 changesets found
176 $ hg record -d '5 0' -m binary-change<<EOF
176 $ hg commit -i -d '5 0' -m binary-change<<EOF
177 177 > y
178 178 > EOF
179 179 diff --git a/tip.bundle b/tip.bundle
@@ -197,7 +197,7 b' Rename and change binary file'
197 197 $ hg mv tip.bundle top.bundle
198 198 $ hg bundle --base -2 top.bundle
199 199 1 changesets found
200 $ hg record -d '6 0' -m binary-change-rename<<EOF
200 $ hg commit -i -d '6 0' -m binary-change-rename<<EOF
201 201 > y
202 202 > EOF
203 203 diff --git a/tip.bundle b/top.bundle
@@ -227,7 +227,7 b' Add plain file'
227 227 > done
228 228
229 229 $ hg add plain
230 $ hg record -d '7 0' -m plain plain<<EOF
230 $ hg commit -i -d '7 0' -m plain plain<<EOF
231 231 > y
232 232 > y
233 233 > EOF
@@ -274,7 +274,7 b' Modify end of plain file with username u'
274 274
275 275 $ echo 11 >> plain
276 276 $ unset HGUSER
277 $ hg record --config ui.username= -d '8 0' -m end plain
277 $ hg commit -i --config ui.username= -d '8 0' -m end plain
278 278 abort: no username supplied
279 279 (use "hg config --edit" to set your username)
280 280 [255]
@@ -284,7 +284,7 b' Modify end of plain file, also test that'
284 284
285 285 $ HGUSER="test"
286 286 $ export HGUSER
287 $ hg record --config diff.showfunc=true -d '8 0' -m end plain <<EOF
287 $ hg commit -i --config diff.showfunc=true -d '8 0' -m end plain <<EOF
288 288 > y
289 289 > y
290 290 > EOF
@@ -303,7 +303,7 b' Modify end of plain file, also test that'
303 303 Modify end of plain file, no EOL
304 304
305 305 $ hg tip --template '{node}' >> plain
306 $ hg record -d '9 0' -m noeol plain <<EOF
306 $ hg commit -i -d '9 0' -m noeol plain <<EOF
307 307 > y
308 308 > y
309 309 > EOF
@@ -325,7 +325,7 b' Modify end of plain file, add EOL'
325 325 $ echo >> plain
326 326 $ echo 1 > plain2
327 327 $ hg add plain2
328 $ hg record -d '10 0' -m eol plain plain2 <<EOF
328 $ hg commit -i -d '10 0' -m eol plain plain2 <<EOF
329 329 > y
330 330 > y
331 331 > y
@@ -361,7 +361,7 b' changes numbering'
361 361 > done
362 362 $ echo 2 >> plain2
363 363
364 $ hg record -d '10 0' -m begin-and-end plain plain2 <<EOF
364 $ hg commit -i -d '10 0' -m begin-and-end plain plain2 <<EOF
365 365 > y
366 366 > y
367 367 > y
@@ -437,7 +437,7 b' Trim beginning, modify end'
437 437
438 438 Record end
439 439
440 $ hg record -d '11 0' -m end-only plain <<EOF
440 $ hg commit -i -d '11 0' -m end-only plain <<EOF
441 441 > y
442 442 > n
443 443 > y
@@ -490,7 +490,7 b' Record end'
490 490
491 491 Record beginning
492 492
493 $ hg record -d '12 0' -m begin-only plain <<EOF
493 $ hg commit -i -d '12 0' -m begin-only plain <<EOF
494 494 > y
495 495 > y
496 496 > EOF
@@ -536,7 +536,7 b' Add to beginning, trim from end'
536 536
537 537 Record end
538 538
539 $ hg record --traceback -d '13 0' -m end-again plain<<EOF
539 $ hg commit -i --traceback -d '13 0' -m end-again plain<<EOF
540 540 > y
541 541 > n
542 542 > y
@@ -577,7 +577,7 b' Add to beginning, middle, end'
577 577
578 578 Record beginning, middle, and test that format-breaking diffopts are ignored
579 579
580 $ hg record --config diff.noprefix=True -d '14 0' -m middle-only plain <<EOF
580 $ hg commit -i --config diff.noprefix=True -d '14 0' -m middle-only plain <<EOF
581 581 > y
582 582 > y
583 583 > y
@@ -641,7 +641,7 b' Record beginning, middle, and test that '
641 641
642 642 Record end
643 643
644 $ hg record -d '15 0' -m end-only plain <<EOF
644 $ hg commit -i -d '15 0' -m end-only plain <<EOF
645 645 > y
646 646 > y
647 647 > EOF
@@ -683,7 +683,7 b' Record end'
683 683 adding subdir/a
684 684
685 685 $ echo a >> a
686 $ hg record -d '16 0' -m subdir-change a <<EOF
686 $ hg commit -i -d '16 0' -m subdir-change a <<EOF
687 687 > y
688 688 > y
689 689 > EOF
@@ -723,7 +723,7 b' Record end'
723 723
724 724 Help, quit
725 725
726 $ hg record <<EOF
726 $ hg commit -i <<EOF
727 727 > ?
728 728 > q
729 729 > EOF
@@ -747,7 +747,7 b' Help, quit'
747 747
748 748 Skip
749 749
750 $ hg record <<EOF
750 $ hg commit -i <<EOF
751 751 > s
752 752 > EOF
753 753 diff --git a/subdir/f1 b/subdir/f1
@@ -761,7 +761,7 b' Skip'
761 761
762 762 No
763 763
764 $ hg record <<EOF
764 $ hg commit -i <<EOF
765 765 > n
766 766 > EOF
767 767 diff --git a/subdir/f1 b/subdir/f1
@@ -775,7 +775,7 b' No'
775 775
776 776 f, quit
777 777
778 $ hg record <<EOF
778 $ hg commit -i <<EOF
779 779 > f
780 780 > q
781 781 > EOF
@@ -792,7 +792,7 b' f, quit'
792 792
793 793 s, all
794 794
795 $ hg record -d '18 0' -mx <<EOF
795 $ hg commit -i -d '18 0' -mx <<EOF
796 796 > s
797 797 > a
798 798 > EOF
@@ -822,7 +822,7 b' s, all'
822 822
823 823 f
824 824
825 $ hg record -d '19 0' -my <<EOF
825 $ hg commit -i -d '19 0' -my <<EOF
826 826 > f
827 827 > EOF
828 828 diff --git a/subdir/f1 b/subdir/f1
@@ -851,7 +851,7 b' Preserve chmod +x'
851 851
852 852 $ chmod +x f1
853 853 $ echo a >> f1
854 $ hg record -d '20 0' -mz <<EOF
854 $ hg commit -i -d '20 0' -mz <<EOF
855 855 > y
856 856 > y
857 857 > y
@@ -890,7 +890,7 b' Preserve chmod +x'
890 890 Preserve execute permission on original
891 891
892 892 $ echo b >> f1
893 $ hg record -d '21 0' -maa <<EOF
893 $ hg commit -i -d '21 0' -maa <<EOF
894 894 > y
895 895 > y
896 896 > y
@@ -928,7 +928,7 b' Preserve chmod -x'
928 928
929 929 $ chmod -x f1
930 930 $ echo c >> f1
931 $ hg record -d '22 0' -mab <<EOF
931 $ hg commit -i -d '22 0' -mab <<EOF
932 932 > y
933 933 > y
934 934 > y
@@ -974,7 +974,7 b' Slightly bogus tests to get almost same '
974 974 Mock "Preserve chmod +x"
975 975
976 976 $ echo a >> f1
977 $ hg record -d '20 0' -mz <<EOF
977 $ hg commit -i -d '20 0' -mz <<EOF
978 978 > y
979 979 > y
980 980 > y
@@ -1009,7 +1009,7 b' Mock "Preserve chmod +x"'
1009 1009 Mock "Preserve execute permission on original"
1010 1010
1011 1011 $ echo b >> f1
1012 $ hg record -d '21 0' -maa <<EOF
1012 $ hg commit -i -d '21 0' -maa <<EOF
1013 1013 > y
1014 1014 > y
1015 1015 > y
@@ -1047,7 +1047,7 b' Mock "Preserve chmod -x"'
1047 1047
1048 1048 $ chmod -x f1
1049 1049 $ echo c >> f1
1050 $ hg record -d '22 0' -mab <<EOF
1050 $ hg commit -i -d '22 0' -mab <<EOF
1051 1051 > y
1052 1052 > y
1053 1053 > y
@@ -1107,7 +1107,7 b' Abort early when a merge is in progress'
1107 1107 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1108 1108 (branch merge, don't forget to commit)
1109 1109
1110 $ hg record -m'will abort'
1110 $ hg commit -i -m'will abort'
1111 1111 abort: cannot partially commit a merge (use "hg commit" instead)
1112 1112 [255]
1113 1113
@@ -1133,7 +1133,7 b' Editing patch (and ignoring trailing tex'
1133 1133 > This change will be committed
1134 1134 > This is the third line
1135 1135 > __EOF__
1136 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record -d '23 0' -medit-patch-2 <<EOF
1136 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-2 <<EOF
1137 1137 > y
1138 1138 > e
1139 1139 > EOF
@@ -1162,7 +1162,7 b' Editing patch (and ignoring trailing tex'
1162 1162 Trying to edit patch for whole file
1163 1163
1164 1164 $ echo "This is the fourth line" >> editedfile
1165 $ hg record <<EOF
1165 $ hg commit -i <<EOF
1166 1166 > e
1167 1167 > q
1168 1168 > EOF
@@ -1186,7 +1186,7 b' Removing changes from patch'
1186 1186 > sed -e 's/^[-+]/ /' "$1" > tmp
1187 1187 > mv tmp "$1"
1188 1188 > __EOF__
1189 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF
1189 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
1190 1190 > y
1191 1191 > e
1192 1192 > EOF
@@ -1223,7 +1223,7 b' Invalid patch'
1223 1223 > sed s/This/That/ "$1" > tmp
1224 1224 > mv tmp "$1"
1225 1225 > __EOF__
1226 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF
1226 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
1227 1227 > y
1228 1228 > e
1229 1229 > EOF
@@ -1270,7 +1270,7 b' Malformed patch - error handling'
1270 1270 > sed -e '/^@/p' "$1" > tmp
1271 1271 > mv tmp "$1"
1272 1272 > __EOF__
1273 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF
1273 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
1274 1274 > y
1275 1275 > e
1276 1276 > EOF
@@ -1297,7 +1297,7 b' random text in random positions is still'
1297 1297 > other' "$1" > tmp
1298 1298 > mv tmp "$1"
1299 1299 > __EOF__
1300 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF
1300 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
1301 1301 > y
1302 1302 > e
1303 1303 > EOF
@@ -1337,7 +1337,7 b' Ignore win32text deprecation warning for'
1337 1337 $ echo 'warn = no' >> .hg/hgrc
1338 1338
1339 1339 $ echo d >> subdir/f1
1340 $ hg record -d '24 0' -mw1 <<EOF
1340 $ hg commit -i -d '24 0' -mw1 <<EOF
1341 1341 > y
1342 1342 > y
1343 1343 > EOF
@@ -1374,7 +1374,7 b' Ignore win32text deprecation warning for'
1374 1374 Test --user when ui.username not set
1375 1375 $ unset HGUSER
1376 1376 $ echo e >> subdir/f1
1377 $ hg record --config ui.username= -d '8 0' --user xyz -m "user flag" <<EOF
1377 $ hg commit -i --config ui.username= -d '8 0' --user xyz -m "user flag" <<EOF
1378 1378 > y
1379 1379 > y
1380 1380 > EOF
@@ -1407,7 +1407,7 b' Editing patch of newly added file'
1407 1407 > This is the third line
1408 1408 > __EOF__
1409 1409 $ hg add newfile
1410 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record -d '23 0' -medit-patch-new <<EOF
1410 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-new <<EOF
1411 1411 > y
1412 1412 > e
1413 1413 > EOF
General Comments 0
You need to be logged in to leave comments. Login now