43 $ echo 42 >> A0 |
43 $ echo 42 >> A0 |
44 $ HGUSER=test1 hg commit --amend -m "A1" --config devel.default-date="1234567890 0" |
44 $ HGUSER=test1 hg commit --amend -m "A1" --config devel.default-date="1234567890 0" |
45 $ HGUSER=test2 hg commit --amend -m "A2" --config devel.default-date="987654321 0" |
45 $ HGUSER=test2 hg commit --amend -m "A2" --config devel.default-date="987654321 0" |
46 |
46 |
47 $ hg log --hidden -G |
47 $ hg log --hidden -G |
48 @ changeset: 4:d004c8f274b9 |
48 @ changeset: 3:d004c8f274b9 |
49 | tag: tip |
49 | tag: tip |
50 | parent: 0:ea207398892e |
50 | parent: 0:ea207398892e |
51 | user: test |
51 | user: test |
52 | date: Thu Jan 01 00:00:00 1970 +0000 |
52 | date: Thu Jan 01 00:00:00 1970 +0000 |
53 | summary: A2 |
53 | summary: A2 |
54 | |
54 | |
55 | x changeset: 3:a468dc9b3633 |
55 | x changeset: 2:a468dc9b3633 |
56 |/ parent: 0:ea207398892e |
56 |/ parent: 0:ea207398892e |
57 | user: test |
57 | user: test |
58 | date: Thu Jan 01 00:00:00 1970 +0000 |
58 | date: Thu Jan 01 00:00:00 1970 +0000 |
59 | summary: A1 |
59 | summary: A1 |
60 | |
60 | |
61 | x changeset: 2:f137d23bb3e1 |
|
62 | | user: test |
|
63 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
64 | | summary: temporary amend commit for 471f378eab4c |
|
65 | | |
|
66 | x changeset: 1:471f378eab4c |
61 | x changeset: 1:471f378eab4c |
67 |/ user: test |
62 |/ user: test |
68 | date: Thu Jan 01 00:00:00 1970 +0000 |
63 | date: Thu Jan 01 00:00:00 1970 +0000 |
69 | summary: A0 |
64 | summary: A0 |
70 | |
65 | |
84 | Predecessors: 1:471f378eab4c |
79 | Predecessors: 1:471f378eab4c |
85 | semi-colon: 1:471f378eab4c |
80 | semi-colon: 1:471f378eab4c |
86 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
81 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
87 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
82 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
88 | @ 471f378eab4c |
83 | @ 471f378eab4c |
89 |/ Successors: 4:d004c8f274b9 |
84 |/ Successors: 3:d004c8f274b9 |
90 | multi-line: 4:d004c8f274b9 |
85 | multi-line: 3:d004c8f274b9 |
91 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
86 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
92 o ea207398892e |
87 o ea207398892e |
93 |
88 |
94 $ hg fatelog -q --traceback |
89 $ hg fatelog -q --traceback |
95 o d004c8f274b9 |
90 o d004c8f274b9 |
96 | |
91 | |
97 | @ 471f378eab4c |
92 | @ 471f378eab4c |
98 |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
93 |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
99 o ea207398892e |
94 o ea207398892e |
100 |
95 |
101 $ hg fatelog |
96 $ hg fatelog |
102 o d004c8f274b9 |
97 o d004c8f274b9 |
103 | |
98 | |
104 | @ 471f378eab4c |
99 | @ 471f378eab4c |
105 |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
100 |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
106 o ea207398892e |
101 o ea207398892e |
107 |
102 |
108 $ hg fatelog -v |
103 $ hg fatelog -v |
109 o d004c8f274b9 |
104 o d004c8f274b9 |
110 | |
105 | |
111 | @ 471f378eab4c |
106 | @ 471f378eab4c |
112 |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
107 |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
113 o ea207398892e |
108 o ea207398892e |
114 |
109 |
115 $ hg up 'desc(A1)' --hidden |
110 $ hg up 'desc(A1)' --hidden |
116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
117 |
112 |
118 Predecessors template should show current revision as it is the working copy |
113 Predecessors template should show current revision as it is the working copy |
119 $ hg tlog |
114 $ hg tlog |
120 o d004c8f274b9 |
115 o d004c8f274b9 |
121 | Predecessors: 3:a468dc9b3633 |
116 | Predecessors: 2:a468dc9b3633 |
122 | semi-colon: 3:a468dc9b3633 |
117 | semi-colon: 2:a468dc9b3633 |
123 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
118 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
124 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
119 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
125 | @ a468dc9b3633 |
120 | @ a468dc9b3633 |
126 |/ Successors: 4:d004c8f274b9 |
121 |/ Successors: 3:d004c8f274b9 |
127 | multi-line: 4:d004c8f274b9 |
122 | multi-line: 3:d004c8f274b9 |
128 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
123 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
129 o ea207398892e |
124 o ea207398892e |
130 |
125 |
131 $ hg fatelog -v |
126 $ hg fatelog -v |
132 o d004c8f274b9 |
127 o d004c8f274b9 |
133 | |
128 | |
134 | @ a468dc9b3633 |
129 | @ a468dc9b3633 |
135 |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
130 |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
136 o ea207398892e |
131 o ea207398892e |
137 |
132 |
138 Predecessors template should show all the predecessors as we force their display |
133 Predecessors template should show all the predecessors as we force their display |
139 with --hidden |
134 with --hidden |
140 $ hg tlog --hidden |
135 $ hg tlog --hidden |
141 o d004c8f274b9 |
136 o d004c8f274b9 |
142 | Predecessors: 3:a468dc9b3633 |
137 | Predecessors: 2:a468dc9b3633 |
143 | semi-colon: 3:a468dc9b3633 |
138 | semi-colon: 2:a468dc9b3633 |
144 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
139 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
145 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
140 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
146 | @ a468dc9b3633 |
141 | @ a468dc9b3633 |
147 |/ Predecessors: 1:471f378eab4c |
142 |/ Predecessors: 1:471f378eab4c |
148 | semi-colon: 1:471f378eab4c |
143 | semi-colon: 1:471f378eab4c |
149 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
144 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
150 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
145 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
151 | Successors: 4:d004c8f274b9 |
146 | Successors: 3:d004c8f274b9 |
152 | multi-line: 4:d004c8f274b9 |
147 | multi-line: 3:d004c8f274b9 |
153 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
148 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
154 | x f137d23bb3e1 |
149 | x 471f378eab4c |
155 | | |
150 |/ Successors: 2:a468dc9b3633 |
156 | x 471f378eab4c |
151 | multi-line: 2:a468dc9b3633 |
157 |/ Successors: 3:a468dc9b3633 |
|
158 | multi-line: 3:a468dc9b3633 |
|
159 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
152 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
160 o ea207398892e |
153 o ea207398892e |
161 |
154 |
162 $ hg fatelog --hidden -q |
155 $ hg fatelog --hidden -q |
163 o d004c8f274b9 |
156 o d004c8f274b9 |
164 | |
157 | |
165 | @ a468dc9b3633 |
158 | @ a468dc9b3633 |
166 |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
159 |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
167 | x f137d23bb3e1 |
160 | x 471f378eab4c |
168 | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000); |
161 |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |
169 | x 471f378eab4c |
|
170 |/ Obsfate: rewritten as 3:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |
|
171 o ea207398892e |
162 o ea207398892e |
172 |
163 |
173 |
164 |
174 Predecessors template shouldn't show anything as all obsolete commit are not |
165 Predecessors template shouldn't show anything as all obsolete commit are not |
175 visible. |
166 visible. |
180 | |
171 | |
181 o ea207398892e |
172 o ea207398892e |
182 |
173 |
183 $ hg tlog --hidden |
174 $ hg tlog --hidden |
184 @ d004c8f274b9 |
175 @ d004c8f274b9 |
185 | Predecessors: 3:a468dc9b3633 |
176 | Predecessors: 2:a468dc9b3633 |
186 | semi-colon: 3:a468dc9b3633 |
177 | semi-colon: 2:a468dc9b3633 |
187 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
178 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
188 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
179 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
189 | x a468dc9b3633 |
180 | x a468dc9b3633 |
190 |/ Predecessors: 1:471f378eab4c |
181 |/ Predecessors: 1:471f378eab4c |
191 | semi-colon: 1:471f378eab4c |
182 | semi-colon: 1:471f378eab4c |
192 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
183 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
193 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
184 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
194 | Successors: 4:d004c8f274b9 |
185 | Successors: 3:d004c8f274b9 |
195 | multi-line: 4:d004c8f274b9 |
186 | multi-line: 3:d004c8f274b9 |
196 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
187 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
197 | x f137d23bb3e1 |
188 | x 471f378eab4c |
198 | | |
189 |/ Successors: 2:a468dc9b3633 |
199 | x 471f378eab4c |
190 | multi-line: 2:a468dc9b3633 |
200 |/ Successors: 3:a468dc9b3633 |
|
201 | multi-line: 3:a468dc9b3633 |
|
202 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
191 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
203 o ea207398892e |
192 o ea207398892e |
204 |
193 |
205 $ hg fatelog -v |
194 $ hg fatelog -v |
206 @ d004c8f274b9 |
195 @ d004c8f274b9 |
210 |
199 |
211 $ hg fatelog -v --hidden |
200 $ hg fatelog -v --hidden |
212 @ d004c8f274b9 |
201 @ d004c8f274b9 |
213 | |
202 | |
214 | x a468dc9b3633 |
203 | x a468dc9b3633 |
215 |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
204 |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
216 | x f137d23bb3e1 |
205 | x 471f378eab4c |
217 | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000); |
206 |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |
218 | x 471f378eab4c |
|
219 |/ Obsfate: rewritten as 3:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |
|
220 o ea207398892e |
207 o ea207398892e |
221 |
208 |
222 $ hg fatelogjson --hidden |
209 $ hg fatelogjson --hidden |
223 @ d004c8f274b9 |
210 @ d004c8f274b9 |
224 | |
211 | |
225 | x a468dc9b3633 |
212 | x a468dc9b3633 |
226 |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] |
213 |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] |
227 | x f137d23bb3e1 |
|
228 | | Obsfate: [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["user", "test1"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "successors": []}] |
|
229 | x 471f378eab4c |
214 | x 471f378eab4c |
230 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["user", "test1"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] |
215 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["user", "test1"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] |
231 o ea207398892e |
216 o ea207398892e |
232 |
217 |
233 Test templates with splitted commit |
218 Test templates with splitted commit |