Mercurial > evolve

comparison tests/test-evolve-templates.t @ 3564:589649021ea1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fold: include "operation" metadata in obsmarkers
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 12 Mar 2018 15:50:59 -0700
parents 1f0c88a9dd1c
children e6bea259c227
comparison
equal deleted inserted replaced
3563:d4c457c1ae0d 3564:589649021ea1
464 | summary: C0 464 | summary: C0
465 | 465 |
466 | x changeset: 2:0dec01379d3b 466 | x changeset: 2:0dec01379d3b
467 | | user: test 467 | | user: test
468 | | date: Thu Jan 01 00:00:00 1970 +0000 468 | | date: Thu Jan 01 00:00:00 1970 +0000
469 | | obsolete: rewritten as 3:eb5a0daa2192 469 | | obsolete: rewritten using fold as 3:eb5a0daa2192
470 | | summary: B0 470 | | summary: B0
471 | | 471 | |
472 | x changeset: 1:471f378eab4c 472 | x changeset: 1:471f378eab4c
473 |/ user: test 473 |/ user: test
474 | date: Thu Jan 01 00:00:00 1970 +0000 474 | date: Thu Jan 01 00:00:00 1970 +0000
475 | obsolete: rewritten as 3:eb5a0daa2192 475 | obsolete: rewritten using fold as 3:eb5a0daa2192
476 | summary: A0 476 | summary: A0
477 | 477 |
478 o changeset: 0:ea207398892e 478 o changeset: 0:ea207398892e
479 user: test 479 user: test
480 date: Thu Jan 01 00:00:00 1970 +0000 480 date: Thu Jan 01 00:00:00 1970 +0000
496 | Precursors: 1:471f378eab4c 496 | Precursors: 1:471f378eab4c
497 | semi-colon: 1:471f378eab4c 497 | semi-colon: 1:471f378eab4c
498 | @ 471f378eab4c 498 | @ 471f378eab4c
499 |/ Successors: 3:eb5a0daa2192 499 |/ Successors: 3:eb5a0daa2192
500 | semi-colon: 3:eb5a0daa2192 500 | semi-colon: 3:eb5a0daa2192
501 | Fate: rewritten as 3:eb5a0daa2192 501 | Fate: rewritten using fold as 3:eb5a0daa2192
502 | 502 |
503 o ea207398892e 503 o ea207398892e
504 504
505 $ hg fatelog 505 $ hg fatelog
506 o eb5a0daa2192 506 o eb5a0daa2192
507 | 507 |
508 | @ 471f378eab4c 508 | @ 471f378eab4c
509 |/ Obsfate: rewritten as 3:eb5a0daa2192 509 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
510 | 510 |
511 o ea207398892e 511 o ea207398892e
512 512
513 $ hg up 'desc(B0)' --hidden 513 $ hg up 'desc(B0)' --hidden
514 updating to a hidden changeset 0dec01379d3b 514 updating to a hidden changeset 0dec01379d3b
524 | Precursors: 2:0dec01379d3b 1:471f378eab4c 524 | Precursors: 2:0dec01379d3b 1:471f378eab4c
525 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c 525 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
526 | @ 0dec01379d3b 526 | @ 0dec01379d3b
527 | | Successors: 3:eb5a0daa2192 527 | | Successors: 3:eb5a0daa2192
528 | | semi-colon: 3:eb5a0daa2192 528 | | semi-colon: 3:eb5a0daa2192
529 | | Fate: rewritten as 3:eb5a0daa2192 529 | | Fate: rewritten using fold as 3:eb5a0daa2192
530 | | 530 | |
531 | x 471f378eab4c 531 | x 471f378eab4c
532 |/ Successors: 3:eb5a0daa2192 532 |/ Successors: 3:eb5a0daa2192
533 | semi-colon: 3:eb5a0daa2192 533 | semi-colon: 3:eb5a0daa2192
534 | Fate: rewritten as 3:eb5a0daa2192 534 | Fate: rewritten using fold as 3:eb5a0daa2192
535 | 535 |
536 o ea207398892e 536 o ea207398892e
537 537
538 $ hg fatelog 538 $ hg fatelog
539 o eb5a0daa2192 539 o eb5a0daa2192
540 | 540 |
541 | @ 0dec01379d3b 541 | @ 0dec01379d3b
542 | | Obsfate: rewritten as 3:eb5a0daa2192 542 | | Obsfate: rewritten using fold as 3:eb5a0daa2192
543 | | 543 | |
544 | x 471f378eab4c 544 | x 471f378eab4c
545 |/ Obsfate: rewritten as 3:eb5a0daa2192 545 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
546 | 546 |
547 o ea207398892e 547 o ea207398892e
548 548
549 549
550 $ hg up 'desc(C0)' 550 $ hg up 'desc(C0)'
564 | Precursors: 2:0dec01379d3b 1:471f378eab4c 564 | Precursors: 2:0dec01379d3b 1:471f378eab4c
565 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c 565 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
566 | x 0dec01379d3b 566 | x 0dec01379d3b
567 | | Successors: 3:eb5a0daa2192 567 | | Successors: 3:eb5a0daa2192
568 | | semi-colon: 3:eb5a0daa2192 568 | | semi-colon: 3:eb5a0daa2192
569 | | Fate: rewritten as 3:eb5a0daa2192 569 | | Fate: rewritten using fold as 3:eb5a0daa2192
570 | | 570 | |
571 | x 471f378eab4c 571 | x 471f378eab4c
572 |/ Successors: 3:eb5a0daa2192 572 |/ Successors: 3:eb5a0daa2192
573 | semi-colon: 3:eb5a0daa2192 573 | semi-colon: 3:eb5a0daa2192
574 | Fate: rewritten as 3:eb5a0daa2192 574 | Fate: rewritten using fold as 3:eb5a0daa2192
575 | 575 |
576 o ea207398892e 576 o ea207398892e
577 577
578 $ hg fatelog --hidden 578 $ hg fatelog --hidden
579 @ eb5a0daa2192 579 @ eb5a0daa2192
580 | 580 |
581 | x 0dec01379d3b 581 | x 0dec01379d3b
582 | | Obsfate: rewritten as 3:eb5a0daa2192 582 | | Obsfate: rewritten using fold as 3:eb5a0daa2192
583 | | 583 | |
584 | x 471f378eab4c 584 | x 471f378eab4c
585 |/ Obsfate: rewritten as 3:eb5a0daa2192 585 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
586 | 586 |
587 o ea207398892e 587 o ea207398892e
588 588
589 589
590 $ hg fatelogjson --hidden 590 $ hg fatelogjson --hidden
591 @ eb5a0daa2192 [] 591 @ eb5a0daa2192 []
592 | 592 |
593 | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] 593 | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
594 | | 594 | |
595 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] 595 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
596 |/ 596 |/
597 o ea207398892e [] 597 o ea207398892e []
598 598
599 599
600 Test templates with divergence 600 Test templates with divergence
819 | 819 |
820 | x changeset: 3:b7ea6d14e664 820 | x changeset: 3:b7ea6d14e664
821 | | parent: 1:471f378eab4c 821 | | parent: 1:471f378eab4c
822 | | user: test 822 | | user: test
823 | | date: Thu Jan 01 00:00:00 1970 +0000 823 | | date: Thu Jan 01 00:00:00 1970 +0000
824 | | obsolete: rewritten as 4:eb5a0daa2192 824 | | obsolete: rewritten using fold as 4:eb5a0daa2192
825 | | summary: B1 825 | | summary: B1
826 | | 826 | |
827 | | x changeset: 2:0dec01379d3b 827 | | x changeset: 2:0dec01379d3b
828 | |/ user: test 828 | |/ user: test
829 | | date: Thu Jan 01 00:00:00 1970 +0000 829 | | date: Thu Jan 01 00:00:00 1970 +0000
831 | | summary: B0 831 | | summary: B0
832 | | 832 | |
833 | x changeset: 1:471f378eab4c 833 | x changeset: 1:471f378eab4c
834 |/ user: test 834 |/ user: test
835 | date: Thu Jan 01 00:00:00 1970 +0000 835 | date: Thu Jan 01 00:00:00 1970 +0000
836 | obsolete: rewritten as 4:eb5a0daa2192 836 | obsolete: rewritten using fold as 4:eb5a0daa2192
837 | summary: A0 837 | summary: A0
838 | 838 |
839 o changeset: 0:ea207398892e 839 o changeset: 0:ea207398892e
840 user: test 840 user: test
841 date: Thu Jan 01 00:00:00 1970 +0000 841 date: Thu Jan 01 00:00:00 1970 +0000
855 | Precursors: 1:471f378eab4c 855 | Precursors: 1:471f378eab4c
856 | semi-colon: 1:471f378eab4c 856 | semi-colon: 1:471f378eab4c
857 | @ 471f378eab4c 857 | @ 471f378eab4c
858 |/ Successors: 4:eb5a0daa2192 858 |/ Successors: 4:eb5a0daa2192
859 | semi-colon: 4:eb5a0daa2192 859 | semi-colon: 4:eb5a0daa2192
860 | Fate: rewritten as 4:eb5a0daa2192 860 | Fate: rewritten using fold as 4:eb5a0daa2192
861 | 861 |
862 o ea207398892e 862 o ea207398892e
863 863
864 $ hg fatelog 864 $ hg fatelog
865 o eb5a0daa2192 865 o eb5a0daa2192
866 | 866 |
867 | @ 471f378eab4c 867 | @ 471f378eab4c
868 |/ Obsfate: rewritten as 4:eb5a0daa2192 868 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
869 | 869 |
870 o ea207398892e 870 o ea207398892e
871 871
872 $ hg up 'desc(B0)' --hidden 872 $ hg up 'desc(B0)' --hidden
873 updating to a hidden changeset 0dec01379d3b 873 updating to a hidden changeset 0dec01379d3b
880 | Precursors: 2:0dec01379d3b 1:471f378eab4c 880 | Precursors: 2:0dec01379d3b 1:471f378eab4c
881 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c 881 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
882 | @ 0dec01379d3b 882 | @ 0dec01379d3b
883 | | Successors: 4:eb5a0daa2192 883 | | Successors: 4:eb5a0daa2192
884 | | semi-colon: 4:eb5a0daa2192 884 | | semi-colon: 4:eb5a0daa2192
885 | | Fate: rewritten using amend as 4:eb5a0daa2192 885 | | Fate: rewritten using amend, fold as 4:eb5a0daa2192
886 | | 886 | |
887 | x 471f378eab4c 887 | x 471f378eab4c
888 |/ Successors: 4:eb5a0daa2192 888 |/ Successors: 4:eb5a0daa2192
889 | semi-colon: 4:eb5a0daa2192 889 | semi-colon: 4:eb5a0daa2192
890 | Fate: rewritten as 4:eb5a0daa2192 890 | Fate: rewritten using fold as 4:eb5a0daa2192
891 | 891 |
892 o ea207398892e 892 o ea207398892e
893 893
894 $ hg fatelog 894 $ hg fatelog
895 o eb5a0daa2192 895 o eb5a0daa2192
896 | 896 |
897 | @ 0dec01379d3b 897 | @ 0dec01379d3b
898 | | Obsfate: rewritten using amend as 4:eb5a0daa2192 898 | | Obsfate: rewritten using amend, fold as 4:eb5a0daa2192
899 | | 899 | |
900 | x 471f378eab4c 900 | x 471f378eab4c
901 |/ Obsfate: rewritten as 4:eb5a0daa2192 901 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
902 | 902 |
903 o ea207398892e 903 o ea207398892e
904 904
905 905
906 $ hg up 'desc(B1)' --hidden 906 $ hg up 'desc(B1)' --hidden
914 | Precursors: 1:471f378eab4c 3:b7ea6d14e664 914 | Precursors: 1:471f378eab4c 3:b7ea6d14e664
915 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 915 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
916 | @ b7ea6d14e664 916 | @ b7ea6d14e664
917 | | Successors: 4:eb5a0daa2192 917 | | Successors: 4:eb5a0daa2192
918 | | semi-colon: 4:eb5a0daa2192 918 | | semi-colon: 4:eb5a0daa2192
919 | | Fate: rewritten as 4:eb5a0daa2192 919 | | Fate: rewritten using fold as 4:eb5a0daa2192
920 | | 920 | |
921 | x 471f378eab4c 921 | x 471f378eab4c
922 |/ Successors: 4:eb5a0daa2192 922 |/ Successors: 4:eb5a0daa2192
923 | semi-colon: 4:eb5a0daa2192 923 | semi-colon: 4:eb5a0daa2192
924 | Fate: rewritten as 4:eb5a0daa2192 924 | Fate: rewritten using fold as 4:eb5a0daa2192
925 | 925 |
926 o ea207398892e 926 o ea207398892e
927 927
928 $ hg fatelog 928 $ hg fatelog
929 o eb5a0daa2192 929 o eb5a0daa2192
930 | 930 |
931 | @ b7ea6d14e664 931 | @ b7ea6d14e664
932 | | Obsfate: rewritten as 4:eb5a0daa2192 932 | | Obsfate: rewritten using fold as 4:eb5a0daa2192
933 | | 933 | |
934 | x 471f378eab4c 934 | x 471f378eab4c
935 |/ Obsfate: rewritten as 4:eb5a0daa2192 935 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
936 | 936 |
937 o ea207398892e 937 o ea207398892e
938 938
939 939
940 $ hg up 'desc(C0)' 940 $ hg up 'desc(C0)'
951 | x b7ea6d14e664 951 | x b7ea6d14e664
952 | | Precursors: 2:0dec01379d3b 952 | | Precursors: 2:0dec01379d3b
953 | | semi-colon: 2:0dec01379d3b 953 | | semi-colon: 2:0dec01379d3b
954 | | Successors: 4:eb5a0daa2192 954 | | Successors: 4:eb5a0daa2192
955 | | semi-colon: 4:eb5a0daa2192 955 | | semi-colon: 4:eb5a0daa2192
956 | | Fate: rewritten as 4:eb5a0daa2192 956 | | Fate: rewritten using fold as 4:eb5a0daa2192
957 | | 957 | |
958 | | x 0dec01379d3b 958 | | x 0dec01379d3b
959 | |/ Successors: 3:b7ea6d14e664 959 | |/ Successors: 3:b7ea6d14e664
960 | | semi-colon: 3:b7ea6d14e664 960 | | semi-colon: 3:b7ea6d14e664
961 | | Fate: reworded using amend as 3:b7ea6d14e664 961 | | Fate: reworded using amend as 3:b7ea6d14e664
962 | | 962 | |
963 | x 471f378eab4c 963 | x 471f378eab4c
964 |/ Successors: 4:eb5a0daa2192 964 |/ Successors: 4:eb5a0daa2192
965 | semi-colon: 4:eb5a0daa2192 965 | semi-colon: 4:eb5a0daa2192
966 | Fate: rewritten as 4:eb5a0daa2192 966 | Fate: rewritten using fold as 4:eb5a0daa2192
967 | 967 |
968 o ea207398892e 968 o ea207398892e
969 969
970 $ hg fatelog --hidden 970 $ hg fatelog --hidden
971 @ eb5a0daa2192 971 @ eb5a0daa2192
972 | 972 |
973 | x b7ea6d14e664 973 | x b7ea6d14e664
974 | | Obsfate: rewritten as 4:eb5a0daa2192 974 | | Obsfate: rewritten using fold as 4:eb5a0daa2192
975 | | 975 | |
976 | | x 0dec01379d3b 976 | | x 0dec01379d3b
977 | |/ Obsfate: reworded using amend as 3:b7ea6d14e664 977 | |/ Obsfate: reworded using amend as 3:b7ea6d14e664
978 | | 978 | |
979 | x 471f378eab4c 979 | x 471f378eab4c
980 |/ Obsfate: rewritten as 4:eb5a0daa2192 980 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
981 | 981 |
982 o ea207398892e 982 o ea207398892e
983 983
984 $ hg fatelogjson --hidden 984 $ hg fatelogjson --hidden
985 @ eb5a0daa2192 [] 985 @ eb5a0daa2192 []
986 | 986 |
987 | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] 987 | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
988 | | 988 | |
989 | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] 989 | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}]
990 | |/ 990 | |/
991 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] 991 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
992 |/ 992 |/
993 o ea207398892e [] 993 o ea207398892e []
994 994
995 995
996 Test template with pushed and pulled obs markers 996 Test template with pushed and pulled obs markers