comparison tests/test-split.t @ 4712:e2c548cc83b5

tests: update output for shorted prompts from Mercurial This makes tests pass again after Mercurial commits f802a75da585 (patch: use a short, fixed-size message for last line of prompt (issue6158), 2019-06-20). CORE-TEST-OUTPUT-UPDATE: f802a75da585
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 09 Jul 2019 21:49:37 -0700
parents 30a544904238
children ff452675566c 1896d6bc574b
comparison
equal deleted inserted replaced
4711:88c8ef4d703c 4712:e2c548cc83b5
66 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 66 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
67 reverting _a 67 reverting _a
68 adding _d 68 adding _d
69 diff --git a/_a b/_a 69 diff --git a/_a b/_a
70 1 hunks, 1 lines changed 70 1 hunks, 1 lines changed
71 examine changes to '_a'? [Ynesfdaq?] y 71 examine changes to '_a'?
72 (enter ? for help) [Ynesfdaq?] y
72 73
73 @@ -1,0 +2,1 @@ 74 @@ -1,0 +2,1 @@
74 +change to a 75 +change to a
75 record change 1/2 to '_a'? [Ynesfdaq?] y 76 record change 1/2 to '_a'?
77 (enter ? for help) [Ynesfdaq?] y
76 78
77 diff --git a/_d b/_d 79 diff --git a/_d b/_d
78 new file mode 100644 80 new file mode 100644
79 examine changes to '_d'? [Ynesfdaq?] y 81 examine changes to '_d'?
82 (enter ? for help) [Ynesfdaq?] y
80 83
81 @@ -0,0 +1,1 @@ 84 @@ -0,0 +1,1 @@
82 +_d 85 +_d
83 record change 2/2 to '_d'? [Ynesfdaq?] n 86 record change 2/2 to '_d'?
87 (enter ? for help) [Ynesfdaq?] n
84 88
85 created new head 89 created new head
86 continue splitting? [Ycdq?] Y 90 continue splitting? [Ycdq?] Y
87 diff --git a/_d b/_d 91 diff --git a/_d b/_d
88 new file mode 100644 92 new file mode 100644
89 examine changes to '_d'? [Ynesfdaq?] y 93 examine changes to '_d'?
94 (enter ? for help) [Ynesfdaq?] y
90 95
91 @@ -0,0 +1,1 @@ 96 @@ -0,0 +1,1 @@
92 +_d 97 +_d
93 record this change to '_d'? [Ynesfdaq?] y 98 record this change to '_d'?
99 (enter ? for help) [Ynesfdaq?] y
94 100
95 no more change to split 101 no more change to split
96 102
97 $ hg debugobsolete 103 $ hg debugobsolete
98 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 104 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
188 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 194 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
189 reverting _b 195 reverting _b
190 adding _c 196 adding _c
191 diff --git a/_b b/_b 197 diff --git a/_b b/_b
192 1 hunks, 1 lines changed 198 1 hunks, 1 lines changed
193 examine changes to '_b'? [Ynesfdaq?] y 199 examine changes to '_b'?
200 (enter ? for help) [Ynesfdaq?] y
194 201
195 @@ -1,0 +2,1 @@ 202 @@ -1,0 +2,1 @@
196 +change to b 203 +change to b
197 record change 1/2 to '_b'? [Ynesfdaq?] y 204 record change 1/2 to '_b'?
205 (enter ? for help) [Ynesfdaq?] y
198 206
199 diff --git a/_c b/_c 207 diff --git a/_c b/_c
200 new file mode 100644 208 new file mode 100644
201 examine changes to '_c'? [Ynesfdaq?] y 209 examine changes to '_c'?
210 (enter ? for help) [Ynesfdaq?] y
202 211
203 @@ -0,0 +1,1 @@ 212 @@ -0,0 +1,1 @@
204 +_c 213 +_c
205 record change 2/2 to '_c'? [Ynesfdaq?] n 214 record change 2/2 to '_c'?
215 (enter ? for help) [Ynesfdaq?] n
206 216
207 created new head 217 created new head
208 continue splitting? [Ycdq?] c 218 continue splitting? [Ycdq?] c
209 2 new orphan changesets 219 2 new orphan changesets
210 220
291 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 301 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
292 reverting _a 302 reverting _a
293 adding _d 303 adding _d
294 diff --git a/_a b/_a 304 diff --git a/_a b/_a
295 1 hunks, 2 lines changed 305 1 hunks, 2 lines changed
296 examine changes to '_a'? [Ynesfdaq?] y 306 examine changes to '_a'?
307 (enter ? for help) [Ynesfdaq?] y
297 308
298 @@ -1,2 +1,1 @@ 309 @@ -1,2 +1,1 @@
299 -_a 310 -_a
300 -change to a 311 -change to a
301 +changetofilea 312 +changetofilea
302 record change 1/2 to '_a'? [Ynesfdaq?] y 313 record change 1/2 to '_a'?
314 (enter ? for help) [Ynesfdaq?] y
303 315
304 diff --git a/_d b/_d 316 diff --git a/_d b/_d
305 new file mode 100644 317 new file mode 100644
306 examine changes to '_d'? [Ynesfdaq?] n 318 examine changes to '_d'?
319 (enter ? for help) [Ynesfdaq?] n
307 320
308 created new head 321 created new head
309 continue splitting? [Ycdq?] c 322 continue splitting? [Ycdq?] c
310 $ hg log -G -r "3f134f739075::" 323 $ hg log -G -r "3f134f739075::"
311 @ changeset: 16:452a26648478 324 @ changeset: 16:452a26648478
336 (leaving bookmark bookB) 349 (leaving bookmark bookB)
337 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 350 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
338 adding _d 351 adding _d
339 diff --git a/_d b/_d 352 diff --git a/_d b/_d
340 new file mode 100644 353 new file mode 100644
341 examine changes to '_d'? [Ynesfdaq?] abort: response expected 354 examine changes to '_d'?
355 (enter ? for help) [Ynesfdaq?] abort: response expected
342 [255] 356 [255]
343 357
344 Cannot split a commit that is not a head if instability is not allowed 358 Cannot split a commit that is not a head if instability is not allowed
345 $ cat >> $HGRCPATH <<EOF 359 $ cat >> $HGRCPATH <<EOF
346 > [experimental] 360 > [experimental]
362 > EOF 376 > EOF
363 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 377 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
364 adding _d 378 adding _d
365 diff --git a/_d b/_d 379 diff --git a/_d b/_d
366 new file mode 100644 380 new file mode 100644
367 examine changes to '_d'? [Ynesfdaq?] q 381 examine changes to '_d'?
382 (enter ? for help) [Ynesfdaq?] q
368 383
369 abort: user quit 384 abort: user quit
370 [255] 385 [255]
371 386
372 Running split with tip revision, specified as unnamed argument 387 Running split with tip revision, specified as unnamed argument
375 > EOF 390 > EOF
376 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 391 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
377 adding _d 392 adding _d
378 diff --git a/_d b/_d 393 diff --git a/_d b/_d
379 new file mode 100644 394 new file mode 100644
380 examine changes to '_d'? [Ynesfdaq?] q 395 examine changes to '_d'?
396 (enter ? for help) [Ynesfdaq?] q
381 397
382 abort: user quit 398 abort: user quit
383 [255] 399 [255]
384 400
385 Running split with both unnamed and named revision arguments shows an error msg 401 Running split with both unnamed and named revision arguments shows an error msg
445 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 461 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
446 adding babar 462 adding babar
447 adding celeste 463 adding celeste
448 diff --git a/babar b/babar 464 diff --git a/babar b/babar
449 new file mode 100644 465 new file mode 100644
450 examine changes to 'babar'? [Ynesfdaq?] Y 466 examine changes to 'babar'?
467 (enter ? for help) [Ynesfdaq?] Y
451 468
452 @@ -0,0 +1,1 @@ 469 @@ -0,0 +1,1 @@
453 +babar 470 +babar
454 record change 1/2 to 'babar'? [Ynesfdaq?] Y 471 record change 1/2 to 'babar'?
472 (enter ? for help) [Ynesfdaq?] Y
455 473
456 diff --git a/celeste b/celeste 474 diff --git a/celeste b/celeste
457 new file mode 100644 475 new file mode 100644
458 examine changes to 'celeste'? [Ynesfdaq?] N 476 examine changes to 'celeste'?
477 (enter ? for help) [Ynesfdaq?] N
459 478
460 continue splitting? [Ycdq?] c 479 continue splitting? [Ycdq?] c
461 480
462 Check that the topic is still here 481 Check that the topic is still here
463 482
537 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 556 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
538 adding SPLIT1 557 adding SPLIT1
539 adding SPLIT2 558 adding SPLIT2
540 diff --git a/SPLIT1 b/SPLIT1 559 diff --git a/SPLIT1 b/SPLIT1
541 new file mode 100644 560 new file mode 100644
542 examine changes to 'SPLIT1'? [Ynesfdaq?] Y 561 examine changes to 'SPLIT1'?
562 (enter ? for help) [Ynesfdaq?] Y
543 563
544 diff --git a/SPLIT2 b/SPLIT2 564 diff --git a/SPLIT2 b/SPLIT2
545 new file mode 100644 565 new file mode 100644
546 examine changes to 'SPLIT2'? [Ynesfdaq?] N 566 examine changes to 'SPLIT2'?
567 (enter ? for help) [Ynesfdaq?] N
547 568
548 continue splitting? [Ycdq?] Y 569 continue splitting? [Ycdq?] Y
549 diff --git a/SPLIT2 b/SPLIT2 570 diff --git a/SPLIT2 b/SPLIT2
550 new file mode 100644 571 new file mode 100644
551 examine changes to 'SPLIT2'? [Ynesfdaq?] Y 572 examine changes to 'SPLIT2'?
573 (enter ? for help) [Ynesfdaq?] Y
552 574
553 no more change to split 575 no more change to split
554 576
555 The split changesets should be on the 'another-branch' 577 The split changesets should be on the 'another-branch'
556 $ hg log -G -l 3 578 $ hg log -G -l 3
615 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 637 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
616 adding SPLIT3 638 adding SPLIT3
617 adding SPLIT4 639 adding SPLIT4
618 diff --git a/SPLIT3 b/SPLIT3 640 diff --git a/SPLIT3 b/SPLIT3
619 new file mode 100644 641 new file mode 100644
620 examine changes to 'SPLIT3'? [Ynesfdaq?] Y 642 examine changes to 'SPLIT3'?
643 (enter ? for help) [Ynesfdaq?] Y
621 644
622 diff --git a/SPLIT4 b/SPLIT4 645 diff --git a/SPLIT4 b/SPLIT4
623 new file mode 100644 646 new file mode 100644
624 examine changes to 'SPLIT4'? [Ynesfdaq?] q 647 examine changes to 'SPLIT4'?
648 (enter ? for help) [Ynesfdaq?] q
625 649
626 abort: user quit 650 abort: user quit
627 [255] 651 [255]
628 652
629 $ hg branch 653 $ hg branch
661 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 685 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
662 adding SPLIT3 686 adding SPLIT3
663 adding SPLIT4 687 adding SPLIT4
664 diff --git a/SPLIT3 b/SPLIT3 688 diff --git a/SPLIT3 b/SPLIT3
665 new file mode 100644 689 new file mode 100644
666 examine changes to 'SPLIT3'? [Ynesfdaq?] Y 690 examine changes to 'SPLIT3'?
691 (enter ? for help) [Ynesfdaq?] Y
667 692
668 diff --git a/SPLIT4 b/SPLIT4 693 diff --git a/SPLIT4 b/SPLIT4
669 new file mode 100644 694 new file mode 100644
670 examine changes to 'SPLIT4'? [Ynesfdaq?] ? 695 examine changes to 'SPLIT4'?
696 (enter ? for help) [Ynesfdaq?] ?
671 697
672 y - yes, record this change 698 y - yes, record this change
673 n - no, skip this change 699 n - no, skip this change
674 e - edit this change manually 700 e - edit this change manually
675 s - skip remaining changes to this file 701 s - skip remaining changes to this file
676 f - record remaining changes to this file 702 f - record remaining changes to this file
677 d - done, skip remaining changes and files 703 d - done, skip remaining changes and files
678 a - record all changes to all remaining files 704 a - record all changes to all remaining files
679 q - quit, recording no changes 705 q - quit, recording no changes
680 ? - ? (display help) 706 ? - ? (display help)
681 examine changes to 'SPLIT4'? [Ynesfdaq?] d 707 examine changes to 'SPLIT4'?
708 (enter ? for help) [Ynesfdaq?] d
682 709
683 continue splitting? [Ycdq?] ? 710 continue splitting? [Ycdq?] ?
684 y - yes, continue selection 711 y - yes, continue selection
685 c - commit, select all remaining changes 712 c - commit, select all remaining changes
686 d - discard, discard remaining changes 713 d - discard, discard remaining changes
739 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 766 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
740 adding SPLIT2 767 adding SPLIT2
741 adding SPLIT3 768 adding SPLIT3
742 diff --git a/SPLIT2 b/SPLIT2 769 diff --git a/SPLIT2 b/SPLIT2
743 new file mode 100644 770 new file mode 100644
744 examine changes to 'SPLIT2'? [Ynesfdaq?] Y 771 examine changes to 'SPLIT2'?
772 (enter ? for help) [Ynesfdaq?] Y
745 773
746 diff --git a/SPLIT3 b/SPLIT3 774 diff --git a/SPLIT3 b/SPLIT3
747 new file mode 100644 775 new file mode 100644
748 examine changes to 'SPLIT3'? [Ynesfdaq?] d 776 examine changes to 'SPLIT3'?
777 (enter ? for help) [Ynesfdaq?] d
749 778
750 continue splitting? [Ycdq?] d 779 continue splitting? [Ycdq?] d
751 discarding remaining changes 780 discarding remaining changes
752 forgetting SPLIT3 781 forgetting SPLIT3
753 $ hg export 782 $ hg export
799 adding SPLIT4 828 adding SPLIT4
800 diff --git a/SPLIT2 b/SPLIT2 829 diff --git a/SPLIT2 b/SPLIT2
801 new file mode 100644 830 new file mode 100644
802 @@ -0,0 +1,1 @@ 831 @@ -0,0 +1,1 @@
803 +sp2 832 +sp2
804 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y 833 record change 1/2 to 'SPLIT2'?
834 (enter ? for help) [Ynesfdaq?] y
805 835
806 diff --git a/SPLIT3 b/SPLIT3 836 diff --git a/SPLIT3 b/SPLIT3
807 new file mode 100644 837 new file mode 100644
808 @@ -0,0 +1,1 @@ 838 @@ -0,0 +1,1 @@
809 +sp3 839 +sp3
810 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s 840 record change 2/2 to 'SPLIT3'?
841 (enter ? for help) [Ynesfdaq?] s
811 842
812 continue splitting? [Ycdq?] c 843 continue splitting? [Ycdq?] c
813 844
814 $ hg status --change '.~1' 845 $ hg status --change '.~1'
815 A SPLIT2 846 A SPLIT2
834 adding SPLIT4 865 adding SPLIT4
835 diff --git a/SPLIT2 b/SPLIT2 866 diff --git a/SPLIT2 b/SPLIT2
836 new file mode 100644 867 new file mode 100644
837 @@ -0,0 +1,1 @@ 868 @@ -0,0 +1,1 @@
838 +sp2 869 +sp2
839 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y 870 record change 1/2 to 'SPLIT2'?
871 (enter ? for help) [Ynesfdaq?] y
840 872
841 diff --git a/SPLIT3 b/SPLIT3 873 diff --git a/SPLIT3 b/SPLIT3
842 new file mode 100644 874 new file mode 100644
843 @@ -0,0 +1,1 @@ 875 @@ -0,0 +1,1 @@
844 +sp3 876 +sp3
845 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s 877 record change 2/2 to 'SPLIT3'?
878 (enter ? for help) [Ynesfdaq?] s
846 879
847 continue splitting? [Ycdq?] y 880 continue splitting? [Ycdq?] y
848 diff --git a/SPLIT3 b/SPLIT3 881 diff --git a/SPLIT3 b/SPLIT3
849 new file mode 100644 882 new file mode 100644
850 @@ -0,0 +1,1 @@ 883 @@ -0,0 +1,1 @@
851 +sp3 884 +sp3
852 record this change to 'SPLIT3'? [Ynesfdaq?] y 885 record this change to 'SPLIT3'?
886 (enter ? for help) [Ynesfdaq?] y
853 887
854 no more change to split 888 no more change to split
855 889
856 $ hg status --change '.~2' 890 $ hg status --change '.~2'
857 A SPLIT2 891 A SPLIT2
875 adding SPLIT4 909 adding SPLIT4
876 diff --git a/SPLIT2 b/SPLIT2 910 diff --git a/SPLIT2 b/SPLIT2
877 new file mode 100644 911 new file mode 100644
878 @@ -0,0 +1,1 @@ 912 @@ -0,0 +1,1 @@
879 +sp2 913 +sp2
880 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y 914 record change 1/2 to 'SPLIT2'?
915 (enter ? for help) [Ynesfdaq?] y
881 916
882 diff --git a/SPLIT3 b/SPLIT3 917 diff --git a/SPLIT3 b/SPLIT3
883 new file mode 100644 918 new file mode 100644
884 @@ -0,0 +1,1 @@ 919 @@ -0,0 +1,1 @@
885 +sp3 920 +sp3
886 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y 921 record change 2/2 to 'SPLIT3'?
922 (enter ? for help) [Ynesfdaq?] y
887 923
888 no more change to split 924 no more change to split
889 $ hg status --change '.~1' 925 $ hg status --change '.~1'
890 A SPLIT2 926 A SPLIT2
891 A SPLIT3 927 A SPLIT3
908 adding SPLIT4 944 adding SPLIT4
909 diff --git a/SPLIT2 b/SPLIT2 945 diff --git a/SPLIT2 b/SPLIT2
910 new file mode 100644 946 new file mode 100644
911 @@ -0,0 +1,1 @@ 947 @@ -0,0 +1,1 @@
912 +sp2 948 +sp2
913 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y 949 record change 1/2 to 'SPLIT2'?
950 (enter ? for help) [Ynesfdaq?] y
914 951
915 diff --git a/SPLIT3 b/SPLIT3 952 diff --git a/SPLIT3 b/SPLIT3
916 new file mode 100644 953 new file mode 100644
917 @@ -0,0 +1,1 @@ 954 @@ -0,0 +1,1 @@
918 +sp3 955 +sp3
919 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s 956 record change 2/2 to 'SPLIT3'?
957 (enter ? for help) [Ynesfdaq?] s
920 958
921 continue splitting? [Ycdq?] d 959 continue splitting? [Ycdq?] d
922 discarding remaining changes 960 discarding remaining changes
923 no more change to split 961 no more change to split
924 $ hg status --change '.~1' 962 $ hg status --change '.~1'
1056 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 1094 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
1057 adding a 1095 adding a
1058 adding b 1096 adding b
1059 diff --git a/a b/a 1097 diff --git a/a b/a
1060 new file mode 100644 1098 new file mode 100644
1061 examine changes to 'a'? [Ynesfdaq?] y 1099 examine changes to 'a'?
1100 (enter ? for help) [Ynesfdaq?] y
1062 1101
1063 @@ -0,0 +1,1 @@ 1102 @@ -0,0 +1,1 @@
1064 +a 1103 +a
1065 record change 1/2 to 'a'? [Ynesfdaq?] y 1104 record change 1/2 to 'a'?
1105 (enter ? for help) [Ynesfdaq?] y
1066 1106
1067 diff --git a/b b/b 1107 diff --git a/b b/b
1068 new file mode 100644 1108 new file mode 100644
1069 examine changes to 'b'? [Ynesfdaq?] n 1109 examine changes to 'b'?
1110 (enter ? for help) [Ynesfdaq?] n
1070 1111
1071 created new head 1112 created new head
1072 (consider using topic for lightweight branches. See 'hg help topic') 1113 (consider using topic for lightweight branches. See 'hg help topic')
1073 continue splitting? [Ycdq?] y 1114 continue splitting? [Ycdq?] y
1074 diff --git a/b b/b 1115 diff --git a/b b/b
1075 new file mode 100644 1116 new file mode 100644
1076 examine changes to 'b'? [Ynesfdaq?] y 1117 examine changes to 'b'?
1118 (enter ? for help) [Ynesfdaq?] y
1077 1119
1078 @@ -0,0 +1,1 @@ 1120 @@ -0,0 +1,1 @@
1079 +b 1121 +b
1080 record this change to 'b'? [Ynesfdaq?] y 1122 record this change to 'b'?
1123 (enter ? for help) [Ynesfdaq?] y
1081 1124
1082 no more change to split 1125 no more change to split
1083 1 new orphan changesets 1126 1 new orphan changesets
1084 1127
1085 $ hg glog -p 1128 $ hg glog -p
1198 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 1241 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1199 adding b 1242 adding b
1200 adding c 1243 adding c
1201 diff --git a/b b/b 1244 diff --git a/b b/b
1202 new file mode 100644 1245 new file mode 100644
1203 examine changes to 'b'? [Ynesfdaq?] y 1246 examine changes to 'b'?
1247 (enter ? for help) [Ynesfdaq?] y
1204 1248
1205 @@ -0,0 +1,1 @@ 1249 @@ -0,0 +1,1 @@
1206 +b 1250 +b
1207 record change 1/2 to 'b'? [Ynesfdaq?] y 1251 record change 1/2 to 'b'?
1252 (enter ? for help) [Ynesfdaq?] y
1208 1253
1209 diff --git a/c b/c 1254 diff --git a/c b/c
1210 new file mode 100644 1255 new file mode 100644
1211 examine changes to 'c'? [Ynesfdaq?] n 1256 examine changes to 'c'?
1257 (enter ? for help) [Ynesfdaq?] n
1212 1258
1213 created new head 1259 created new head
1214 (consider using topic for lightweight branches. See 'hg help topic') 1260 (consider using topic for lightweight branches. See 'hg help topic')
1215 continue splitting? [Ycdq?] c 1261 continue splitting? [Ycdq?] c
1216 1262