Mercurial > hg-stable

comparison tests/test-rebase-obsolete.t @ 35079:235d58aa723e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: conditionally display obsfate in test-rebase-obsolete log output This helps understanding and debugging.
author Denis Laxalde <denis@laxalde.org>
date Mon, 06 Nov 2017 22:08:02 +0100
parents 852620fe4ca7
children 0564e7c7f4cd
comparison
equal deleted inserted replaced
35078:852620fe4ca7 35079:235d58aa723e
4 4
5 Enable obsolete 5 Enable obsolete
6 6
7 $ cat >> $HGRCPATH << EOF 7 $ cat >> $HGRCPATH << EOF
8 > [ui] 8 > [ui]
9 > logtemplate= {rev}:{node|short} {desc|firstline} 9 > logtemplate= {rev}:{node|short} {desc|firstline}{if(obsolete,' ({obsfate})')}
10 > [experimental] 10 > [experimental]
11 > evolution.createmarkers=True 11 > evolution.createmarkers=True
12 > evolution.allowunstable=True 12 > evolution.allowunstable=True
13 > [phases] 13 > [phases]
14 > publish=False 14 > publish=False
92 |\| 92 |\|
93 | o 5:24b6387c8c8c F 93 | o 5:24b6387c8c8c F
94 | | 94 | |
95 o | 4:9520eea781bc E 95 o | 4:9520eea781bc E
96 |/ 96 |/
97 | x 3:32af7686d403 D 97 | x 3:32af7686d403 D (rewritten using rebase as 10:8eeb3c33ad33)
98 | | 98 | |
99 | x 2:5fddd98957c8 C 99 | x 2:5fddd98957c8 C (rewritten using rebase as 9:2327fea05063)
100 | | 100 | |
101 | x 1:42ccdea3bb16 B 101 | x 1:42ccdea3bb16 B (rewritten using rebase as 8:e4e5be0395b2)
102 |/ 102 |/
103 o 0:cd010b8cd998 A 103 o 0:cd010b8cd998 A
104 104
105 $ hg debugobsolete 105 $ hg debugobsolete
106 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 e4e5be0395b2cbd471ed22a26b1b6a1a0658a794 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 106 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 e4e5be0395b2cbd471ed22a26b1b6a1a0658a794 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
162 |\| 162 |\|
163 | o 5:24b6387c8c8c F 163 | o 5:24b6387c8c8c F
164 | | 164 | |
165 o | 4:9520eea781bc E 165 o | 4:9520eea781bc E
166 |/ 166 |/
167 | x 3:32af7686d403 D 167 | x 3:32af7686d403 D (pruned using rebase)
168 | | 168 | |
169 | x 2:5fddd98957c8 C 169 | x 2:5fddd98957c8 C (rewritten using rebase as 10:5ae4c968c6ac)
170 | | 170 | |
171 | x 1:42ccdea3bb16 B 171 | x 1:42ccdea3bb16 B (pruned using rebase)
172 |/ 172 |/
173 o 0:cd010b8cd998 A 173 o 0:cd010b8cd998 A
174 174
175 $ hg debugobsolete 175 $ hg debugobsolete
176 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} 176 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
190 $ hg log -G 190 $ hg log -G
191 @ 11:4596109a6a43 D 191 @ 11:4596109a6a43 D
192 | 192 |
193 | o 10:5ae4c968c6ac C 193 | o 10:5ae4c968c6ac C
194 | | 194 | |
195 | x 9:08483444fef9 D 195 | x 9:08483444fef9 D (rewritten using rebase as 11:4596109a6a43)
196 | | 196 | |
197 | o 8:8877864f1edb B 197 | o 8:8877864f1edb B
198 | | 198 | |
199 o | 7:02de42196ebe H 199 o | 7:02de42196ebe H
200 | | 200 | |
297 | |/ 297 | |/
298 | o 5:24b6387c8c8c F 298 | o 5:24b6387c8c8c F
299 | | 299 | |
300 o | 4:9520eea781bc E 300 o | 4:9520eea781bc E
301 |/ 301 |/
302 | @ 1:42ccdea3bb16 B 302 | @ 1:42ccdea3bb16 B (pruned using rebase)
303 |/ 303 |/
304 o 0:cd010b8cd998 A 304 o 0:cd010b8cd998 A
305 305
306 306
307 $ cd .. 307 $ cd ..
339 |\| 339 |\|
340 | o 5:24b6387c8c8c F 340 | o 5:24b6387c8c8c F
341 | | 341 | |
342 o | 4:9520eea781bc E 342 o | 4:9520eea781bc E
343 |/ 343 |/
344 | x 3:32af7686d403 D 344 | x 3:32af7686d403 D (rewritten using rebase as 8:4dc2197e807b)
345 | | 345 | |
346 | x 2:5fddd98957c8 C 346 | x 2:5fddd98957c8 C (rewritten using rebase as 8:4dc2197e807b)
347 | | 347 | |
348 | x 1:42ccdea3bb16 B 348 | x 1:42ccdea3bb16 B (rewritten using rebase as 8:4dc2197e807b)
349 |/ 349 |/
350 o 0:cd010b8cd998 A 350 o 0:cd010b8cd998 A
351 351
352 $ hg id --debug -r tip 352 $ hg id --debug -r tip
353 4dc2197e807bae9817f09905b50ab288be2dbbcf tip 353 4dc2197e807bae9817f09905b50ab288be2dbbcf tip
403 |/| 403 |/|
404 o | 5:24b6387c8c8c F 404 o | 5:24b6387c8c8c F
405 | | 405 | |
406 | o 4:9520eea781bc E 406 | o 4:9520eea781bc E
407 |/ 407 |/
408 | x 3:32af7686d403 D 408 | x 3:32af7686d403 D (rewritten using rebase as 9:cf44d2f5a9f4)
409 | | 409 | |
410 | x 2:5fddd98957c8 C 410 | x 2:5fddd98957c8 C (rewritten using rebase as 8:e273c5e7d2d2)
411 | | 411 | |
412 | x 1:42ccdea3bb16 B 412 | x 1:42ccdea3bb16 B (rewritten using rebase as 10:7c6027df6a99)
413 |/ 413 |/
414 o 0:cd010b8cd998 A 414 o 0:cd010b8cd998 A
415 415
416 $ hg debugobsolete 416 $ hg debugobsolete
417 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 417 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
430 | 430 |
431 o 10:7c6027df6a99 B 431 o 10:7c6027df6a99 B
432 | 432 |
433 | o 9:cf44d2f5a9f4 D 433 | o 9:cf44d2f5a9f4 D
434 | | 434 | |
435 | x 8:e273c5e7d2d2 C 435 | x 8:e273c5e7d2d2 C (rewritten using rebase as 11:0d8f238b634c)
436 | | 436 | |
437 @ | 7:02de42196ebe H 437 @ | 7:02de42196ebe H
438 | | 438 | |
439 | o 6:eea13746799a G 439 | o 6:eea13746799a G
440 |/| 440 |/|
460 | 460 |
461 | o 12:102b4c1d889b D 461 | o 12:102b4c1d889b D
462 |/ 462 |/
463 | o 10:7c6027df6a99 B 463 | o 10:7c6027df6a99 B
464 | | 464 | |
465 | x 7:02de42196ebe H 465 | x 7:02de42196ebe H (rewritten using rebase as 13:bfe264faf697)
466 | | 466 | |
467 +---o 6:eea13746799a G 467 +---o 6:eea13746799a G
468 | |/ 468 | |/
469 | o 5:24b6387c8c8c F 469 | o 5:24b6387c8c8c F
470 | | 470 | |
554 | 554 |
555 | o 10:b5313c85b22e D 555 | o 10:b5313c85b22e D
556 |/ 556 |/
557 | o 8:53a6a128b2b7 M 557 | o 8:53a6a128b2b7 M
558 | |\ 558 | |\
559 | | x 7:02de42196ebe H 559 | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
560 | | | 560 | | |
561 o---+ 6:eea13746799a G 561 o---+ 6:eea13746799a G
562 | | | 562 | | |
563 | | o 5:24b6387c8c8c F 563 | | o 5:24b6387c8c8c F
564 | | | 564 | | |
565 o---+ 4:9520eea781bc E 565 o---+ 4:9520eea781bc E
566 / / 566 / /
567 x | 3:32af7686d403 D 567 x | 3:32af7686d403 D (rewritten using rebase as 10:b5313c85b22e)
568 | | 568 | |
569 o | 2:5fddd98957c8 C 569 o | 2:5fddd98957c8 C
570 | | 570 | |
571 o | 1:42ccdea3bb16 B 571 o | 1:42ccdea3bb16 B
572 |/ 572 |/
597 | | 597 | |
598 o | 10:b5313c85b22e D 598 o | 10:b5313c85b22e D
599 |/ 599 |/
600 | o 8:53a6a128b2b7 M 600 | o 8:53a6a128b2b7 M
601 | |\ 601 | |\
602 | | x 7:02de42196ebe H 602 | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
603 | | | 603 | | |
604 o---+ 6:eea13746799a G 604 o---+ 6:eea13746799a G
605 | | | 605 | | |
606 | | o 5:24b6387c8c8c F 606 | | o 5:24b6387c8c8c F
607 | | | 607 | | |
608 o---+ 4:9520eea781bc E 608 o---+ 4:9520eea781bc E
609 / / 609 / /
610 x | 3:32af7686d403 D 610 x | 3:32af7686d403 D (rewritten using rebase as 10:b5313c85b22e)
611 | | 611 | |
612 o | 2:5fddd98957c8 C 612 o | 2:5fddd98957c8 C
613 | | 613 | |
614 o | 1:42ccdea3bb16 B 614 o | 1:42ccdea3bb16 B
615 |/ 615 |/
631 $ hg log -G 631 $ hg log -G
632 @ 18:bfaedf8eb73b M 632 @ 18:bfaedf8eb73b M
633 | 633 |
634 | o 17:97219452e4bd L 634 | o 17:97219452e4bd L
635 | | 635 | |
636 | x 16:fc37a630c901 K 636 | x 16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b)
637 |/ 637 |/
638 | o 15:5ae8a643467b J 638 | o 15:5ae8a643467b J
639 | | 639 | |
640 | x 14:9ad579b4a5de I 640 | x 14:9ad579b4a5de I (rewritten using amend as 16:fc37a630c901)
641 |/ 641 |/
642 | o 12:acd174b7ab39 I 642 | o 12:acd174b7ab39 I
643 | | 643 | |
644 | o 11:6c11a6218c97 H 644 | o 11:6c11a6218c97 H
645 | | 645 | |
646 o | 10:b5313c85b22e D 646 o | 10:b5313c85b22e D
647 |/ 647 |/
648 | o 8:53a6a128b2b7 M 648 | o 8:53a6a128b2b7 M
649 | |\ 649 | |\
650 | | x 7:02de42196ebe H 650 | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
651 | | | 651 | | |
652 o---+ 6:eea13746799a G 652 o---+ 6:eea13746799a G
653 | | | 653 | | |
654 | | o 5:24b6387c8c8c F 654 | | o 5:24b6387c8c8c F
655 | | | 655 | | |
656 o---+ 4:9520eea781bc E 656 o---+ 4:9520eea781bc E
657 / / 657 / /
658 x | 3:32af7686d403 D 658 x | 3:32af7686d403 D (rewritten using rebase as 10:b5313c85b22e)
659 | | 659 | |
660 o | 2:5fddd98957c8 C 660 o | 2:5fddd98957c8 C
661 | | 661 | |
662 o | 1:42ccdea3bb16 B 662 o | 1:42ccdea3bb16 B
663 |/ 663 |/
804 | 804 |
805 | o 13:77d874d096a2 10' 805 | o 13:77d874d096a2 10'
806 | | 806 | |
807 | | o 12:3eb461388009 john doe 807 | | o 12:3eb461388009 john doe
808 | |/ 808 | |/
809 x | 10:121d9e3bc4c6 P 809 x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2)
810 |/ 810 |/
811 o 9:4be60e099a77 C 811 o 9:4be60e099a77 C
812 | 812 |
813 o 6:9c48361117de D 813 o 6:9c48361117de D
814 | 814 |
833 | 833 |
834 | o 13:77d874d096a2 10' 834 | o 13:77d874d096a2 10'
835 | | 835 | |
836 | | o 12:3eb461388009 john doe 836 | | o 12:3eb461388009 john doe
837 | |/ 837 | |/
838 x | 10:121d9e3bc4c6 P 838 x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2)
839 |/ 839 |/
840 o 9:4be60e099a77 C 840 o 9:4be60e099a77 C
841 | 841 |
842 o 6:9c48361117de D 842 o 6:9c48361117de D
843 | 843 |
891 obsoleted 1 changesets 891 obsoleted 1 changesets
892 892
893 $ hg log -G -r 16:: 893 $ hg log -G -r 16::
894 @ 21:7bdc8a87673d dummy change 894 @ 21:7bdc8a87673d dummy change
895 | 895 |
896 x 20:8b31da3c4919 dummy change 896 x 20:8b31da3c4919 dummy change (rewritten as 18:601db7a18f51)
897 | 897 |
898 o 19:b82fb57ea638 willconflict second version 898 o 19:b82fb57ea638 willconflict second version
899 | 899 |
900 | o 18:601db7a18f51 dummy change successor 900 | o 18:601db7a18f51 dummy change successor
901 | | 901 | |
937 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B) 937 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
938 rebasing 4:66f1a38021c9 "F" (F tip) 938 rebasing 4:66f1a38021c9 "F" (F tip)
939 $ hg log -G 939 $ hg log -G
940 o 5:50e9d60b99c6 F 940 o 5:50e9d60b99c6 F
941 |\ 941 |\
942 | | x 4:66f1a38021c9 F 942 | | x 4:66f1a38021c9 F (rewritten using rebase as 5:50e9d60b99c6)
943 | |/| 943 | |/|
944 | o | 3:7fb047a69f22 E 944 | o | 3:7fb047a69f22 E
945 | | | 945 | | |
946 | | x 2:b18e25de2cf5 D 946 | | x 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961)
947 | |/ 947 | |/
948 o | 1:112478962961 B 948 o | 1:112478962961 B
949 |/ 949 |/
950 o 0:426bada5c675 A 950 o 0:426bada5c675 A
951 951
968 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B) 968 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
969 rebasing 4:66f1a38021c9 "F" (F tip) 969 rebasing 4:66f1a38021c9 "F" (F tip)
970 $ hg log -G 970 $ hg log -G
971 o 5:aae1787dacee F 971 o 5:aae1787dacee F
972 |\ 972 |\
973 | | x 4:66f1a38021c9 F 973 | | x 4:66f1a38021c9 F (rewritten using rebase as 5:aae1787dacee)
974 | |/| 974 | |/|
975 | | x 3:7fb047a69f22 E 975 | | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961)
976 | | | 976 | | |
977 | o | 2:b18e25de2cf5 D 977 | o | 2:b18e25de2cf5 D
978 | |/ 978 | |/
979 o / 1:112478962961 B 979 o / 1:112478962961 B
980 |/ 980 |/
1000 rebasing 5:66f1a38021c9 "F" (F tip) 1000 rebasing 5:66f1a38021c9 "F" (F tip)
1001 1001
1002 $ hg log -G 1002 $ hg log -G
1003 o 6:0913febf6439 F 1003 o 6:0913febf6439 F
1004 |\ 1004 |\
1005 +---x 5:66f1a38021c9 F 1005 +---x 5:66f1a38021c9 F (rewritten using rebase as 6:0913febf6439)
1006 | | | 1006 | | |
1007 | o | 4:26805aba1e60 C 1007 | o | 4:26805aba1e60 C
1008 | | | 1008 | | |
1009 o | | 3:7fb047a69f22 E 1009 o | | 3:7fb047a69f22 E
1010 | | | 1010 | | |
1011 +---x 2:b18e25de2cf5 D 1011 +---x 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961)
1012 | | 1012 | |
1013 | o 1:112478962961 B 1013 | o 1:112478962961 B
1014 |/ 1014 |/
1015 o 0:426bada5c675 A 1015 o 0:426bada5c675 A
1016 1016
1033 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B) 1033 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
1034 rebasing 5:66f1a38021c9 "F" (F tip) 1034 rebasing 5:66f1a38021c9 "F" (F tip)
1035 $ hg log -G 1035 $ hg log -G
1036 o 6:c6ab0cc6d220 F 1036 o 6:c6ab0cc6d220 F
1037 |\ 1037 |\
1038 +---x 5:66f1a38021c9 F 1038 +---x 5:66f1a38021c9 F (rewritten using rebase as 6:c6ab0cc6d220)
1039 | | | 1039 | | |
1040 | o | 4:26805aba1e60 C 1040 | o | 4:26805aba1e60 C
1041 | | | 1041 | | |
1042 | | x 3:7fb047a69f22 E 1042 | | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961)
1043 | | | 1043 | | |
1044 o---+ 2:b18e25de2cf5 D 1044 o---+ 2:b18e25de2cf5 D
1045 / / 1045 / /
1046 o / 1:112478962961 B 1046 o / 1:112478962961 B
1047 |/ 1047 |/
1068 rebasing 5:66f1a38021c9 "F" (F tip) 1068 rebasing 5:66f1a38021c9 "F" (F tip)
1069 note: rebase of 5:66f1a38021c9 created no changes to commit 1069 note: rebase of 5:66f1a38021c9 created no changes to commit
1070 $ hg log -G 1070 $ hg log -G
1071 o 6:8f47515dda15 D 1071 o 6:8f47515dda15 D
1072 | 1072 |
1073 | x 5:66f1a38021c9 F 1073 | x 5:66f1a38021c9 F (pruned using rebase)
1074 | |\ 1074 | |\
1075 o | | 4:26805aba1e60 C 1075 o | | 4:26805aba1e60 C
1076 | | | 1076 | | |
1077 | | x 3:7fb047a69f22 E 1077 | | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961)
1078 | | | 1078 | | |
1079 | x | 2:b18e25de2cf5 D 1079 | x | 2:b18e25de2cf5 D (rewritten using rebase as 6:8f47515dda15)
1080 | |/ 1080 | |/
1081 o / 1:112478962961 B 1081 o / 1:112478962961 B
1082 |/ 1082 |/
1083 o 0:426bada5c675 A 1083 o 0:426bada5c675 A
1084 1084
1104 note: rebase of 5:66f1a38021c9 created no changes to commit 1104 note: rebase of 5:66f1a38021c9 created no changes to commit
1105 1105
1106 $ hg log -G 1106 $ hg log -G
1107 o 6:533690786a86 E 1107 o 6:533690786a86 E
1108 | 1108 |
1109 | x 5:66f1a38021c9 F 1109 | x 5:66f1a38021c9 F (pruned using rebase)
1110 | |\ 1110 | |\
1111 o | | 4:26805aba1e60 C 1111 o | | 4:26805aba1e60 C
1112 | | | 1112 | | |
1113 | | x 3:7fb047a69f22 E 1113 | | x 3:7fb047a69f22 E (rewritten using rebase as 6:533690786a86)
1114 | | | 1114 | | |
1115 | x | 2:b18e25de2cf5 D 1115 | x | 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961)
1116 | |/ 1116 | |/
1117 o / 1:112478962961 B 1117 o / 1:112478962961 B
1118 |/ 1118 |/
1119 o 0:426bada5c675 A 1119 o 0:426bada5c675 A
1120 1120
1222 $ hg log -r . # working dir is at rev 3 (successor of 2) 1222 $ hg log -r . # working dir is at rev 3 (successor of 2)
1223 3:be1832deae9a b (no-eol) 1223 3:be1832deae9a b (no-eol)
1224 $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now 1224 $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now
1225 $ hg up 2 && hg log -r . # working dir is at rev 2 again 1225 $ hg up 2 && hg log -r . # working dir is at rev 2 again
1226 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1226 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1227 2:1e9a3c00cbe9 b (no-eol) 1227 2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol)
1228 $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 1228 $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1
1229 note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) 1229 note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip)
1230 Check that working directory and bookmark was updated to rev 3 although rev 2 1230 Check that working directory and bookmark was updated to rev 3 although rev 2
1231 was skipped 1231 was skipped
1232 $ hg log -r . 1232 $ hg log -r .
1336 $ cp -R . $TESTTMP/hidden-state2 1336 $ cp -R . $TESTTMP/hidden-state2
1337 1337
1338 $ hg log -G 1338 $ hg log -G
1339 @ 2:b18e25de2cf5 D 1339 @ 2:b18e25de2cf5 D
1340 | 1340 |
1341 | @ 1:2ec65233581b B 1341 | @ 1:2ec65233581b B (pruned using prune)
1342 |/ 1342 |/
1343 o 0:426bada5c675 A 1343 o 0:426bada5c675 A
1344 1344
1345 $ hg summary 1345 $ hg summary
1346 parent: 2:b18e25de2cf5 tip 1346 parent: 2:b18e25de2cf5 tip