Mercurial > evolve

comparison tests/test-evolve-obshistory.t @ 2585:b5e3fe610beb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
effectflag: activate effect flag on test-evolve-obshistory test file Prepare activation of effect flag by default by activating it on test-evolve- obshistory.t test file first.
author Boris Feld <boris.feld@octobus.net>
date Fri, 02 Jun 2017 19:08:50 +0200
parents abe6dfbdc744
children 54ac473663ff 49f2741c4dd7
comparison
equal deleted inserted replaced
2584:325f7a2e87e2 2585:b5e3fe610beb
10 > interactive = true 10 > interactive = true
11 > [phases] 11 > [phases]
12 > publish=False 12 > publish=False
13 > [extensions] 13 > [extensions]
14 > evolve = 14 > evolve =
15 > [experimental]
16 > evolution.effect-flags = yes
15 > EOF 17 > EOF
16 18
17 Test output on amended commit 19 Test output on amended commit
18 ============================= 20 =============================
19 21
55 ----------- 57 -----------
56 $ hg obslog 4ae3a4151de9 58 $ hg obslog 4ae3a4151de9
57 @ 4ae3a4151de9 (3) A1 59 @ 4ae3a4151de9 (3) A1
58 | 60 |
59 x 471f378eab4c (1) A0 61 x 471f378eab4c (1) A0
60 rewritten by test (*) as 4ae3a4151de9 (glob) 62 rewritten(description, content) by test (*) as 4ae3a4151de9 (glob)
61 63
62 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool 64 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
63 [ 65 [
64 { 66 {
65 "debugobshistory.markers": [], 67 "debugobshistory.markers": [],
68 "debugobshistory.shortdescription": "A1" 70 "debugobshistory.shortdescription": "A1"
69 }, 71 },
70 { 72 {
71 "debugobshistory.markers": [ 73 "debugobshistory.markers": [
72 { 74 {
75 "debugobshistory.effect": [
76 "description",
77 "content"
78 ],
73 "debugobshistory.marker_date": [ 79 "debugobshistory.marker_date": [
74 *, (glob) 80 *, (glob)
75 0 (glob) 81 0 (glob)
76 ], 82 ],
77 "debugobshistory.marker_user": "test", 83 "debugobshistory.marker_user": "test",
86 "debugobshistory.shortdescription": "A0" 92 "debugobshistory.shortdescription": "A0"
87 } 93 }
88 ] 94 ]
89 $ hg obslog --hidden 471f378eab4c 95 $ hg obslog --hidden 471f378eab4c
90 x 471f378eab4c (1) A0 96 x 471f378eab4c (1) A0
91 rewritten by test (*) as 4ae3a4151de9 (glob) 97 rewritten(description, content) by test (*) as 4ae3a4151de9 (glob)
92 98
93 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool 99 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
94 [ 100 [
95 { 101 {
96 "debugobshistory.markers": [ 102 "debugobshistory.markers": [
97 { 103 {
104 "debugobshistory.effect": [
105 *, (glob)
106 "content"
107 ],
98 "debugobshistory.marker_date": [ 108 "debugobshistory.marker_date": [
99 *, (glob) 109 *, (glob)
100 0 (glob) 110 0 (glob)
101 ], 111 ],
102 "debugobshistory.marker_user": "test", 112 "debugobshistory.marker_user": "test",
306 ----------- 316 -----------
307 317
308 Check that debugobshistory on splitted commit show both targets 318 Check that debugobshistory on splitted commit show both targets
309 $ hg obslog 471597cad322 --hidden 319 $ hg obslog 471597cad322 --hidden
310 x 471597cad322 (1) A0 320 x 471597cad322 (1) A0
311 rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) 321 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
312 322
313 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool 323 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
314 [ 324 [
315 { 325 {
316 "debugobshistory.markers": [ 326 "debugobshistory.markers": [
317 { 327 {
328 "debugobshistory.effect": [
329 "parent",
330 "content"
331 ],
318 "debugobshistory.marker_date": [ 332 "debugobshistory.marker_date": [
319 *, (glob) 333 *, (glob)
320 0 (glob) 334 0 (glob)
321 ], 335 ],
322 "debugobshistory.marker_user": "test", 336 "debugobshistory.marker_user": "test",
336 the revision plus the splitted one 350 the revision plus the splitted one
337 $ hg obslog 337fec4d2edc 351 $ hg obslog 337fec4d2edc
338 o 337fec4d2edc (2) A0 352 o 337fec4d2edc (2) A0
339 | 353 |
340 x 471597cad322 (1) A0 354 x 471597cad322 (1) A0
341 rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) 355 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
342 356
343 With the all option, it should show the three changesets 357 With the all option, it should show the three changesets
344 $ hg obslog --all 337fec4d2edc 358 $ hg obslog --all 337fec4d2edc
345 o 337fec4d2edc (2) A0 359 o 337fec4d2edc (2) A0
346 | 360 |
347 | @ f257fde29c7a (3) A0 361 | @ f257fde29c7a (3) A0
348 |/ 362 |/
349 x 471597cad322 (1) A0 363 x 471597cad322 (1) A0
350 rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) 364 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
351 365
352 Check that debugobshistory on the second successor after split show 366 Check that debugobshistory on the second successor after split show
353 the revision plus the splitted one 367 the revision plus the splitted one
354 $ hg obslog f257fde29c7a 368 $ hg obslog f257fde29c7a
355 @ f257fde29c7a (3) A0 369 @ f257fde29c7a (3) A0
356 | 370 |
357 x 471597cad322 (1) A0 371 x 471597cad322 (1) A0
358 rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) 372 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
359 373
360 With the all option, it should show the three changesets 374 With the all option, it should show the three changesets
361 $ hg obslog f257fde29c7a --all 375 $ hg obslog f257fde29c7a --all
362 o 337fec4d2edc (2) A0 376 o 337fec4d2edc (2) A0
363 | 377 |
364 | @ f257fde29c7a (3) A0 378 | @ f257fde29c7a (3) A0
365 |/ 379 |/
366 x 471597cad322 (1) A0 380 x 471597cad322 (1) A0
367 rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) 381 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
368 382
369 Obslog with all option all should also works on the splitted commit 383 Obslog with all option all should also works on the splitted commit
370 $ hg obslog -a 471597cad322 --hidden 384 $ hg obslog -a 471597cad322 --hidden
371 o 337fec4d2edc (2) A0 385 o 337fec4d2edc (2) A0
372 | 386 |
373 | @ f257fde29c7a (3) A0 387 | @ f257fde29c7a (3) A0
374 |/ 388 |/
375 x 471597cad322 (1) A0 389 x 471597cad322 (1) A0
376 rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) 390 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
377 391
378 Check that debugobshistory on both successors after split show 392 Check that debugobshistory on both successors after split show
379 a coherent graph 393 a coherent graph
380 $ hg obslog 'f257fde29c7a+337fec4d2edc' 394 $ hg obslog 'f257fde29c7a+337fec4d2edc'
381 o 337fec4d2edc (2) A0 395 o 337fec4d2edc (2) A0
382 | 396 |
383 | @ f257fde29c7a (3) A0 397 | @ f257fde29c7a (3) A0
384 |/ 398 |/
385 x 471597cad322 (1) A0 399 x 471597cad322 (1) A0
386 rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) 400 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
387 401
388 $ hg update 471597cad322 402 $ hg update 471597cad322
389 abort: hidden revision '471597cad322'! 403 abort: hidden revision '471597cad322'!
390 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) 404 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
391 [255] 405 [255]
547 Actual test 561 Actual test
548 ----------- 562 -----------
549 563
550 $ hg obslog de7290d8b885 --hidden 564 $ hg obslog de7290d8b885 --hidden
551 x de7290d8b885 (1) A0 565 x de7290d8b885 (1) A0
552 rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) 566 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
553 567
554 $ hg obslog de7290d8b885 --hidden --all 568 $ hg obslog de7290d8b885 --hidden --all
555 o 1ae8bc733a14 (4) A0 569 o 1ae8bc733a14 (4) A0
556 | 570 |
557 | o 337fec4d2edc (2) A0 571 | o 337fec4d2edc (2) A0
559 | @ c7f044602e9b (5) A0 573 | @ c7f044602e9b (5) A0
560 |/ 574 |/
561 | o f257fde29c7a (3) A0 575 | o f257fde29c7a (3) A0
562 |/ 576 |/
563 x de7290d8b885 (1) A0 577 x de7290d8b885 (1) A0
564 rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) 578 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
565 579
566 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool 580 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
567 [ 581 [
568 { 582 {
569 "debugobshistory.markers": [ 583 "debugobshistory.markers": [
570 { 584 {
585 "debugobshistory.effect": [
586 "parent",
587 "content"
588 ],
571 "debugobshistory.marker_date": [ 589 "debugobshistory.marker_date": [
572 *, (glob) 590 *, (glob)
573 0 (glob) 591 0 (glob)
574 ], 592 ],
575 "debugobshistory.marker_user": "test", 593 "debugobshistory.marker_user": "test",
589 ] 607 ]
590 $ hg obslog c7f044602e9b 608 $ hg obslog c7f044602e9b
591 @ c7f044602e9b (5) A0 609 @ c7f044602e9b (5) A0
592 | 610 |
593 x de7290d8b885 (1) A0 611 x de7290d8b885 (1) A0
594 rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) 612 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
595 613
596 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool 614 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
597 [ 615 [
598 { 616 {
599 "debugobshistory.markers": [], 617 "debugobshistory.markers": [],
602 "debugobshistory.shortdescription": "A0" 620 "debugobshistory.shortdescription": "A0"
603 }, 621 },
604 { 622 {
605 "debugobshistory.markers": [ 623 "debugobshistory.markers": [
606 { 624 {
625 "debugobshistory.effect": [
626 "parent",
627 "content"
628 ],
607 "debugobshistory.marker_date": [ 629 "debugobshistory.marker_date": [
608 *, (glob) 630 *, (glob)
609 0 (glob) 631 0 (glob)
610 ], 632 ],
611 "debugobshistory.marker_user": "test", 633 "debugobshistory.marker_user": "test",
632 | @ c7f044602e9b (5) A0 654 | @ c7f044602e9b (5) A0
633 |/ 655 |/
634 | o f257fde29c7a (3) A0 656 | o f257fde29c7a (3) A0
635 |/ 657 |/
636 x de7290d8b885 (1) A0 658 x de7290d8b885 (1) A0
637 rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) 659 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
638 660
639 $ hg obslog 5 --all 661 $ hg obslog 5 --all
640 o 1ae8bc733a14 (4) A0 662 o 1ae8bc733a14 (4) A0
641 | 663 |
642 | o 337fec4d2edc (2) A0 664 | o 337fec4d2edc (2) A0
644 | @ c7f044602e9b (5) A0 666 | @ c7f044602e9b (5) A0
645 |/ 667 |/
646 | o f257fde29c7a (3) A0 668 | o f257fde29c7a (3) A0
647 |/ 669 |/
648 x de7290d8b885 (1) A0 670 x de7290d8b885 (1) A0
649 rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) 671 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
650 672
651 $ hg update de7290d8b885 673 $ hg update de7290d8b885
652 abort: hidden revision 'de7290d8b885'! 674 abort: hidden revision 'de7290d8b885'!
653 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) 675 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
654 [255] 676 [255]
716 738
717 Check that debugobshistory on the first folded revision show only 739 Check that debugobshistory on the first folded revision show only
718 the revision with the target 740 the revision with the target
719 $ hg obslog --hidden 471f378eab4c 741 $ hg obslog --hidden 471f378eab4c
720 x 471f378eab4c (1) A0 742 x 471f378eab4c (1) A0
721 rewritten by test (*) as eb5a0daa2192 (glob) 743 rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
722 744
723 Check that with all option, all changesets are shown 745 Check that with all option, all changesets are shown
724 $ hg obslog --hidden --all 471f378eab4c 746 $ hg obslog --hidden --all 471f378eab4c
725 @ eb5a0daa2192 (3) C0 747 @ eb5a0daa2192 (3) C0
726 |\ 748 |\
727 x | 0dec01379d3b (2) B0 749 x | 0dec01379d3b (2) B0
728 / rewritten by test (*) as eb5a0daa2192 (glob) 750 / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
729 | 751 |
730 x 471f378eab4c (1) A0 752 x 471f378eab4c (1) A0
731 rewritten by test (*) as eb5a0daa2192 (glob) 753 rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
732 754
733 Check that debugobshistory on the second folded revision show only 755 Check that debugobshistory on the second folded revision show only
734 the revision with the target 756 the revision with the target
735 $ hg obslog --hidden 0dec01379d3b 757 $ hg obslog --hidden 0dec01379d3b
736 x 0dec01379d3b (2) B0 758 x 0dec01379d3b (2) B0
737 rewritten by test (*) as eb5a0daa2192 (glob) 759 rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
738 760
739 Check that with all option, all changesets are shown 761 Check that with all option, all changesets are shown
740 $ hg obslog --hidden --all 0dec01379d3b 762 $ hg obslog --hidden --all 0dec01379d3b
741 @ eb5a0daa2192 (3) C0 763 @ eb5a0daa2192 (3) C0
742 |\ 764 |\
743 x | 0dec01379d3b (2) B0 765 x | 0dec01379d3b (2) B0
744 / rewritten by test (*) as eb5a0daa2192 (glob) 766 / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
745 | 767 |
746 x 471f378eab4c (1) A0 768 x 471f378eab4c (1) A0
747 rewritten by test (*) as eb5a0daa2192 (glob) 769 rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
748 770
749 Check that debugobshistory on the successor revision show a coherent 771 Check that debugobshistory on the successor revision show a coherent
750 graph 772 graph
751 $ hg obslog eb5a0daa2192 773 $ hg obslog eb5a0daa2192
752 @ eb5a0daa2192 (3) C0 774 @ eb5a0daa2192 (3) C0
753 |\ 775 |\
754 x | 0dec01379d3b (2) B0 776 x | 0dec01379d3b (2) B0
755 / rewritten by test (*) as eb5a0daa2192 (glob) 777 / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
756 | 778 |
757 x 471f378eab4c (1) A0 779 x 471f378eab4c (1) A0
758 rewritten by test (*) as eb5a0daa2192 (glob) 780 rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
759 781
760 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool 782 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool
761 [ 783 [
762 { 784 {
763 "debugobshistory.markers": [], 785 "debugobshistory.markers": [],
766 "debugobshistory.shortdescription": "C0" 788 "debugobshistory.shortdescription": "C0"
767 }, 789 },
768 { 790 {
769 "debugobshistory.markers": [ 791 "debugobshistory.markers": [
770 { 792 {
793 "debugobshistory.effect": [
794 "description",
795 "content"
796 ],
771 "debugobshistory.marker_date": [ 797 "debugobshistory.marker_date": [
772 *, (glob) 798 *, (glob)
773 0 (glob) 799 0 (glob)
774 ], 800 ],
775 "debugobshistory.marker_user": "test", 801 "debugobshistory.marker_user": "test",
784 "debugobshistory.shortdescription": "A0" 810 "debugobshistory.shortdescription": "A0"
785 }, 811 },
786 { 812 {
787 "debugobshistory.markers": [ 813 "debugobshistory.markers": [
788 { 814 {
815 "debugobshistory.effect": [
816 "description",
817 "parent",
818 "content"
819 ],
789 "debugobshistory.marker_date": [ 820 "debugobshistory.marker_date": [
790 *, (glob) 821 *, (glob)
791 0 (glob) 822 0 (glob)
792 ], 823 ],
793 "debugobshistory.marker_user": "test", 824 "debugobshistory.marker_user": "test",
886 ----------- 917 -----------
887 918
888 Check that debugobshistory on the divergent revision show both destinations 919 Check that debugobshistory on the divergent revision show both destinations
889 $ hg obslog --hidden 471f378eab4c 920 $ hg obslog --hidden 471f378eab4c
890 x 471f378eab4c (1) A0 921 x 471f378eab4c (1) A0
891 rewritten by test (*) as 65b757b745b9 (glob) 922 rewritten(description) by test (*) as 65b757b745b9 (glob)
892 rewritten by test (*) as fdf9bde5129a (glob) 923 rewritten(description) by test (*) as fdf9bde5129a (glob)
893 924
894 925
895 Check that with all option, every changeset is shown 926 Check that with all option, every changeset is shown
896 $ hg obslog --hidden --all 471f378eab4c 927 $ hg obslog --hidden --all 471f378eab4c
897 @ 65b757b745b9 (3) A2 928 @ 65b757b745b9 (3) A2
898 | 929 |
899 | o fdf9bde5129a (2) A1 930 | o fdf9bde5129a (2) A1
900 |/ 931 |/
901 x 471f378eab4c (1) A0 932 x 471f378eab4c (1) A0
902 rewritten by test (*) as 65b757b745b9 (glob) 933 rewritten(description) by test (*) as 65b757b745b9 (glob)
903 rewritten by test (*) as fdf9bde5129a (glob) 934 rewritten(description) by test (*) as fdf9bde5129a (glob)
904 935
905 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool 936 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
906 [ 937 [
907 { 938 {
908 "debugobshistory.markers": [ 939 "debugobshistory.markers": [
909 { 940 {
941 "debugobshistory.effect": [
942 "description"
943 ],
910 "debugobshistory.marker_date": [ 944 "debugobshistory.marker_date": [
911 *, (glob) 945 *, (glob)
912 0 (glob) 946 0 (glob)
913 ], 947 ],
914 "debugobshistory.marker_user": "test", 948 "debugobshistory.marker_user": "test",
916 "65b757b745b9" 950 "65b757b745b9"
917 ], 951 ],
918 "debugobshistory.verb": "rewritten" 952 "debugobshistory.verb": "rewritten"
919 }, 953 },
920 { 954 {
955 "debugobshistory.effect": [
956 "description"
957 ],
921 "debugobshistory.marker_date": [ 958 "debugobshistory.marker_date": [
922 *, (glob) 959 *, (glob)
923 0 (glob) 960 0 (glob)
924 ], 961 ],
925 "debugobshistory.marker_user": "test", 962 "debugobshistory.marker_user": "test",
938 and the diverent one 975 and the diverent one
939 $ hg obslog fdf9bde5129a 976 $ hg obslog fdf9bde5129a
940 o fdf9bde5129a (2) A1 977 o fdf9bde5129a (2) A1
941 | 978 |
942 x 471f378eab4c (1) A0 979 x 471f378eab4c (1) A0
943 rewritten by test (*) as 65b757b745b9 (glob) 980 rewritten(description) by test (*) as 65b757b745b9 (glob)
944 rewritten by test (*) as fdf9bde5129a (glob) 981 rewritten(description) by test (*) as fdf9bde5129a (glob)
945 982
946 983
947 Check that all option show all of them 984 Check that all option show all of them
948 $ hg obslog fdf9bde5129a -a 985 $ hg obslog fdf9bde5129a -a
949 @ 65b757b745b9 (3) A2 986 @ 65b757b745b9 (3) A2
950 | 987 |
951 | o fdf9bde5129a (2) A1 988 | o fdf9bde5129a (2) A1
952 |/ 989 |/
953 x 471f378eab4c (1) A0 990 x 471f378eab4c (1) A0
954 rewritten by test (*) as 65b757b745b9 (glob) 991 rewritten(description) by test (*) as 65b757b745b9 (glob)
955 rewritten by test (*) as fdf9bde5129a (glob) 992 rewritten(description) by test (*) as fdf9bde5129a (glob)
956 993
957 Check that debugobshistory on the second diverged revision show the revision 994 Check that debugobshistory on the second diverged revision show the revision
958 and the diverent one 995 and the diverent one
959 $ hg obslog 65b757b745b9 996 $ hg obslog 65b757b745b9
960 @ 65b757b745b9 (3) A2 997 @ 65b757b745b9 (3) A2
961 | 998 |
962 x 471f378eab4c (1) A0 999 x 471f378eab4c (1) A0
963 rewritten by test (*) as 65b757b745b9 (glob) 1000 rewritten(description) by test (*) as 65b757b745b9 (glob)
964 rewritten by test (*) as fdf9bde5129a (glob) 1001 rewritten(description) by test (*) as fdf9bde5129a (glob)
965 1002
966 Check that all option show all of them 1003 Check that all option show all of them
967 $ hg obslog 65b757b745b9 -a 1004 $ hg obslog 65b757b745b9 -a
968 @ 65b757b745b9 (3) A2 1005 @ 65b757b745b9 (3) A2
969 | 1006 |
970 | o fdf9bde5129a (2) A1 1007 | o fdf9bde5129a (2) A1
971 |/ 1008 |/
972 x 471f378eab4c (1) A0 1009 x 471f378eab4c (1) A0
973 rewritten by test (*) as 65b757b745b9 (glob) 1010 rewritten(description) by test (*) as 65b757b745b9 (glob)
974 rewritten by test (*) as fdf9bde5129a (glob) 1011 rewritten(description) by test (*) as fdf9bde5129a (glob)
975 1012
976 Check that debugobshistory on the both diverged revision show a coherent 1013 Check that debugobshistory on the both diverged revision show a coherent
977 graph 1014 graph
978 $ hg obslog '65b757b745b9+fdf9bde5129a' 1015 $ hg obslog '65b757b745b9+fdf9bde5129a'
979 @ 65b757b745b9 (3) A2 1016 @ 65b757b745b9 (3) A2
980 | 1017 |
981 | o fdf9bde5129a (2) A1 1018 | o fdf9bde5129a (2) A1
982 |/ 1019 |/
983 x 471f378eab4c (1) A0 1020 x 471f378eab4c (1) A0
984 rewritten by test (*) as 65b757b745b9 (glob) 1021 rewritten(description) by test (*) as 65b757b745b9 (glob)
985 rewritten by test (*) as fdf9bde5129a (glob) 1022 rewritten(description) by test (*) as fdf9bde5129a (glob)
986 1023
987 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool 1024 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool
988 [ 1025 [
989 { 1026 {
990 "debugobshistory.markers": [], 1027 "debugobshistory.markers": [],
993 "debugobshistory.shortdescription": "A2" 1030 "debugobshistory.shortdescription": "A2"
994 }, 1031 },
995 { 1032 {
996 "debugobshistory.markers": [ 1033 "debugobshistory.markers": [
997 { 1034 {
1035 "debugobshistory.effect": [
1036 "description"
1037 ],
998 "debugobshistory.marker_date": [ 1038 "debugobshistory.marker_date": [
999 *, (glob) 1039 *, (glob)
1000 0 (glob) 1040 0 (glob)
1001 ], 1041 ],
1002 "debugobshistory.marker_user": "test", 1042 "debugobshistory.marker_user": "test",
1004 "65b757b745b9" 1044 "65b757b745b9"
1005 ], 1045 ],
1006 "debugobshistory.verb": "rewritten" 1046 "debugobshistory.verb": "rewritten"
1007 }, 1047 },
1008 { 1048 {
1049 "debugobshistory.effect": [
1050 "description"
1051 ],
1009 "debugobshistory.marker_date": [ 1052 "debugobshistory.marker_date": [
1010 *, (glob) 1053 *, (glob)
1011 0 (glob) 1054 0 (glob)
1012 ], 1055 ],
1013 "debugobshistory.marker_user": "test", 1056 "debugobshistory.marker_user": "test",
1110 Check that debugobshistory on head show a coherent graph 1153 Check that debugobshistory on head show a coherent graph
1111 $ hg obslog eb5a0daa2192 1154 $ hg obslog eb5a0daa2192
1112 @ eb5a0daa2192 (4) C0 1155 @ eb5a0daa2192 (4) C0
1113 |\ 1156 |\
1114 x | 471f378eab4c (1) A0 1157 x | 471f378eab4c (1) A0
1115 / rewritten by test (*) as eb5a0daa2192 (glob) 1158 / rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
1116 | 1159 |
1117 x b7ea6d14e664 (3) B1 1160 x b7ea6d14e664 (3) B1
1118 | rewritten by test (*) as eb5a0daa2192 (glob) 1161 | rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
1119 | 1162 |
1120 x 0dec01379d3b (2) B0 1163 x 0dec01379d3b (2) B0
1121 rewritten by test (*) as b7ea6d14e664 (glob) 1164 rewritten(description) by test (*) as b7ea6d14e664 (glob)
1122 1165
1123 Check that obslog on ROOT with all option show everything 1166 Check that obslog on ROOT with all option show everything
1124 $ hg obslog 1 --hidden --all 1167 $ hg obslog 1 --hidden --all
1125 @ eb5a0daa2192 (4) C0 1168 @ eb5a0daa2192 (4) C0
1126 |\ 1169 |\
1127 x | 471f378eab4c (1) A0 1170 x | 471f378eab4c (1) A0
1128 / rewritten by test (*) as eb5a0daa2192 (glob) 1171 / rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
1129 | 1172 |
1130 x b7ea6d14e664 (3) B1 1173 x b7ea6d14e664 (3) B1
1131 | rewritten by test (*) as eb5a0daa2192 (glob) 1174 | rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
1132 | 1175 |
1133 x 0dec01379d3b (2) B0 1176 x 0dec01379d3b (2) B0
1134 rewritten by test (*) as b7ea6d14e664 (glob) 1177 rewritten(description) by test (*) as b7ea6d14e664 (glob)
1135 1178
1136 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool 1179 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool
1137 [ 1180 [
1138 { 1181 {
1139 "debugobshistory.markers": [], 1182 "debugobshistory.markers": [],
1142 "debugobshistory.shortdescription": "C0" 1185 "debugobshistory.shortdescription": "C0"
1143 }, 1186 },
1144 { 1187 {
1145 "debugobshistory.markers": [ 1188 "debugobshistory.markers": [
1146 { 1189 {
1190 "debugobshistory.effect": [
1191 *, (glob)
1192 *, (glob)
1193 "content"
1194 ],
1147 "debugobshistory.marker_date": [ 1195 "debugobshistory.marker_date": [
1148 *, (glob) 1196 *, (glob)
1149 0 (glob) 1197 0 (glob)
1150 ], 1198 ],
1151 "debugobshistory.marker_user": "test", 1199 "debugobshistory.marker_user": "test",
1160 "debugobshistory.shortdescription": "B1" 1208 "debugobshistory.shortdescription": "B1"
1161 }, 1209 },
1162 { 1210 {
1163 "debugobshistory.markers": [ 1211 "debugobshistory.markers": [
1164 { 1212 {
1213 "debugobshistory.effect": [
1214 "description"
1215 ],
1165 "debugobshistory.marker_date": [ 1216 "debugobshistory.marker_date": [
1166 *, (glob) 1217 *, (glob)
1167 0 (glob) 1218 0 (glob)
1168 ], 1219 ],
1169 "debugobshistory.marker_user": "test", 1220 "debugobshistory.marker_user": "test",
1178 "debugobshistory.shortdescription": "B0" 1229 "debugobshistory.shortdescription": "B0"
1179 }, 1230 },
1180 { 1231 {
1181 "debugobshistory.markers": [ 1232 "debugobshistory.markers": [
1182 { 1233 {
1234 "debugobshistory.effect": [
1235 "description",
1236 "content"
1237 ],
1183 "debugobshistory.marker_date": [ 1238 "debugobshistory.marker_date": [
1184 *, (glob) 1239 *, (glob)
1185 0 (glob) 1240 0 (glob)
1186 ], 1241 ],
1187 "debugobshistory.marker_user": "test", 1242 "debugobshistory.marker_user": "test",
1287 1342
1288 $ hg obslog 7a230b46bf61 1343 $ hg obslog 7a230b46bf61
1289 @ 7a230b46bf61 (3) A2 1344 @ 7a230b46bf61 (3) A2
1290 | 1345 |
1291 x fdf9bde5129a (2) A1 1346 x fdf9bde5129a (2) A1
1292 | rewritten by test (*) as 7a230b46bf61 (glob) 1347 | rewritten(description) by test (*) as 7a230b46bf61 (glob)
1293 | 1348 |
1294 x 471f378eab4c (1) A0 1349 x 471f378eab4c (1) A0
1295 rewritten by test (*) as fdf9bde5129a (glob) 1350 rewritten(description) by test (*) as fdf9bde5129a (glob)
1296 1351
1297 $ cd $TESTTMP/local-remote-markers-2 1352 $ cd $TESTTMP/local-remote-markers-2
1298 $ hg pull 1353 $ hg pull
1299 pulling from $TESTTMP/local-remote-markers-1 1354 pulling from $TESTTMP/local-remote-markers-1
1300 searching for changes 1355 searching for changes
1310 changectx 1365 changectx
1311 $ hg obslog 7a230b46bf61 1366 $ hg obslog 7a230b46bf61
1312 o 7a230b46bf61 (2) A2 1367 o 7a230b46bf61 (2) A2
1313 | 1368 |
1314 x fdf9bde5129a 1369 x fdf9bde5129a
1315 | rewritten by test (*) as 7a230b46bf61 (glob) 1370 | rewritten(description) by test (*) as 7a230b46bf61 (glob)
1316 | 1371 |
1317 @ 471f378eab4c (1) A0 1372 @ 471f378eab4c (1) A0
1318 rewritten by test (*) as fdf9bde5129a (glob) 1373 rewritten(description) by test (*) as fdf9bde5129a (glob)
1319 1374
1320 $ hg obslog 7a230b46bf61 --color=debug 1375 $ hg obslog 7a230b46bf61 --color=debug
1321 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] 1376 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
1322 | 1377 |
1323 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] 1378 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
1324 | [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*)] as [evolve.node|7a230b46bf61] (glob) 1379 | [evolve.verb|rewritten](description) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|7a230b46bf61] (glob)
1325 | 1380 |
1326 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] 1381 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
1327 [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*)] as [evolve.node|fdf9bde5129a] (glob) 1382 [evolve.verb|rewritten](description) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|fdf9bde5129a] (glob)
1328 1383