| branch | stable |
| changeset 3704 | a0c39e8d2c29 |
| parent 3650 | 35ffd7a4b339 |
| child 3714 | 19ec729f3ca2 |
| child 3747 | 1e103c7f7663 |
| 3611:c912eaf29eec | 3704:a0c39e8d2c29 |
|---|---|
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ |
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ |
18 > {if(successors, "\n Successors: {successors}")}\ |
18 > {if(successors, "\n Successors: {successors}")}\ |
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ |
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ |
20 > {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n' |
20 > {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n' |
21 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}' |
21 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}' |
22 > fatelogjson = log -G -T '{node|short} {obsfatedata|json}\n' |
|
23 > EOF |
22 > EOF |
24 |
23 |
25 Test templates on amended commit |
24 Test templates on amended commit |
26 ================================ |
25 ================================ |
27 |
26 |
242 | |
241 | |
243 | x 471f378eab4c |
242 | x 471f378eab4c |
244 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
243 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
245 | |
244 | |
246 o ea207398892e |
245 o ea207398892e |
247 |
|
248 |
|
249 $ hg fatelogjson --hidden |
|
250 @ d004c8f274b9 [] |
|
251 | |
|
252 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] |
|
253 |/ |
|
254 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] |
|
255 |/ |
|
256 o ea207398892e [] |
|
257 |
246 |
258 |
247 |
259 Test templates with splitted commit |
248 Test templates with splitted commit |
260 =================================== |
249 =================================== |
261 |
250 |
412 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
401 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
413 | |
402 | |
414 o ea207398892e |
403 o ea207398892e |
415 |
404 |
416 |
405 |
417 $ hg fatelogjson --hidden |
|
418 @ f257fde29c7a [] |
|
419 | |
|
420 o 337fec4d2edc [] |
|
421 | |
|
422 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["operation", "split"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] |
|
423 |/ |
|
424 o ea207398892e [] |
|
425 |
|
426 |
|
427 Test templates with folded commit |
406 Test templates with folded commit |
428 ============================== |
407 ============================== |
429 |
408 |
430 Test setup |
409 Test setup |
431 ---------- |
410 ---------- |
583 | | |
562 | | |
584 | x 471f378eab4c |
563 | x 471f378eab4c |
585 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 |
564 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 |
586 | |
565 | |
587 o ea207398892e |
566 o ea207398892e |
588 |
|
589 |
|
590 $ hg fatelogjson --hidden |
|
591 @ eb5a0daa2192 [] |
|
592 | |
|
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 | | |
|
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 |/ |
|
597 o ea207398892e [] |
|
598 |
567 |
599 |
568 |
600 Test templates with divergence |
569 Test templates with divergence |
601 ============================== |
570 ============================== |
602 |
571 |
756 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9 |
725 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9 |
757 | |
726 | |
758 o ea207398892e |
727 o ea207398892e |
759 |
728 |
760 |
729 |
761 $ hg fatelogjson --hidden |
|
762 * 019fadeab383 [] |
|
763 | |
|
764 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] |
|
765 |/ |
|
766 | @ fdf9bde5129a [] |
|
767 |/ |
|
768 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] |
|
769 |/ |
|
770 o ea207398892e [] |
|
771 |
|
772 |
|
773 Test templates with amended + folded commit |
730 Test templates with amended + folded commit |
774 =========================================== |
731 =========================================== |
775 |
732 |
776 Test setup |
733 Test setup |
777 ---------- |
734 ---------- |
978 | | |
935 | | |
979 | x 471f378eab4c |
936 | x 471f378eab4c |
980 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
937 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
981 | |
938 | |
982 o ea207398892e |
939 o ea207398892e |
983 |
|
984 $ hg fatelogjson --hidden |
|
985 @ eb5a0daa2192 [] |
|
986 | |
|
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 | | |
|
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 | |/ |
|
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 |/ |
|
993 o ea207398892e [] |
|
994 |
940 |
995 |
941 |
996 Test template with pushed and pulled obs markers |
942 Test template with pushed and pulled obs markers |
997 ============================================== |
943 ============================================== |
998 |
944 |
1131 | |
1077 | |
1132 | x 471f378eab4c |
1078 | x 471f378eab4c |
1133 |/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
1079 |/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
1134 | |
1080 | |
1135 o ea207398892e |
1081 o ea207398892e |
1136 |
|
1137 |
|
1138 $ hg fatelogjson --hidden |
|
1139 @ 7a230b46bf61 [] |
|
1140 | |
|
1141 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] |
|
1142 |/ |
|
1143 o ea207398892e [] |
|
1144 |
1082 |
1145 |
1083 |
1146 Test template with obsmarkers cycle |
1084 Test template with obsmarkers cycle |
1147 =================================== |
1085 =================================== |
1148 |
1086 |