changeset 34294 | 7cdc8c5a481a |
parent 34293 | ecc96506c49d |
child 34575 | dc91580a0a88 |
34293:ecc96506c49d | 34294:7cdc8c5a481a |
---|---|
12 > [experimental] |
12 > [experimental] |
13 > stabilization=all |
13 > stabilization=all |
14 > [templates] |
14 > [templates] |
15 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" |
15 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" |
16 > obsfateverb = "{obsfateverb(successors)}" |
16 > obsfateverb = "{obsfateverb(successors)}" |
17 > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}" |
|
17 > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" |
18 > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" |
18 > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}" |
19 > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}" |
19 > obsfate = "{obsfateverb}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " |
20 > obsfate = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " |
20 > [alias] |
21 > [alias] |
21 > tlog = log -G -T '{node|short}\ |
22 > tlog = log -G -T '{node|short}\ |
22 > {if(predecessors, "\n Predecessors: {predecessors}")}\ |
23 > {if(predecessors, "\n Predecessors: {predecessors}")}\ |
23 > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ |
24 > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ |
24 > {if(predecessors, "\n json: {predecessors|json}")}\ |
25 > {if(predecessors, "\n json: {predecessors|json}")}\ |
88 |
89 |
89 $ hg fatelog -q --traceback |
90 $ hg fatelog -q --traceback |
90 o d004c8f274b9 |
91 o d004c8f274b9 |
91 | |
92 | |
92 | @ 471f378eab4c |
93 | @ 471f378eab4c |
93 |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
94 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
94 o ea207398892e |
95 o ea207398892e |
95 |
96 |
96 $ hg fatelog |
97 $ hg fatelog |
97 o d004c8f274b9 |
98 o d004c8f274b9 |
98 | |
99 | |
99 | @ 471f378eab4c |
100 | @ 471f378eab4c |
100 |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
101 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
101 o ea207398892e |
102 o ea207398892e |
102 |
103 |
103 $ hg fatelog -v |
104 $ hg fatelog -v |
104 o d004c8f274b9 |
105 o d004c8f274b9 |
105 | |
106 | |
106 | @ 471f378eab4c |
107 | @ 471f378eab4c |
107 |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
108 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
108 o ea207398892e |
109 o ea207398892e |
109 |
110 |
110 $ hg up 'desc(A1)' --hidden |
111 $ hg up 'desc(A1)' --hidden |
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
112 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
112 |
113 |
125 |
126 |
126 $ hg fatelog -v |
127 $ hg fatelog -v |
127 o d004c8f274b9 |
128 o d004c8f274b9 |
128 | |
129 | |
129 | @ a468dc9b3633 |
130 | @ a468dc9b3633 |
130 |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
131 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
131 o ea207398892e |
132 o ea207398892e |
132 |
133 |
133 Predecessors template should show all the predecessors as we force their display |
134 Predecessors template should show all the predecessors as we force their display |
134 with --hidden |
135 with --hidden |
135 $ hg tlog --hidden |
136 $ hg tlog --hidden |
154 |
155 |
155 $ hg fatelog --hidden -q |
156 $ hg fatelog --hidden -q |
156 o d004c8f274b9 |
157 o d004c8f274b9 |
157 | |
158 | |
158 | @ a468dc9b3633 |
159 | @ a468dc9b3633 |
159 |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
160 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
160 | x 471f378eab4c |
161 | x 471f378eab4c |
161 |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |
162 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |
162 o ea207398892e |
163 o ea207398892e |
163 |
164 |
164 |
165 |
165 Predecessors template shouldn't show anything as all obsolete commit are not |
166 Predecessors template shouldn't show anything as all obsolete commit are not |
166 visible. |
167 visible. |
199 |
200 |
200 $ hg fatelog -v --hidden |
201 $ hg fatelog -v --hidden |
201 @ d004c8f274b9 |
202 @ d004c8f274b9 |
202 | |
203 | |
203 | x a468dc9b3633 |
204 | x a468dc9b3633 |
204 |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
205 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
205 | x 471f378eab4c |
206 | x 471f378eab4c |
206 |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |
207 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |
207 o ea207398892e |
208 o ea207398892e |
208 |
209 |
209 $ hg fatelogjson --hidden |
210 $ hg fatelogjson --hidden |
210 @ d004c8f274b9 |
211 @ d004c8f274b9 |
211 | |
212 | |
651 o 019fadeab383 |
652 o 019fadeab383 |
652 | |
653 | |
653 | o fdf9bde5129a |
654 | o fdf9bde5129a |
654 |/ |
655 |/ |
655 | @ 471f378eab4c |
656 | @ 471f378eab4c |
656 |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
657 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
657 o ea207398892e |
658 o ea207398892e |
658 |
659 |
659 $ hg up 'desc(A1)' |
660 $ hg up 'desc(A1)' |
660 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
661 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
661 |
662 |
707 |
708 |
708 $ hg fatelog --hidden |
709 $ hg fatelog --hidden |
709 o 019fadeab383 |
710 o 019fadeab383 |
710 | |
711 | |
711 | x 65b757b745b9 |
712 | x 65b757b745b9 |
712 |/ Obsfate: rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
713 |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
713 | @ fdf9bde5129a |
714 | @ fdf9bde5129a |
714 |/ |
715 |/ |
715 | x 471f378eab4c |
716 | x 471f378eab4c |
716 |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |
717 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |
717 o ea207398892e |
718 o ea207398892e |
718 |
719 |
719 |
720 |
720 $ hg fatelogjson --hidden |
721 $ hg fatelogjson --hidden |
721 o 019fadeab383 |
722 o 019fadeab383 |
857 |
858 |
858 $ hg fatelog |
859 $ hg fatelog |
859 o eb5a0daa2192 |
860 o eb5a0daa2192 |
860 | |
861 | |
861 | @ 0dec01379d3b |
862 | @ 0dec01379d3b |
862 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
863 | | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
863 | x 471f378eab4c |
864 | x 471f378eab4c |
864 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
865 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
865 o ea207398892e |
866 o ea207398892e |
866 |
867 |
867 $ hg up 'desc(B1)' --hidden |
868 $ hg up 'desc(B1)' --hidden |
940 @ eb5a0daa2192 |
941 @ eb5a0daa2192 |
941 | |
942 | |
942 | x b7ea6d14e664 |
943 | x b7ea6d14e664 |
943 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
944 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
944 | | x 0dec01379d3b |
945 | | x 0dec01379d3b |
945 | |/ Obsfate: rewritten as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000); |
946 | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000); |
946 | x 471f378eab4c |
947 | x 471f378eab4c |
947 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
948 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
948 o ea207398892e |
949 o ea207398892e |
949 |
950 |
950 |
951 |
1066 |
1067 |
1067 $ hg fatelog |
1068 $ hg fatelog |
1068 o 7a230b46bf61 |
1069 o 7a230b46bf61 |
1069 | |
1070 | |
1070 | @ 471f378eab4c |
1071 | @ 471f378eab4c |
1071 |/ Obsfate: rewritten as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |
1072 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |
1072 o ea207398892e |
1073 o ea207398892e |
1073 |
1074 |
1074 $ hg up 'desc(A2)' |
1075 $ hg up 'desc(A2)' |
1075 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1076 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1076 |
1077 |
1103 |
1104 |
1104 $ hg fatelog --hidden |
1105 $ hg fatelog --hidden |
1105 @ 7a230b46bf61 |
1106 @ 7a230b46bf61 |
1106 | |
1107 | |
1107 | x 471f378eab4c |
1108 | x 471f378eab4c |
1108 |/ Obsfate: rewritten as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |
1109 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |
1109 o ea207398892e |
1110 o ea207398892e |
1110 |
1111 |
1111 |
1112 |
1112 Test template with obsmarkers cycle |
1113 Test template with obsmarkers cycle |
1113 =================================== |
1114 =================================== |
1436 | o b18bc8331526 |
1437 | o b18bc8331526 |
1437 |/ |
1438 |/ |
1438 | o ba2ed02b0c9a |
1439 | o ba2ed02b0c9a |
1439 | | |
1440 | | |
1440 | x 4a004186e638 |
1441 | x 4a004186e638 |
1441 |/ Obsfate: rewritten as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
1442 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
1442 o dd800401bd8c |
1443 o dd800401bd8c |
1443 | |
1444 | |
1444 o f897c6137566 |
1445 o f897c6137566 |
1445 | |
1446 | |
1446 o ea207398892e |
1447 o ea207398892e |
1509 | o b18bc8331526 |
1510 | o b18bc8331526 |
1510 |/ |
1511 |/ |
1511 | o ba2ed02b0c9a |
1512 | o ba2ed02b0c9a |
1512 | | |
1513 | | |
1513 | x 4a004186e638 |
1514 | x 4a004186e638 |
1514 |/ Obsfate: rewritten as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
1515 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
1515 o dd800401bd8c |
1516 o dd800401bd8c |
1516 | |
1517 | |
1517 | x 9bd10a0775e4 |
1518 | x 9bd10a0775e4 |
1518 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000); |
1519 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000); |
1519 o f897c6137566 |
1520 o f897c6137566 |
1588 o | b18bc8331526 |
1589 o | b18bc8331526 |
1589 |/ |
1590 |/ |
1590 o dd800401bd8c |
1591 o dd800401bd8c |
1591 | |
1592 | |
1592 | @ 9bd10a0775e4 |
1593 | @ 9bd10a0775e4 |
1593 |/ Obsfate: split as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); |
1594 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); |
1594 o f897c6137566 |
1595 o f897c6137566 |
1595 | |
1596 | |
1596 o ea207398892e |
1597 o ea207398892e |
1597 |
1598 |
1598 Test templates with pruned commits |
1599 Test templates with pruned commits |
1668 x 65b757b745b9 |
1669 x 65b757b745b9 |
1669 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
1670 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
1670 | x fdf9bde5129a |
1671 | x fdf9bde5129a |
1671 |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
1672 |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
1672 | @ 471f378eab4c |
1673 | @ 471f378eab4c |
1673 |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |
1674 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |
1674 o ea207398892e |
1675 o ea207398892e |
1675 |
1676 |
1676 |
1677 |
1677 Test templates with splitted and pruned commit |
1678 Test templates with splitted and pruned commit |
1678 ============================================== |
1679 ============================================== |