Show More
@@ -1,1645 +1,1780 b'' | |||
|
1 | 1 | This test file test the various templates related to obsmarkers. |
|
2 | 2 | |
|
3 | 3 | Global setup |
|
4 | 4 | ============ |
|
5 | 5 | |
|
6 | 6 | $ . $TESTDIR/testlib/obsmarker-common.sh |
|
7 | 7 | $ cat >> $HGRCPATH <<EOF |
|
8 | 8 | > [ui] |
|
9 | 9 | > interactive = true |
|
10 | 10 | > [phases] |
|
11 | 11 | > publish=False |
|
12 | 12 | > [experimental] |
|
13 | 13 | > stabilization=all |
|
14 | 14 | > [templates] |
|
15 | 15 | > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" |
|
16 | 16 | > obsfateverb = "{obsfateverb(successors)}" |
|
17 | 17 | > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" |
|
18 | 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 | 19 | > obsfate = "{obsfateverb}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " |
|
20 | 20 | > [alias] |
|
21 | 21 | > tlog = log -G -T '{node|short}\ |
|
22 | 22 | > {if(predecessors, "\n Predecessors: {predecessors}")}\ |
|
23 | 23 | > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ |
|
24 | 24 | > {if(predecessors, "\n json: {predecessors|json}")}\ |
|
25 | 25 | > {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\ |
|
26 | 26 | > {if(successorssets, "\n Successors: {successorssets}")}\ |
|
27 | 27 | > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\ |
|
28 | 28 | > {if(successorssets, "\n json: {successorssets|json}")}\n' |
|
29 | 29 | > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfate}"} \n" )}' |
|
30 | 30 | > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}' |
|
31 | 31 | > EOF |
|
32 | 32 | |
|
33 | 33 | Test templates on amended commit |
|
34 | 34 | ================================ |
|
35 | 35 | |
|
36 | 36 | Test setup |
|
37 | 37 | ---------- |
|
38 | 38 | |
|
39 | 39 | $ hg init $TESTTMP/templates-local-amend |
|
40 | 40 | $ cd $TESTTMP/templates-local-amend |
|
41 | 41 | $ mkcommit ROOT |
|
42 | 42 | $ mkcommit A0 |
|
43 | 43 | $ echo 42 >> A0 |
|
44 | 44 | $ HGUSER=test1 hg commit --amend -m "A1" --config devel.default-date="1234567890 0" |
|
45 | 45 | $ HGUSER=test2 hg commit --amend -m "A2" --config devel.default-date="987654321 0" |
|
46 | 46 | |
|
47 | 47 | $ hg log --hidden -G |
|
48 | 48 | @ changeset: 4:d004c8f274b9 |
|
49 | 49 | | tag: tip |
|
50 | 50 | | parent: 0:ea207398892e |
|
51 | 51 | | user: test |
|
52 | 52 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
53 | 53 | | summary: A2 |
|
54 | 54 | | |
|
55 | 55 | | x changeset: 3:a468dc9b3633 |
|
56 | 56 | |/ parent: 0:ea207398892e |
|
57 | 57 | | user: test |
|
58 | 58 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
59 | 59 | | summary: A1 |
|
60 | 60 | | |
|
61 | 61 | | x changeset: 2:f137d23bb3e1 |
|
62 | 62 | | | user: test |
|
63 | 63 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
64 | 64 | | | summary: temporary amend commit for 471f378eab4c |
|
65 | 65 | | | |
|
66 | 66 | | x changeset: 1:471f378eab4c |
|
67 | 67 | |/ user: test |
|
68 | 68 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
69 | 69 | | summary: A0 |
|
70 | 70 | | |
|
71 | 71 | o changeset: 0:ea207398892e |
|
72 | 72 | user: test |
|
73 | 73 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
74 | 74 | summary: ROOT |
|
75 | 75 | |
|
76 | 76 | Check templates |
|
77 | 77 | --------------- |
|
78 | 78 | $ hg up 'desc(A0)' --hidden |
|
79 | 79 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
80 | 80 | |
|
81 | 81 | Predecessors template should show current revision as it is the working copy |
|
82 | 82 | $ hg tlog |
|
83 | 83 | o d004c8f274b9 |
|
84 | 84 | | Predecessors: 1:471f378eab4c |
|
85 | 85 | | semi-colon: 1:471f378eab4c |
|
86 | 86 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
87 | 87 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
88 | 88 | | @ 471f378eab4c |
|
89 | 89 | |/ Successors: 4:d004c8f274b9 |
|
90 | 90 | | multi-line: 4:d004c8f274b9 |
|
91 | 91 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
92 | 92 | o ea207398892e |
|
93 | 93 | |
|
94 | 94 | $ hg fatelog -q --traceback |
|
95 | 95 | o d004c8f274b9 |
|
96 | 96 | | |
|
97 | 97 | | @ 471f378eab4c |
|
98 | 98 | |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
|
99 | 99 | o ea207398892e |
|
100 | 100 | |
|
101 | 101 | $ hg fatelog |
|
102 | 102 | o d004c8f274b9 |
|
103 | 103 | | |
|
104 | 104 | | @ 471f378eab4c |
|
105 | 105 | |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
|
106 | 106 | o ea207398892e |
|
107 | 107 | |
|
108 | 108 | $ hg fatelog -v |
|
109 | 109 | o d004c8f274b9 |
|
110 | 110 | | |
|
111 | 111 | | @ 471f378eab4c |
|
112 | 112 | |/ Obsfate: rewritten as 4:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
|
113 | 113 | o ea207398892e |
|
114 | 114 | |
|
115 | 115 | $ hg up 'desc(A1)' --hidden |
|
116 | 116 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
117 | 117 | |
|
118 | 118 | Predecessors template should show current revision as it is the working copy |
|
119 | 119 | $ hg tlog |
|
120 | 120 | o d004c8f274b9 |
|
121 | 121 | | Predecessors: 3:a468dc9b3633 |
|
122 | 122 | | semi-colon: 3:a468dc9b3633 |
|
123 | 123 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
124 | 124 | | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
125 | 125 | | @ a468dc9b3633 |
|
126 | 126 | |/ Successors: 4:d004c8f274b9 |
|
127 | 127 | | multi-line: 4:d004c8f274b9 |
|
128 | 128 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
129 | 129 | o ea207398892e |
|
130 | 130 | |
|
131 | 131 | $ hg fatelog -v |
|
132 | 132 | o d004c8f274b9 |
|
133 | 133 | | |
|
134 | 134 | | @ a468dc9b3633 |
|
135 | 135 | |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
|
136 | 136 | o ea207398892e |
|
137 | 137 | |
|
138 | 138 | Predecessors template should show all the predecessors as we force their display |
|
139 | 139 | with --hidden |
|
140 | 140 | $ hg tlog --hidden |
|
141 | 141 | o d004c8f274b9 |
|
142 | 142 | | Predecessors: 3:a468dc9b3633 |
|
143 | 143 | | semi-colon: 3:a468dc9b3633 |
|
144 | 144 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
145 | 145 | | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
146 | 146 | | @ a468dc9b3633 |
|
147 | 147 | |/ Predecessors: 1:471f378eab4c |
|
148 | 148 | | semi-colon: 1:471f378eab4c |
|
149 | 149 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
150 | 150 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
151 | 151 | | Successors: 4:d004c8f274b9 |
|
152 | 152 | | multi-line: 4:d004c8f274b9 |
|
153 | 153 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
154 | 154 | | x f137d23bb3e1 |
|
155 | 155 | | | |
|
156 | 156 | | x 471f378eab4c |
|
157 | 157 | |/ Successors: 3:a468dc9b3633 |
|
158 | 158 | | multi-line: 3:a468dc9b3633 |
|
159 | 159 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
|
160 | 160 | o ea207398892e |
|
161 | 161 | |
|
162 | 162 | $ hg fatelog --hidden -q |
|
163 | 163 | o d004c8f274b9 |
|
164 | 164 | | |
|
165 | 165 | | @ a468dc9b3633 |
|
166 | 166 | |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
|
167 | 167 | | x f137d23bb3e1 |
|
168 | 168 | | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000); |
|
169 | 169 | | x 471f378eab4c |
|
170 | 170 | |/ Obsfate: rewritten as 3:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |
|
171 | 171 | o ea207398892e |
|
172 | 172 | |
|
173 | 173 | |
|
174 | 174 | Predecessors template shouldn't show anything as all obsolete commit are not |
|
175 | 175 | visible. |
|
176 | 176 | $ hg up 'desc(A2)' |
|
177 | 177 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
178 | 178 | $ hg tlog |
|
179 | 179 | @ d004c8f274b9 |
|
180 | 180 | | |
|
181 | 181 | o ea207398892e |
|
182 | 182 | |
|
183 | 183 | $ hg tlog --hidden |
|
184 | 184 | @ d004c8f274b9 |
|
185 | 185 | | Predecessors: 3:a468dc9b3633 |
|
186 | 186 | | semi-colon: 3:a468dc9b3633 |
|
187 | 187 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
188 | 188 | | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
189 | 189 | | x a468dc9b3633 |
|
190 | 190 | |/ Predecessors: 1:471f378eab4c |
|
191 | 191 | | semi-colon: 1:471f378eab4c |
|
192 | 192 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
193 | 193 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
194 | 194 | | Successors: 4:d004c8f274b9 |
|
195 | 195 | | multi-line: 4:d004c8f274b9 |
|
196 | 196 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
197 | 197 | | x f137d23bb3e1 |
|
198 | 198 | | | |
|
199 | 199 | | x 471f378eab4c |
|
200 | 200 | |/ Successors: 3:a468dc9b3633 |
|
201 | 201 | | multi-line: 3:a468dc9b3633 |
|
202 | 202 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
|
203 | 203 | o ea207398892e |
|
204 | 204 | |
|
205 | 205 | $ hg fatelog -v |
|
206 | 206 | @ d004c8f274b9 |
|
207 | 207 | | |
|
208 | 208 | o ea207398892e |
|
209 | 209 | |
|
210 | 210 | |
|
211 | 211 | $ hg fatelog -v --hidden |
|
212 | 212 | @ d004c8f274b9 |
|
213 | 213 | | |
|
214 | 214 | | x a468dc9b3633 |
|
215 | 215 | |/ Obsfate: rewritten as 4:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
|
216 | 216 | | x f137d23bb3e1 |
|
217 | 217 | | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000); |
|
218 | 218 | | x 471f378eab4c |
|
219 | 219 | |/ Obsfate: rewritten as 3:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |
|
220 | 220 | o ea207398892e |
|
221 | 221 | |
|
222 | 222 | $ hg fatelogjson --hidden |
|
223 | 223 | @ d004c8f274b9 |
|
224 | 224 | | |
|
225 | 225 | | x a468dc9b3633 |
|
226 | 226 | |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] |
|
227 | 227 | | x f137d23bb3e1 |
|
228 | 228 | | | Obsfate: [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["user", "test1"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "successors": []}] |
|
229 | 229 | | x 471f378eab4c |
|
230 | 230 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["user", "test1"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] |
|
231 | 231 | o ea207398892e |
|
232 | 232 | |
|
233 | 233 | Test templates with splitted commit |
|
234 | 234 | =================================== |
|
235 | 235 | |
|
236 | 236 | $ hg init $TESTTMP/templates-local-split |
|
237 | 237 | $ cd $TESTTMP/templates-local-split |
|
238 | 238 | $ mkcommit ROOT |
|
239 | 239 | $ echo 42 >> a |
|
240 | 240 | $ echo 43 >> b |
|
241 | 241 | $ hg commit -A -m "A0" |
|
242 | 242 | adding a |
|
243 | 243 | adding b |
|
244 | 244 | $ hg log --hidden -G |
|
245 | 245 | @ changeset: 1:471597cad322 |
|
246 | 246 | | tag: tip |
|
247 | 247 | | user: test |
|
248 | 248 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
249 | 249 | | summary: A0 |
|
250 | 250 | | |
|
251 | 251 | o changeset: 0:ea207398892e |
|
252 | 252 | user: test |
|
253 | 253 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
254 | 254 | summary: ROOT |
|
255 | 255 | |
|
256 | 256 | # Simulate split |
|
257 | 257 | $ hg up -r "desc(ROOT)" |
|
258 | 258 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
259 | 259 | $ echo 42 >> a |
|
260 | 260 | $ hg commit -A -m "A0" |
|
261 | 261 | adding a |
|
262 | 262 | created new head |
|
263 | 263 | $ echo 43 >> b |
|
264 | 264 | $ hg commit -A -m "A0" |
|
265 | 265 | adding b |
|
266 | 266 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
|
267 | 267 | obsoleted 1 changesets |
|
268 | 268 | |
|
269 | 269 | $ hg log --hidden -G |
|
270 | 270 | @ changeset: 3:f257fde29c7a |
|
271 | 271 | | tag: tip |
|
272 | 272 | | user: test |
|
273 | 273 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
274 | 274 | | summary: A0 |
|
275 | 275 | | |
|
276 | 276 | o changeset: 2:337fec4d2edc |
|
277 | 277 | | parent: 0:ea207398892e |
|
278 | 278 | | user: test |
|
279 | 279 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
280 | 280 | | summary: A0 |
|
281 | 281 | | |
|
282 | 282 | | x changeset: 1:471597cad322 |
|
283 | 283 | |/ user: test |
|
284 | 284 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
285 | 285 | | summary: A0 |
|
286 | 286 | | |
|
287 | 287 | o changeset: 0:ea207398892e |
|
288 | 288 | user: test |
|
289 | 289 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
290 | 290 | summary: ROOT |
|
291 | 291 | |
|
292 | 292 | Check templates |
|
293 | 293 | --------------- |
|
294 | 294 | |
|
295 | 295 | $ hg up 'obsolete()' --hidden |
|
296 | 296 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
297 | 297 | |
|
298 | 298 | Predecessors template should show current revision as it is the working copy |
|
299 | 299 | $ hg tlog |
|
300 | 300 | o f257fde29c7a |
|
301 | 301 | | Predecessors: 1:471597cad322 |
|
302 | 302 | | semi-colon: 1:471597cad322 |
|
303 | 303 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
304 | 304 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
305 | 305 | o 337fec4d2edc |
|
306 | 306 | | Predecessors: 1:471597cad322 |
|
307 | 307 | | semi-colon: 1:471597cad322 |
|
308 | 308 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
309 | 309 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
310 | 310 | | @ 471597cad322 |
|
311 | 311 | |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
|
312 | 312 | | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
|
313 | 313 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
|
314 | 314 | o ea207398892e |
|
315 | 315 | |
|
316 | 316 | |
|
317 | 317 | $ hg fatelog |
|
318 | 318 | o f257fde29c7a |
|
319 | 319 | | |
|
320 | 320 | o 337fec4d2edc |
|
321 | 321 | | |
|
322 | 322 | | @ 471597cad322 |
|
323 | 323 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000); |
|
324 | 324 | o ea207398892e |
|
325 | 325 | |
|
326 | 326 | $ hg up f257fde29c7a |
|
327 | 327 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
328 | 328 | |
|
329 | 329 | Predecessors template should not show a predecessor as it's not displayed in |
|
330 | 330 | the log |
|
331 | 331 | $ hg tlog |
|
332 | 332 | @ f257fde29c7a |
|
333 | 333 | | |
|
334 | 334 | o 337fec4d2edc |
|
335 | 335 | | |
|
336 | 336 | o ea207398892e |
|
337 | 337 | |
|
338 | 338 | Predecessors template should show both predecessors as we force their display |
|
339 | 339 | with --hidden |
|
340 | 340 | $ hg tlog --hidden |
|
341 | 341 | @ f257fde29c7a |
|
342 | 342 | | Predecessors: 1:471597cad322 |
|
343 | 343 | | semi-colon: 1:471597cad322 |
|
344 | 344 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
345 | 345 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
346 | 346 | o 337fec4d2edc |
|
347 | 347 | | Predecessors: 1:471597cad322 |
|
348 | 348 | | semi-colon: 1:471597cad322 |
|
349 | 349 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
350 | 350 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
351 | 351 | | x 471597cad322 |
|
352 | 352 | |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
|
353 | 353 | | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
|
354 | 354 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
|
355 | 355 | o ea207398892e |
|
356 | 356 | |
|
357 | 357 | |
|
358 | 358 | $ hg fatelog --hidden |
|
359 | 359 | @ f257fde29c7a |
|
360 | 360 | | |
|
361 | 361 | o 337fec4d2edc |
|
362 | 362 | | |
|
363 | 363 | | x 471597cad322 |
|
364 | 364 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000); |
|
365 | 365 | o ea207398892e |
|
366 | 366 | |
|
367 | 367 | $ hg fatelogjson --hidden |
|
368 | 368 | @ f257fde29c7a |
|
369 | 369 | | |
|
370 | 370 | o 337fec4d2edc |
|
371 | 371 | | |
|
372 | 372 | | x 471597cad322 |
|
373 | 373 | |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}] |
|
374 | 374 | o ea207398892e |
|
375 | 375 | |
|
376 | 376 | Test templates with folded commit |
|
377 | 377 | ================================= |
|
378 | 378 | |
|
379 | 379 | Test setup |
|
380 | 380 | ---------- |
|
381 | 381 | |
|
382 | 382 | $ hg init $TESTTMP/templates-local-fold |
|
383 | 383 | $ cd $TESTTMP/templates-local-fold |
|
384 | 384 | $ mkcommit ROOT |
|
385 | 385 | $ mkcommit A0 |
|
386 | 386 | $ mkcommit B0 |
|
387 | 387 | $ hg log --hidden -G |
|
388 | 388 | @ changeset: 2:0dec01379d3b |
|
389 | 389 | | tag: tip |
|
390 | 390 | | user: test |
|
391 | 391 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
392 | 392 | | summary: B0 |
|
393 | 393 | | |
|
394 | 394 | o changeset: 1:471f378eab4c |
|
395 | 395 | | user: test |
|
396 | 396 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
397 | 397 | | summary: A0 |
|
398 | 398 | | |
|
399 | 399 | o changeset: 0:ea207398892e |
|
400 | 400 | user: test |
|
401 | 401 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
402 | 402 | summary: ROOT |
|
403 | 403 | |
|
404 | 404 | Simulate a fold |
|
405 | 405 | $ hg up -r "desc(ROOT)" |
|
406 | 406 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
407 | 407 | $ echo "A0" > A0 |
|
408 | 408 | $ echo "B0" > B0 |
|
409 | 409 | $ hg commit -A -m "C0" |
|
410 | 410 | adding A0 |
|
411 | 411 | adding B0 |
|
412 | 412 | created new head |
|
413 | 413 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
|
414 | 414 | obsoleted 1 changesets |
|
415 | 415 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
416 | 416 | obsoleted 1 changesets |
|
417 | 417 | |
|
418 | 418 | $ hg log --hidden -G |
|
419 | 419 | @ changeset: 3:eb5a0daa2192 |
|
420 | 420 | | tag: tip |
|
421 | 421 | | parent: 0:ea207398892e |
|
422 | 422 | | user: test |
|
423 | 423 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
424 | 424 | | summary: C0 |
|
425 | 425 | | |
|
426 | 426 | | x changeset: 2:0dec01379d3b |
|
427 | 427 | | | user: test |
|
428 | 428 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
429 | 429 | | | summary: B0 |
|
430 | 430 | | | |
|
431 | 431 | | x changeset: 1:471f378eab4c |
|
432 | 432 | |/ user: test |
|
433 | 433 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
434 | 434 | | summary: A0 |
|
435 | 435 | | |
|
436 | 436 | o changeset: 0:ea207398892e |
|
437 | 437 | user: test |
|
438 | 438 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
439 | 439 | summary: ROOT |
|
440 | 440 | |
|
441 | 441 | Check templates |
|
442 | 442 | --------------- |
|
443 | 443 | |
|
444 | 444 | $ hg up 'desc(A0)' --hidden |
|
445 | 445 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
446 | 446 | |
|
447 | 447 | Predecessors template should show current revision as it is the working copy |
|
448 | 448 | $ hg tlog |
|
449 | 449 | o eb5a0daa2192 |
|
450 | 450 | | Predecessors: 1:471f378eab4c |
|
451 | 451 | | semi-colon: 1:471f378eab4c |
|
452 | 452 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
453 | 453 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
454 | 454 | | @ 471f378eab4c |
|
455 | 455 | |/ Successors: 3:eb5a0daa2192 |
|
456 | 456 | | multi-line: 3:eb5a0daa2192 |
|
457 | 457 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
458 | 458 | o ea207398892e |
|
459 | 459 | |
|
460 | 460 | |
|
461 | 461 | $ hg fatelog |
|
462 | 462 | o eb5a0daa2192 |
|
463 | 463 | | |
|
464 | 464 | | @ 471f378eab4c |
|
465 | 465 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
466 | 466 | o ea207398892e |
|
467 | 467 | |
|
468 | 468 | $ hg up 'desc(B0)' --hidden |
|
469 | 469 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
470 | 470 | |
|
471 | 471 | Predecessors template should show both predecessors as they should be both |
|
472 | 472 | displayed |
|
473 | 473 | $ hg tlog |
|
474 | 474 | o eb5a0daa2192 |
|
475 | 475 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
|
476 | 476 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
|
477 | 477 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
478 | 478 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
479 | 479 | | @ 0dec01379d3b |
|
480 | 480 | | | Successors: 3:eb5a0daa2192 |
|
481 | 481 | | | multi-line: 3:eb5a0daa2192 |
|
482 | 482 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
483 | 483 | | x 471f378eab4c |
|
484 | 484 | |/ Successors: 3:eb5a0daa2192 |
|
485 | 485 | | multi-line: 3:eb5a0daa2192 |
|
486 | 486 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
487 | 487 | o ea207398892e |
|
488 | 488 | |
|
489 | 489 | |
|
490 | 490 | $ hg fatelog |
|
491 | 491 | o eb5a0daa2192 |
|
492 | 492 | | |
|
493 | 493 | | @ 0dec01379d3b |
|
494 | 494 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
495 | 495 | | x 471f378eab4c |
|
496 | 496 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
497 | 497 | o ea207398892e |
|
498 | 498 | |
|
499 | 499 | $ hg up 'desc(C0)' |
|
500 | 500 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
501 | 501 | |
|
502 | 502 | Predecessors template should not show predecessors as they are not displayed in |
|
503 | 503 | the log |
|
504 | 504 | $ hg tlog |
|
505 | 505 | @ eb5a0daa2192 |
|
506 | 506 | | |
|
507 | 507 | o ea207398892e |
|
508 | 508 | |
|
509 | 509 | Predecessors template should show both predecessors as we force their display |
|
510 | 510 | with --hidden |
|
511 | 511 | $ hg tlog --hidden |
|
512 | 512 | @ eb5a0daa2192 |
|
513 | 513 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
|
514 | 514 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
|
515 | 515 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
516 | 516 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
517 | 517 | | x 0dec01379d3b |
|
518 | 518 | | | Successors: 3:eb5a0daa2192 |
|
519 | 519 | | | multi-line: 3:eb5a0daa2192 |
|
520 | 520 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
521 | 521 | | x 471f378eab4c |
|
522 | 522 | |/ Successors: 3:eb5a0daa2192 |
|
523 | 523 | | multi-line: 3:eb5a0daa2192 |
|
524 | 524 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
525 | 525 | o ea207398892e |
|
526 | 526 | |
|
527 | 527 | |
|
528 | 528 | $ hg fatelog --hidden |
|
529 | 529 | @ eb5a0daa2192 |
|
530 | 530 | | |
|
531 | 531 | | x 0dec01379d3b |
|
532 | 532 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
533 | 533 | | x 471f378eab4c |
|
534 | 534 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
535 | 535 | o ea207398892e |
|
536 | 536 | |
|
537 | 537 | |
|
538 | 538 | $ hg fatelogjson --hidden |
|
539 | 539 | @ eb5a0daa2192 |
|
540 | 540 | | |
|
541 | 541 | | x 0dec01379d3b |
|
542 | 542 | | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
543 | 543 | | x 471f378eab4c |
|
544 | 544 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
545 | 545 | o ea207398892e |
|
546 | 546 | |
|
547 | 547 | |
|
548 | 548 | Test templates with divergence |
|
549 | 549 | ============================== |
|
550 | 550 | |
|
551 | 551 | Test setup |
|
552 | 552 | ---------- |
|
553 | 553 | |
|
554 | 554 | $ hg init $TESTTMP/templates-local-divergence |
|
555 | 555 | $ cd $TESTTMP/templates-local-divergence |
|
556 | 556 | $ mkcommit ROOT |
|
557 | 557 | $ mkcommit A0 |
|
558 | 558 | $ hg commit --amend -m "A1" |
|
559 | 559 | $ hg log --hidden -G |
|
560 | 560 | @ changeset: 2:fdf9bde5129a |
|
561 | 561 | | tag: tip |
|
562 | 562 | | parent: 0:ea207398892e |
|
563 | 563 | | user: test |
|
564 | 564 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
565 | 565 | | summary: A1 |
|
566 | 566 | | |
|
567 | 567 | | x changeset: 1:471f378eab4c |
|
568 | 568 | |/ user: test |
|
569 | 569 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
570 | 570 | | summary: A0 |
|
571 | 571 | | |
|
572 | 572 | o changeset: 0:ea207398892e |
|
573 | 573 | user: test |
|
574 | 574 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
575 | 575 | summary: ROOT |
|
576 | 576 | |
|
577 | 577 | $ hg update --hidden 'desc(A0)' |
|
578 | 578 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
579 | 579 | $ hg commit --amend -m "A2" |
|
580 | 580 | $ hg log --hidden -G |
|
581 | 581 | @ changeset: 3:65b757b745b9 |
|
582 | 582 | | tag: tip |
|
583 | 583 | | parent: 0:ea207398892e |
|
584 | 584 | | user: test |
|
585 | 585 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
586 | 586 | | instability: content-divergent |
|
587 | 587 | | summary: A2 |
|
588 | 588 | | |
|
589 | 589 | | o changeset: 2:fdf9bde5129a |
|
590 | 590 | |/ parent: 0:ea207398892e |
|
591 | 591 | | user: test |
|
592 | 592 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
593 | 593 | | instability: content-divergent |
|
594 | 594 | | summary: A1 |
|
595 | 595 | | |
|
596 | 596 | | x changeset: 1:471f378eab4c |
|
597 | 597 | |/ user: test |
|
598 | 598 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
599 | 599 | | summary: A0 |
|
600 | 600 | | |
|
601 | 601 | o changeset: 0:ea207398892e |
|
602 | 602 | user: test |
|
603 | 603 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
604 | 604 | summary: ROOT |
|
605 | 605 | |
|
606 | 606 | $ hg commit --amend -m 'A3' |
|
607 | 607 | $ hg log --hidden -G |
|
608 | 608 | @ changeset: 4:019fadeab383 |
|
609 | 609 | | tag: tip |
|
610 | 610 | | parent: 0:ea207398892e |
|
611 | 611 | | user: test |
|
612 | 612 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
613 | 613 | | instability: content-divergent |
|
614 | 614 | | summary: A3 |
|
615 | 615 | | |
|
616 | 616 | | x changeset: 3:65b757b745b9 |
|
617 | 617 | |/ parent: 0:ea207398892e |
|
618 | 618 | | user: test |
|
619 | 619 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
620 | 620 | | summary: A2 |
|
621 | 621 | | |
|
622 | 622 | | o changeset: 2:fdf9bde5129a |
|
623 | 623 | |/ parent: 0:ea207398892e |
|
624 | 624 | | user: test |
|
625 | 625 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
626 | 626 | | instability: content-divergent |
|
627 | 627 | | summary: A1 |
|
628 | 628 | | |
|
629 | 629 | | x changeset: 1:471f378eab4c |
|
630 | 630 | |/ user: test |
|
631 | 631 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
632 | 632 | | summary: A0 |
|
633 | 633 | | |
|
634 | 634 | o changeset: 0:ea207398892e |
|
635 | 635 | user: test |
|
636 | 636 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
637 | 637 | summary: ROOT |
|
638 | 638 | |
|
639 | 639 | |
|
640 | 640 | Check templates |
|
641 | 641 | --------------- |
|
642 | 642 | |
|
643 | 643 | $ hg up 'desc(A0)' --hidden |
|
644 | 644 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
645 | 645 | |
|
646 | 646 | Predecessors template should show current revision as it is the working copy |
|
647 | 647 | $ hg tlog |
|
648 | 648 | o 019fadeab383 |
|
649 | 649 | | Predecessors: 1:471f378eab4c |
|
650 | 650 | | semi-colon: 1:471f378eab4c |
|
651 | 651 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
652 | 652 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
653 | 653 | | o fdf9bde5129a |
|
654 | 654 | |/ Predecessors: 1:471f378eab4c |
|
655 | 655 | | semi-colon: 1:471f378eab4c |
|
656 | 656 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
657 | 657 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
658 | 658 | | @ 471f378eab4c |
|
659 | 659 | |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
|
660 | 660 | | multi-line: 2:fdf9bde5129a |
|
661 | 661 | | multi-line: 4:019fadeab383 |
|
662 | 662 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
|
663 | 663 | o ea207398892e |
|
664 | 664 | |
|
665 | 665 | $ hg fatelog |
|
666 | 666 | o 019fadeab383 |
|
667 | 667 | | |
|
668 | 668 | | o fdf9bde5129a |
|
669 | 669 | |/ |
|
670 | 670 | | @ 471f378eab4c |
|
671 | 671 | |/ 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); |
|
672 | 672 | o ea207398892e |
|
673 | 673 | |
|
674 | 674 | $ hg up 'desc(A1)' |
|
675 | 675 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
676 | 676 | |
|
677 | 677 | Predecessors template should not show predecessors as they are not displayed in |
|
678 | 678 | the log |
|
679 | 679 | $ hg tlog |
|
680 | 680 | o 019fadeab383 |
|
681 | 681 | | |
|
682 | 682 | | @ fdf9bde5129a |
|
683 | 683 | |/ |
|
684 | 684 | o ea207398892e |
|
685 | 685 | |
|
686 | 686 | |
|
687 | 687 | $ hg fatelog |
|
688 | 688 | o 019fadeab383 |
|
689 | 689 | | |
|
690 | 690 | | @ fdf9bde5129a |
|
691 | 691 | |/ |
|
692 | 692 | o ea207398892e |
|
693 | 693 | |
|
694 | 694 | Predecessors template should the predecessors as we force their display with |
|
695 | 695 | --hidden |
|
696 | 696 | $ hg tlog --hidden |
|
697 | 697 | o 019fadeab383 |
|
698 | 698 | | Predecessors: 3:65b757b745b9 |
|
699 | 699 | | semi-colon: 3:65b757b745b9 |
|
700 | 700 | | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] |
|
701 | 701 | | map: 3:65b757b745b935093c87a2bccd877521cccffcbd |
|
702 | 702 | | x 65b757b745b9 |
|
703 | 703 | |/ Predecessors: 1:471f378eab4c |
|
704 | 704 | | semi-colon: 1:471f378eab4c |
|
705 | 705 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
706 | 706 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
707 | 707 | | Successors: 4:019fadeab383 |
|
708 | 708 | | multi-line: 4:019fadeab383 |
|
709 | 709 | | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
|
710 | 710 | | @ fdf9bde5129a |
|
711 | 711 | |/ Predecessors: 1:471f378eab4c |
|
712 | 712 | | semi-colon: 1:471f378eab4c |
|
713 | 713 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
714 | 714 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
715 | 715 | | x 471f378eab4c |
|
716 | 716 | |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
|
717 | 717 | | multi-line: 2:fdf9bde5129a |
|
718 | 718 | | multi-line: 3:65b757b745b9 |
|
719 | 719 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] |
|
720 | 720 | o ea207398892e |
|
721 | 721 | |
|
722 | 722 | |
|
723 | 723 | $ hg fatelog --hidden |
|
724 | 724 | o 019fadeab383 |
|
725 | 725 | | |
|
726 | 726 | | x 65b757b745b9 |
|
727 | 727 | |/ Obsfate: rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
|
728 | 728 | | @ fdf9bde5129a |
|
729 | 729 | |/ |
|
730 | 730 | | x 471f378eab4c |
|
731 | 731 | |/ 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); |
|
732 | 732 | o ea207398892e |
|
733 | 733 | |
|
734 | 734 | |
|
735 | 735 | $ hg fatelogjson --hidden |
|
736 | 736 | o 019fadeab383 |
|
737 | 737 | | |
|
738 | 738 | | x 65b757b745b9 |
|
739 | 739 | |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}] |
|
740 | 740 | | @ fdf9bde5129a |
|
741 | 741 | |/ |
|
742 | 742 | | x 471f378eab4c |
|
743 | 743 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}] |
|
744 | 744 | o ea207398892e |
|
745 | 745 | |
|
746 | 746 | |
|
747 | 747 | Test templates with amended + folded commit |
|
748 | 748 | =========================================== |
|
749 | 749 | |
|
750 | 750 | Test setup |
|
751 | 751 | ---------- |
|
752 | 752 | |
|
753 | 753 | $ hg init $TESTTMP/templates-local-amend-fold |
|
754 | 754 | $ cd $TESTTMP/templates-local-amend-fold |
|
755 | 755 | $ mkcommit ROOT |
|
756 | 756 | $ mkcommit A0 |
|
757 | 757 | $ mkcommit B0 |
|
758 | 758 | $ hg commit --amend -m "B1" |
|
759 | 759 | $ hg log --hidden -G |
|
760 | 760 | @ changeset: 3:b7ea6d14e664 |
|
761 | 761 | | tag: tip |
|
762 | 762 | | parent: 1:471f378eab4c |
|
763 | 763 | | user: test |
|
764 | 764 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
765 | 765 | | summary: B1 |
|
766 | 766 | | |
|
767 | 767 | | x changeset: 2:0dec01379d3b |
|
768 | 768 | |/ user: test |
|
769 | 769 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
770 | 770 | | summary: B0 |
|
771 | 771 | | |
|
772 | 772 | o changeset: 1:471f378eab4c |
|
773 | 773 | | user: test |
|
774 | 774 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
775 | 775 | | summary: A0 |
|
776 | 776 | | |
|
777 | 777 | o changeset: 0:ea207398892e |
|
778 | 778 | user: test |
|
779 | 779 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
780 | 780 | summary: ROOT |
|
781 | 781 | |
|
782 | 782 | # Simulate a fold |
|
783 | 783 | $ hg up -r "desc(ROOT)" |
|
784 | 784 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
785 | 785 | $ echo "A0" > A0 |
|
786 | 786 | $ echo "B0" > B0 |
|
787 | 787 | $ hg commit -A -m "C0" |
|
788 | 788 | adding A0 |
|
789 | 789 | adding B0 |
|
790 | 790 | created new head |
|
791 | 791 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
|
792 | 792 | obsoleted 1 changesets |
|
793 | 793 | $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` |
|
794 | 794 | obsoleted 1 changesets |
|
795 | 795 | |
|
796 | 796 | $ hg log --hidden -G |
|
797 | 797 | @ changeset: 4:eb5a0daa2192 |
|
798 | 798 | | tag: tip |
|
799 | 799 | | parent: 0:ea207398892e |
|
800 | 800 | | user: test |
|
801 | 801 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
802 | 802 | | summary: C0 |
|
803 | 803 | | |
|
804 | 804 | | x changeset: 3:b7ea6d14e664 |
|
805 | 805 | | | parent: 1:471f378eab4c |
|
806 | 806 | | | user: test |
|
807 | 807 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
808 | 808 | | | summary: B1 |
|
809 | 809 | | | |
|
810 | 810 | | | x changeset: 2:0dec01379d3b |
|
811 | 811 | | |/ user: test |
|
812 | 812 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
813 | 813 | | | summary: B0 |
|
814 | 814 | | | |
|
815 | 815 | | x changeset: 1:471f378eab4c |
|
816 | 816 | |/ user: test |
|
817 | 817 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
818 | 818 | | summary: A0 |
|
819 | 819 | | |
|
820 | 820 | o changeset: 0:ea207398892e |
|
821 | 821 | user: test |
|
822 | 822 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
823 | 823 | summary: ROOT |
|
824 | 824 | |
|
825 | 825 | Check templates |
|
826 | 826 | --------------- |
|
827 | 827 | |
|
828 | 828 | $ hg up 'desc(A0)' --hidden |
|
829 | 829 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
830 | 830 | |
|
831 | 831 | Predecessors template should show current revision as it is the working copy |
|
832 | 832 | $ hg tlog |
|
833 | 833 | o eb5a0daa2192 |
|
834 | 834 | | Predecessors: 1:471f378eab4c |
|
835 | 835 | | semi-colon: 1:471f378eab4c |
|
836 | 836 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
837 | 837 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
838 | 838 | | @ 471f378eab4c |
|
839 | 839 | |/ Successors: 4:eb5a0daa2192 |
|
840 | 840 | | multi-line: 4:eb5a0daa2192 |
|
841 | 841 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
842 | 842 | o ea207398892e |
|
843 | 843 | |
|
844 | 844 | |
|
845 | 845 | $ hg fatelog |
|
846 | 846 | o eb5a0daa2192 |
|
847 | 847 | | |
|
848 | 848 | | @ 471f378eab4c |
|
849 | 849 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
850 | 850 | o ea207398892e |
|
851 | 851 | |
|
852 | 852 | $ hg up 'desc(B0)' --hidden |
|
853 | 853 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
854 | 854 | |
|
855 | 855 | Predecessors template should both predecessors as they are visible |
|
856 | 856 | $ hg tlog |
|
857 | 857 | o eb5a0daa2192 |
|
858 | 858 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
|
859 | 859 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
|
860 | 860 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
861 | 861 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
862 | 862 | | @ 0dec01379d3b |
|
863 | 863 | | | Successors: 4:eb5a0daa2192 |
|
864 | 864 | | | multi-line: 4:eb5a0daa2192 |
|
865 | 865 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
866 | 866 | | x 471f378eab4c |
|
867 | 867 | |/ Successors: 4:eb5a0daa2192 |
|
868 | 868 | | multi-line: 4:eb5a0daa2192 |
|
869 | 869 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
870 | 870 | o ea207398892e |
|
871 | 871 | |
|
872 | 872 | |
|
873 | 873 | $ hg fatelog |
|
874 | 874 | o eb5a0daa2192 |
|
875 | 875 | | |
|
876 | 876 | | @ 0dec01379d3b |
|
877 | 877 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
878 | 878 | | x 471f378eab4c |
|
879 | 879 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
880 | 880 | o ea207398892e |
|
881 | 881 | |
|
882 | 882 | $ hg up 'desc(B1)' --hidden |
|
883 | 883 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
884 | 884 | |
|
885 | 885 | Predecessors template should both predecessors as they are visible |
|
886 | 886 | $ hg tlog |
|
887 | 887 | o eb5a0daa2192 |
|
888 | 888 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
|
889 | 889 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
|
890 | 890 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
|
891 | 891 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
|
892 | 892 | | @ b7ea6d14e664 |
|
893 | 893 | | | Successors: 4:eb5a0daa2192 |
|
894 | 894 | | | multi-line: 4:eb5a0daa2192 |
|
895 | 895 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
896 | 896 | | x 471f378eab4c |
|
897 | 897 | |/ Successors: 4:eb5a0daa2192 |
|
898 | 898 | | multi-line: 4:eb5a0daa2192 |
|
899 | 899 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
900 | 900 | o ea207398892e |
|
901 | 901 | |
|
902 | 902 | |
|
903 | 903 | $ hg fatelog |
|
904 | 904 | o eb5a0daa2192 |
|
905 | 905 | | |
|
906 | 906 | | @ b7ea6d14e664 |
|
907 | 907 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
908 | 908 | | x 471f378eab4c |
|
909 | 909 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
910 | 910 | o ea207398892e |
|
911 | 911 | |
|
912 | 912 | $ hg up 'desc(C0)' |
|
913 | 913 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
914 | 914 | |
|
915 | 915 | Predecessors template should show no predecessors as they are both non visible |
|
916 | 916 | $ hg tlog |
|
917 | 917 | @ eb5a0daa2192 |
|
918 | 918 | | |
|
919 | 919 | o ea207398892e |
|
920 | 920 | |
|
921 | 921 | |
|
922 | 922 | $ hg fatelog |
|
923 | 923 | @ eb5a0daa2192 |
|
924 | 924 | | |
|
925 | 925 | o ea207398892e |
|
926 | 926 | |
|
927 | 927 | Predecessors template should show all predecessors as we force their display |
|
928 | 928 | with --hidden |
|
929 | 929 | $ hg tlog --hidden |
|
930 | 930 | @ eb5a0daa2192 |
|
931 | 931 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
|
932 | 932 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
|
933 | 933 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
|
934 | 934 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
|
935 | 935 | | x b7ea6d14e664 |
|
936 | 936 | | | Predecessors: 2:0dec01379d3b |
|
937 | 937 | | | semi-colon: 2:0dec01379d3b |
|
938 | 938 | | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
939 | 939 | | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
940 | 940 | | | Successors: 4:eb5a0daa2192 |
|
941 | 941 | | | multi-line: 4:eb5a0daa2192 |
|
942 | 942 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
943 | 943 | | | x 0dec01379d3b |
|
944 | 944 | | |/ Successors: 3:b7ea6d14e664 |
|
945 | 945 | | | multi-line: 3:b7ea6d14e664 |
|
946 | 946 | | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]] |
|
947 | 947 | | x 471f378eab4c |
|
948 | 948 | |/ Successors: 4:eb5a0daa2192 |
|
949 | 949 | | multi-line: 4:eb5a0daa2192 |
|
950 | 950 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
951 | 951 | o ea207398892e |
|
952 | 952 | |
|
953 | 953 | |
|
954 | 954 | $ hg fatelog --hidden |
|
955 | 955 | @ eb5a0daa2192 |
|
956 | 956 | | |
|
957 | 957 | | x b7ea6d14e664 |
|
958 | 958 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
959 | 959 | | | x 0dec01379d3b |
|
960 | 960 | | |/ Obsfate: rewritten as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000); |
|
961 | 961 | | x 471f378eab4c |
|
962 | 962 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
963 | 963 | o ea207398892e |
|
964 | 964 | |
|
965 | 965 | |
|
966 | 966 | $ hg fatelogjson --hidden |
|
967 | 967 | @ eb5a0daa2192 |
|
968 | 968 | | |
|
969 | 969 | | x b7ea6d14e664 |
|
970 | 970 | | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
971 | 971 | | | x 0dec01379d3b |
|
972 | 972 | | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}] |
|
973 | 973 | | x 471f378eab4c |
|
974 | 974 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
975 | 975 | o ea207398892e |
|
976 | 976 | |
|
977 | 977 | |
|
978 | 978 | Test template with pushed and pulled obs markers |
|
979 | 979 | ================================================ |
|
980 | 980 | |
|
981 | 981 | Test setup |
|
982 | 982 | ---------- |
|
983 | 983 | |
|
984 | 984 | $ hg init $TESTTMP/templates-local-remote-markers-1 |
|
985 | 985 | $ cd $TESTTMP/templates-local-remote-markers-1 |
|
986 | 986 | $ mkcommit ROOT |
|
987 | 987 | $ mkcommit A0 |
|
988 | 988 | $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2 |
|
989 | 989 | updating to branch default |
|
990 | 990 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
991 | 991 | $ cd $TESTTMP/templates-local-remote-markers-2 |
|
992 | 992 | $ hg log --hidden -G |
|
993 | 993 | @ changeset: 1:471f378eab4c |
|
994 | 994 | | tag: tip |
|
995 | 995 | | user: test |
|
996 | 996 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
997 | 997 | | summary: A0 |
|
998 | 998 | | |
|
999 | 999 | o changeset: 0:ea207398892e |
|
1000 | 1000 | user: test |
|
1001 | 1001 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1002 | 1002 | summary: ROOT |
|
1003 | 1003 | |
|
1004 | 1004 | $ cd $TESTTMP/templates-local-remote-markers-1 |
|
1005 | 1005 | $ hg commit --amend -m "A1" |
|
1006 | 1006 | $ hg commit --amend -m "A2" |
|
1007 | 1007 | $ hg log --hidden -G |
|
1008 | 1008 | @ changeset: 3:7a230b46bf61 |
|
1009 | 1009 | | tag: tip |
|
1010 | 1010 | | parent: 0:ea207398892e |
|
1011 | 1011 | | user: test |
|
1012 | 1012 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1013 | 1013 | | summary: A2 |
|
1014 | 1014 | | |
|
1015 | 1015 | | x changeset: 2:fdf9bde5129a |
|
1016 | 1016 | |/ parent: 0:ea207398892e |
|
1017 | 1017 | | user: test |
|
1018 | 1018 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1019 | 1019 | | summary: A1 |
|
1020 | 1020 | | |
|
1021 | 1021 | | x changeset: 1:471f378eab4c |
|
1022 | 1022 | |/ user: test |
|
1023 | 1023 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1024 | 1024 | | summary: A0 |
|
1025 | 1025 | | |
|
1026 | 1026 | o changeset: 0:ea207398892e |
|
1027 | 1027 | user: test |
|
1028 | 1028 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1029 | 1029 | summary: ROOT |
|
1030 | 1030 | |
|
1031 | 1031 | $ cd $TESTTMP/templates-local-remote-markers-2 |
|
1032 | 1032 | $ hg pull |
|
1033 | 1033 | pulling from $TESTTMP/templates-local-remote-markers-1 (glob) |
|
1034 | 1034 | searching for changes |
|
1035 | 1035 | adding changesets |
|
1036 | 1036 | adding manifests |
|
1037 | 1037 | adding file changes |
|
1038 | 1038 | added 1 changesets with 0 changes to 1 files (+1 heads) |
|
1039 | 1039 | 2 new obsolescence markers |
|
1040 | 1040 | obsoleted 1 changesets |
|
1041 | 1041 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1042 | 1042 | $ hg log --hidden -G |
|
1043 | 1043 | o changeset: 2:7a230b46bf61 |
|
1044 | 1044 | | tag: tip |
|
1045 | 1045 | | parent: 0:ea207398892e |
|
1046 | 1046 | | user: test |
|
1047 | 1047 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1048 | 1048 | | summary: A2 |
|
1049 | 1049 | | |
|
1050 | 1050 | | @ changeset: 1:471f378eab4c |
|
1051 | 1051 | |/ user: test |
|
1052 | 1052 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1053 | 1053 | | summary: A0 |
|
1054 | 1054 | | |
|
1055 | 1055 | o changeset: 0:ea207398892e |
|
1056 | 1056 | user: test |
|
1057 | 1057 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1058 | 1058 | summary: ROOT |
|
1059 | 1059 | |
|
1060 | 1060 | |
|
1061 | 1061 | $ hg debugobsolete |
|
1062 | 1062 | 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1063 | 1063 | fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1064 | 1064 | |
|
1065 | 1065 | Check templates |
|
1066 | 1066 | --------------- |
|
1067 | 1067 | |
|
1068 | 1068 | Predecessors template should show current revision as it is the working copy |
|
1069 | 1069 | $ hg tlog |
|
1070 | 1070 | o 7a230b46bf61 |
|
1071 | 1071 | | Predecessors: 1:471f378eab4c |
|
1072 | 1072 | | semi-colon: 1:471f378eab4c |
|
1073 | 1073 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1074 | 1074 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1075 | 1075 | | @ 471f378eab4c |
|
1076 | 1076 | |/ Successors: 2:7a230b46bf61 |
|
1077 | 1077 | | multi-line: 2:7a230b46bf61 |
|
1078 | 1078 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
|
1079 | 1079 | o ea207398892e |
|
1080 | 1080 | |
|
1081 | 1081 | |
|
1082 | 1082 | $ hg fatelog |
|
1083 | 1083 | o 7a230b46bf61 |
|
1084 | 1084 | | |
|
1085 | 1085 | | @ 471f378eab4c |
|
1086 | 1086 | |/ Obsfate: rewritten as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |
|
1087 | 1087 | o ea207398892e |
|
1088 | 1088 | |
|
1089 | 1089 | $ hg up 'desc(A2)' |
|
1090 | 1090 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1091 | 1091 | |
|
1092 | 1092 | Predecessors template should show no predecessors as they are non visible |
|
1093 | 1093 | $ hg tlog |
|
1094 | 1094 | @ 7a230b46bf61 |
|
1095 | 1095 | | |
|
1096 | 1096 | o ea207398892e |
|
1097 | 1097 | |
|
1098 | 1098 | |
|
1099 | 1099 | $ hg fatelog |
|
1100 | 1100 | @ 7a230b46bf61 |
|
1101 | 1101 | | |
|
1102 | 1102 | o ea207398892e |
|
1103 | 1103 | |
|
1104 | 1104 | Predecessors template should show all predecessors as we force their display |
|
1105 | 1105 | with --hidden |
|
1106 | 1106 | $ hg tlog --hidden |
|
1107 | 1107 | @ 7a230b46bf61 |
|
1108 | 1108 | | Predecessors: 1:471f378eab4c |
|
1109 | 1109 | | semi-colon: 1:471f378eab4c |
|
1110 | 1110 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1111 | 1111 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1112 | 1112 | | x 471f378eab4c |
|
1113 | 1113 | |/ Successors: 2:7a230b46bf61 |
|
1114 | 1114 | | multi-line: 2:7a230b46bf61 |
|
1115 | 1115 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
|
1116 | 1116 | o ea207398892e |
|
1117 | 1117 | |
|
1118 | 1118 | |
|
1119 | 1119 | $ hg fatelog --hidden |
|
1120 | 1120 | @ 7a230b46bf61 |
|
1121 | 1121 | | |
|
1122 | 1122 | | x 471f378eab4c |
|
1123 | 1123 | |/ Obsfate: rewritten as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |
|
1124 | 1124 | o ea207398892e |
|
1125 | 1125 | |
|
1126 | 1126 | |
|
1127 | 1127 | Test template with obsmarkers cycle |
|
1128 | 1128 | =================================== |
|
1129 | 1129 | |
|
1130 | 1130 | Test setup |
|
1131 | 1131 | ---------- |
|
1132 | 1132 | |
|
1133 | 1133 | $ hg init $TESTTMP/templates-local-cycle |
|
1134 | 1134 | $ cd $TESTTMP/templates-local-cycle |
|
1135 | 1135 | $ mkcommit ROOT |
|
1136 | 1136 | $ mkcommit A0 |
|
1137 | 1137 | $ mkcommit B0 |
|
1138 | 1138 | $ hg up -r 0 |
|
1139 | 1139 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1140 | 1140 | $ mkcommit C0 |
|
1141 | 1141 | created new head |
|
1142 | 1142 | |
|
1143 | 1143 | Create the cycle |
|
1144 | 1144 | |
|
1145 | 1145 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
|
1146 | 1146 | obsoleted 1 changesets |
|
1147 | 1147 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
1148 | 1148 | obsoleted 1 changesets |
|
1149 | 1149 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
|
1150 | 1150 | |
|
1151 | 1151 | Check templates |
|
1152 | 1152 | --------------- |
|
1153 | 1153 | |
|
1154 | 1154 | $ hg tlog |
|
1155 | 1155 | @ f897c6137566 |
|
1156 | 1156 | | |
|
1157 | 1157 | o ea207398892e |
|
1158 | 1158 | |
|
1159 | 1159 | |
|
1160 | 1160 | $ hg fatelog |
|
1161 | 1161 | @ f897c6137566 |
|
1162 | 1162 | | |
|
1163 | 1163 | o ea207398892e |
|
1164 | 1164 | |
|
1165 | 1165 | |
|
1166 | 1166 | $ hg up -r "desc(B0)" --hidden |
|
1167 | 1167 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1168 | 1168 | $ hg tlog |
|
1169 | 1169 | o f897c6137566 |
|
1170 | 1170 | | Predecessors: 2:0dec01379d3b |
|
1171 | 1171 | | semi-colon: 2:0dec01379d3b |
|
1172 | 1172 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1173 | 1173 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1174 | 1174 | | @ 0dec01379d3b |
|
1175 | 1175 | | | Predecessors: 1:471f378eab4c |
|
1176 | 1176 | | | semi-colon: 1:471f378eab4c |
|
1177 | 1177 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1178 | 1178 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1179 | 1179 | | | Successors: 3:f897c6137566; 1:471f378eab4c |
|
1180 | 1180 | | | multi-line: 3:f897c6137566 |
|
1181 | 1181 | | | multi-line: 1:471f378eab4c |
|
1182 | 1182 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
|
1183 | 1183 | | x 471f378eab4c |
|
1184 | 1184 | |/ Predecessors: 2:0dec01379d3b |
|
1185 | 1185 | | semi-colon: 2:0dec01379d3b |
|
1186 | 1186 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1187 | 1187 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1188 | 1188 | | Successors: 2:0dec01379d3b |
|
1189 | 1189 | | multi-line: 2:0dec01379d3b |
|
1190 | 1190 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
|
1191 | 1191 | o ea207398892e |
|
1192 | 1192 | |
|
1193 | 1193 | |
|
1194 | 1194 | $ hg fatelog |
|
1195 | 1195 | o f897c6137566 |
|
1196 | 1196 | | |
|
1197 | 1197 | | @ 0dec01379d3b |
|
1198 | 1198 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000); |
|
1199 | 1199 | | x 471f378eab4c |
|
1200 | 1200 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000); |
|
1201 | 1201 | o ea207398892e |
|
1202 | 1202 | |
|
1203 | 1203 | |
|
1204 | 1204 | $ hg up -r "desc(A0)" --hidden |
|
1205 | 1205 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1206 | 1206 | $ hg tlog |
|
1207 | 1207 | o f897c6137566 |
|
1208 | 1208 | | Predecessors: 1:471f378eab4c |
|
1209 | 1209 | | semi-colon: 1:471f378eab4c |
|
1210 | 1210 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1211 | 1211 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1212 | 1212 | | @ 471f378eab4c |
|
1213 | 1213 | |/ |
|
1214 | 1214 | o ea207398892e |
|
1215 | 1215 | |
|
1216 | 1216 | |
|
1217 | 1217 | $ hg fatelog |
|
1218 | 1218 | o f897c6137566 |
|
1219 | 1219 | | |
|
1220 | 1220 | | @ 471f378eab4c |
|
1221 | 1221 | |/ Obsfate: pruned; |
|
1222 | 1222 | o ea207398892e |
|
1223 | 1223 | |
|
1224 | 1224 | |
|
1225 | 1225 | $ hg up -r "desc(ROOT)" --hidden |
|
1226 | 1226 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1227 | 1227 | $ hg tlog |
|
1228 | 1228 | o f897c6137566 |
|
1229 | 1229 | | |
|
1230 | 1230 | @ ea207398892e |
|
1231 | 1231 | |
|
1232 | 1232 | |
|
1233 | 1233 | $ hg fatelog |
|
1234 | 1234 | o f897c6137566 |
|
1235 | 1235 | | |
|
1236 | 1236 | @ ea207398892e |
|
1237 | 1237 | |
|
1238 | 1238 | |
|
1239 | 1239 | $ hg tlog --hidden |
|
1240 | 1240 | o f897c6137566 |
|
1241 | 1241 | | Predecessors: 2:0dec01379d3b |
|
1242 | 1242 | | semi-colon: 2:0dec01379d3b |
|
1243 | 1243 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1244 | 1244 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1245 | 1245 | | x 0dec01379d3b |
|
1246 | 1246 | | | Predecessors: 1:471f378eab4c |
|
1247 | 1247 | | | semi-colon: 1:471f378eab4c |
|
1248 | 1248 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1249 | 1249 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1250 | 1250 | | | Successors: 3:f897c6137566; 1:471f378eab4c |
|
1251 | 1251 | | | multi-line: 3:f897c6137566 |
|
1252 | 1252 | | | multi-line: 1:471f378eab4c |
|
1253 | 1253 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
|
1254 | 1254 | | x 471f378eab4c |
|
1255 | 1255 | |/ Predecessors: 2:0dec01379d3b |
|
1256 | 1256 | | semi-colon: 2:0dec01379d3b |
|
1257 | 1257 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1258 | 1258 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1259 | 1259 | | Successors: 2:0dec01379d3b |
|
1260 | 1260 | | multi-line: 2:0dec01379d3b |
|
1261 | 1261 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
|
1262 | 1262 | @ ea207398892e |
|
1263 | 1263 | |
|
1264 | 1264 | Test template with split + divergence with cycles |
|
1265 | 1265 | ================================================= |
|
1266 | 1266 | |
|
1267 | 1267 | $ hg log -G |
|
1268 | 1268 | o changeset: 3:f897c6137566 |
|
1269 | 1269 | | tag: tip |
|
1270 | 1270 | | parent: 0:ea207398892e |
|
1271 | 1271 | | user: test |
|
1272 | 1272 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1273 | 1273 | | summary: C0 |
|
1274 | 1274 | | |
|
1275 | 1275 | @ changeset: 0:ea207398892e |
|
1276 | 1276 | user: test |
|
1277 | 1277 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1278 | 1278 | summary: ROOT |
|
1279 | 1279 | |
|
1280 | 1280 | $ hg up |
|
1281 | 1281 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1282 | 1282 | |
|
1283 | 1283 | Create a commit with three files |
|
1284 | 1284 | $ touch A B C |
|
1285 | 1285 | $ hg commit -A -m "Add A,B,C" A B C |
|
1286 | 1286 | |
|
1287 | 1287 | Split it |
|
1288 | 1288 | $ hg up 3 |
|
1289 | 1289 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
1290 | 1290 | $ touch A |
|
1291 | 1291 | $ hg commit -A -m "Add A,B,C" A |
|
1292 | 1292 | created new head |
|
1293 | 1293 | |
|
1294 | 1294 | $ touch B |
|
1295 | 1295 | $ hg commit -A -m "Add A,B,C" B |
|
1296 | 1296 | |
|
1297 | 1297 | $ touch C |
|
1298 | 1298 | $ hg commit -A -m "Add A,B,C" C |
|
1299 | 1299 | |
|
1300 | 1300 | $ hg log -G |
|
1301 | 1301 | @ changeset: 7:ba2ed02b0c9a |
|
1302 | 1302 | | tag: tip |
|
1303 | 1303 | | user: test |
|
1304 | 1304 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1305 | 1305 | | summary: Add A,B,C |
|
1306 | 1306 | | |
|
1307 | 1307 | o changeset: 6:4a004186e638 |
|
1308 | 1308 | | user: test |
|
1309 | 1309 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1310 | 1310 | | summary: Add A,B,C |
|
1311 | 1311 | | |
|
1312 | 1312 | o changeset: 5:dd800401bd8c |
|
1313 | 1313 | | parent: 3:f897c6137566 |
|
1314 | 1314 | | user: test |
|
1315 | 1315 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1316 | 1316 | | summary: Add A,B,C |
|
1317 | 1317 | | |
|
1318 | 1318 | | o changeset: 4:9bd10a0775e4 |
|
1319 | 1319 | |/ user: test |
|
1320 | 1320 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1321 | 1321 | | summary: Add A,B,C |
|
1322 | 1322 | | |
|
1323 | 1323 | o changeset: 3:f897c6137566 |
|
1324 | 1324 | | parent: 0:ea207398892e |
|
1325 | 1325 | | user: test |
|
1326 | 1326 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1327 | 1327 | | summary: C0 |
|
1328 | 1328 | | |
|
1329 | 1329 | o changeset: 0:ea207398892e |
|
1330 | 1330 | user: test |
|
1331 | 1331 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1332 | 1332 | summary: ROOT |
|
1333 | 1333 | |
|
1334 | 1334 | $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` |
|
1335 | 1335 | obsoleted 1 changesets |
|
1336 | 1336 | $ hg log -G |
|
1337 | 1337 | @ changeset: 7:ba2ed02b0c9a |
|
1338 | 1338 | | tag: tip |
|
1339 | 1339 | | user: test |
|
1340 | 1340 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1341 | 1341 | | summary: Add A,B,C |
|
1342 | 1342 | | |
|
1343 | 1343 | o changeset: 6:4a004186e638 |
|
1344 | 1344 | | user: test |
|
1345 | 1345 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1346 | 1346 | | summary: Add A,B,C |
|
1347 | 1347 | | |
|
1348 | 1348 | o changeset: 5:dd800401bd8c |
|
1349 | 1349 | | parent: 3:f897c6137566 |
|
1350 | 1350 | | user: test |
|
1351 | 1351 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1352 | 1352 | | summary: Add A,B,C |
|
1353 | 1353 | | |
|
1354 | 1354 | o changeset: 3:f897c6137566 |
|
1355 | 1355 | | parent: 0:ea207398892e |
|
1356 | 1356 | | user: test |
|
1357 | 1357 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1358 | 1358 | | summary: C0 |
|
1359 | 1359 | | |
|
1360 | 1360 | o changeset: 0:ea207398892e |
|
1361 | 1361 | user: test |
|
1362 | 1362 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1363 | 1363 | summary: ROOT |
|
1364 | 1364 | |
|
1365 | 1365 | Diverge one of the splitted commit |
|
1366 | 1366 | |
|
1367 | 1367 | $ hg up 6 |
|
1368 | 1368 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1369 | 1369 | $ hg commit --amend -m "Add only B" |
|
1370 | 1370 | |
|
1371 | 1371 | $ hg up 6 --hidden |
|
1372 | 1372 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1373 | 1373 | $ hg commit --amend -m "Add B only" |
|
1374 | 1374 | |
|
1375 | 1375 | $ hg log -G |
|
1376 | 1376 | @ changeset: 9:0b997eb7ceee |
|
1377 | 1377 | | tag: tip |
|
1378 | 1378 | | parent: 5:dd800401bd8c |
|
1379 | 1379 | | user: test |
|
1380 | 1380 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1381 | 1381 | | instability: content-divergent |
|
1382 | 1382 | | summary: Add B only |
|
1383 | 1383 | | |
|
1384 | 1384 | | o changeset: 8:b18bc8331526 |
|
1385 | 1385 | |/ parent: 5:dd800401bd8c |
|
1386 | 1386 | | user: test |
|
1387 | 1387 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1388 | 1388 | | instability: content-divergent |
|
1389 | 1389 | | summary: Add only B |
|
1390 | 1390 | | |
|
1391 | 1391 | | o changeset: 7:ba2ed02b0c9a |
|
1392 | 1392 | | | user: test |
|
1393 | 1393 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1394 | 1394 | | | instability: orphan, content-divergent |
|
1395 | 1395 | | | summary: Add A,B,C |
|
1396 | 1396 | | | |
|
1397 | 1397 | | x changeset: 6:4a004186e638 |
|
1398 | 1398 | |/ user: test |
|
1399 | 1399 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1400 | 1400 | | summary: Add A,B,C |
|
1401 | 1401 | | |
|
1402 | 1402 | o changeset: 5:dd800401bd8c |
|
1403 | 1403 | | parent: 3:f897c6137566 |
|
1404 | 1404 | | user: test |
|
1405 | 1405 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1406 | 1406 | | instability: content-divergent |
|
1407 | 1407 | | summary: Add A,B,C |
|
1408 | 1408 | | |
|
1409 | 1409 | o changeset: 3:f897c6137566 |
|
1410 | 1410 | | parent: 0:ea207398892e |
|
1411 | 1411 | | user: test |
|
1412 | 1412 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1413 | 1413 | | summary: C0 |
|
1414 | 1414 | | |
|
1415 | 1415 | o changeset: 0:ea207398892e |
|
1416 | 1416 | user: test |
|
1417 | 1417 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1418 | 1418 | summary: ROOT |
|
1419 | 1419 | |
|
1420 | 1420 | |
|
1421 | 1421 | Check templates |
|
1422 | 1422 | --------------- |
|
1423 | 1423 | |
|
1424 | 1424 | $ hg tlog |
|
1425 | 1425 | @ 0b997eb7ceee |
|
1426 | 1426 | | Predecessors: 6:4a004186e638 |
|
1427 | 1427 | | semi-colon: 6:4a004186e638 |
|
1428 | 1428 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1429 | 1429 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1430 | 1430 | | o b18bc8331526 |
|
1431 | 1431 | |/ Predecessors: 6:4a004186e638 |
|
1432 | 1432 | | semi-colon: 6:4a004186e638 |
|
1433 | 1433 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1434 | 1434 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1435 | 1435 | | o ba2ed02b0c9a |
|
1436 | 1436 | | | |
|
1437 | 1437 | | x 4a004186e638 |
|
1438 | 1438 | |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee |
|
1439 | 1439 | | multi-line: 8:b18bc8331526 |
|
1440 | 1440 | | multi-line: 9:0b997eb7ceee |
|
1441 | 1441 | | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
|
1442 | 1442 | o dd800401bd8c |
|
1443 | 1443 | | |
|
1444 | 1444 | o f897c6137566 |
|
1445 | 1445 | | |
|
1446 | 1446 | o ea207398892e |
|
1447 | 1447 | |
|
1448 | 1448 | $ hg fatelog |
|
1449 | 1449 | @ 0b997eb7ceee |
|
1450 | 1450 | | |
|
1451 | 1451 | | o b18bc8331526 |
|
1452 | 1452 | |/ |
|
1453 | 1453 | | o ba2ed02b0c9a |
|
1454 | 1454 | | | |
|
1455 | 1455 | | x 4a004186e638 |
|
1456 | 1456 | |/ 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); |
|
1457 | 1457 | o dd800401bd8c |
|
1458 | 1458 | | |
|
1459 | 1459 | o f897c6137566 |
|
1460 | 1460 | | |
|
1461 | 1461 | o ea207398892e |
|
1462 | 1462 | |
|
1463 | 1463 | $ hg tlog --hidden |
|
1464 | 1464 | @ 0b997eb7ceee |
|
1465 | 1465 | | Predecessors: 6:4a004186e638 |
|
1466 | 1466 | | semi-colon: 6:4a004186e638 |
|
1467 | 1467 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1468 | 1468 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1469 | 1469 | | o b18bc8331526 |
|
1470 | 1470 | |/ Predecessors: 6:4a004186e638 |
|
1471 | 1471 | | semi-colon: 6:4a004186e638 |
|
1472 | 1472 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1473 | 1473 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1474 | 1474 | | o ba2ed02b0c9a |
|
1475 | 1475 | | | Predecessors: 4:9bd10a0775e4 |
|
1476 | 1476 | | | semi-colon: 4:9bd10a0775e4 |
|
1477 | 1477 | | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
1478 | 1478 | | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
1479 | 1479 | | x 4a004186e638 |
|
1480 | 1480 | |/ Predecessors: 4:9bd10a0775e4 |
|
1481 | 1481 | | semi-colon: 4:9bd10a0775e4 |
|
1482 | 1482 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
1483 | 1483 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
1484 | 1484 | | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
|
1485 | 1485 | | multi-line: 8:b18bc8331526 |
|
1486 | 1486 | | multi-line: 9:0b997eb7ceee |
|
1487 | 1487 | | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
|
1488 | 1488 | o dd800401bd8c |
|
1489 | 1489 | | Predecessors: 4:9bd10a0775e4 |
|
1490 | 1490 | | semi-colon: 4:9bd10a0775e4 |
|
1491 | 1491 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
1492 | 1492 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
1493 | 1493 | | x 9bd10a0775e4 |
|
1494 | 1494 | |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
|
1495 | 1495 | | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
|
1496 | 1496 | | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]] |
|
1497 | 1497 | o f897c6137566 |
|
1498 | 1498 | | Predecessors: 2:0dec01379d3b |
|
1499 | 1499 | | semi-colon: 2:0dec01379d3b |
|
1500 | 1500 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1501 | 1501 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1502 | 1502 | | x 0dec01379d3b |
|
1503 | 1503 | | | Predecessors: 1:471f378eab4c |
|
1504 | 1504 | | | semi-colon: 1:471f378eab4c |
|
1505 | 1505 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1506 | 1506 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1507 | 1507 | | | Successors: 3:f897c6137566; 1:471f378eab4c |
|
1508 | 1508 | | | multi-line: 3:f897c6137566 |
|
1509 | 1509 | | | multi-line: 1:471f378eab4c |
|
1510 | 1510 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
|
1511 | 1511 | | x 471f378eab4c |
|
1512 | 1512 | |/ Predecessors: 2:0dec01379d3b |
|
1513 | 1513 | | semi-colon: 2:0dec01379d3b |
|
1514 | 1514 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1515 | 1515 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1516 | 1516 | | Successors: 2:0dec01379d3b |
|
1517 | 1517 | | multi-line: 2:0dec01379d3b |
|
1518 | 1518 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
|
1519 | 1519 | o ea207398892e |
|
1520 | 1520 | |
|
1521 | 1521 | $ hg fatelog --hidden |
|
1522 | 1522 | @ 0b997eb7ceee |
|
1523 | 1523 | | |
|
1524 | 1524 | | o b18bc8331526 |
|
1525 | 1525 | |/ |
|
1526 | 1526 | | o ba2ed02b0c9a |
|
1527 | 1527 | | | |
|
1528 | 1528 | | x 4a004186e638 |
|
1529 | 1529 | |/ 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); |
|
1530 | 1530 | o dd800401bd8c |
|
1531 | 1531 | | |
|
1532 | 1532 | | x 9bd10a0775e4 |
|
1533 | 1533 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000); |
|
1534 | 1534 | o f897c6137566 |
|
1535 | 1535 | | |
|
1536 | 1536 | | x 0dec01379d3b |
|
1537 | 1537 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000); |
|
1538 | 1538 | | x 471f378eab4c |
|
1539 | 1539 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000); |
|
1540 | 1540 | o ea207398892e |
|
1541 | 1541 | |
|
1542 | 1542 | $ hg fatelogjson --hidden |
|
1543 | 1543 | @ 0b997eb7ceee |
|
1544 | 1544 | | |
|
1545 | 1545 | | o b18bc8331526 |
|
1546 | 1546 | |/ |
|
1547 | 1547 | | o ba2ed02b0c9a |
|
1548 | 1548 | | | |
|
1549 | 1549 | | x 4a004186e638 |
|
1550 | 1550 | |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}] |
|
1551 | 1551 | o dd800401bd8c |
|
1552 | 1552 | | |
|
1553 | 1553 | | x 9bd10a0775e4 |
|
1554 | 1554 | |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}] |
|
1555 | 1555 | o f897c6137566 |
|
1556 | 1556 | | |
|
1557 | 1557 | | x 0dec01379d3b |
|
1558 | 1558 | | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}] |
|
1559 | 1559 | | x 471f378eab4c |
|
1560 | 1560 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}] |
|
1561 | 1561 | o ea207398892e |
|
1562 | 1562 | |
|
1563 | 1563 | $ hg up --hidden 4 |
|
1564 | 1564 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1565 | 1565 | $ hg rebase -r 7 -d 8 --config extensions.rebase= |
|
1566 | 1566 | rebasing 7:ba2ed02b0c9a "Add A,B,C" |
|
1567 | 1567 | $ hg tlog |
|
1568 | 1568 | o eceed8f98ffc |
|
1569 | 1569 | | Predecessors: 4:9bd10a0775e4 |
|
1570 | 1570 | | semi-colon: 4:9bd10a0775e4 |
|
1571 | 1571 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
1572 | 1572 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
1573 | 1573 | | o 0b997eb7ceee |
|
1574 | 1574 | | | Predecessors: 4:9bd10a0775e4 |
|
1575 | 1575 | | | semi-colon: 4:9bd10a0775e4 |
|
1576 | 1576 | | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
1577 | 1577 | | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
1578 | 1578 | o | b18bc8331526 |
|
1579 | 1579 | |/ Predecessors: 4:9bd10a0775e4 |
|
1580 | 1580 | | semi-colon: 4:9bd10a0775e4 |
|
1581 | 1581 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
1582 | 1582 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
1583 | 1583 | o dd800401bd8c |
|
1584 | 1584 | | Predecessors: 4:9bd10a0775e4 |
|
1585 | 1585 | | semi-colon: 4:9bd10a0775e4 |
|
1586 | 1586 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
1587 | 1587 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
1588 | 1588 | | @ 9bd10a0775e4 |
|
1589 | 1589 | |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
|
1590 | 1590 | | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc |
|
1591 | 1591 | | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
|
1592 | 1592 | | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]] |
|
1593 | 1593 | o f897c6137566 |
|
1594 | 1594 | | |
|
1595 | 1595 | o ea207398892e |
|
1596 | 1596 | |
|
1597 | 1597 | |
|
1598 | 1598 | $ hg fatelog |
|
1599 | 1599 | o eceed8f98ffc |
|
1600 | 1600 | | |
|
1601 | 1601 | | o 0b997eb7ceee |
|
1602 | 1602 | | | |
|
1603 | 1603 | o | b18bc8331526 |
|
1604 | 1604 | |/ |
|
1605 | 1605 | o dd800401bd8c |
|
1606 | 1606 | | |
|
1607 | 1607 | | @ 9bd10a0775e4 |
|
1608 | 1608 | |/ 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); |
|
1609 | 1609 | o f897c6137566 |
|
1610 | 1610 | | |
|
1611 | 1611 | o ea207398892e |
|
1612 | 1612 | |
|
1613 | 1613 | Test templates with pruned commits |
|
1614 | 1614 | ================================== |
|
1615 | 1615 | |
|
1616 | 1616 | Test setup |
|
1617 | 1617 | ---------- |
|
1618 | 1618 | |
|
1619 | 1619 | $ hg init $TESTTMP/templates-local-prune |
|
1620 | 1620 | $ cd $TESTTMP/templates-local-prune |
|
1621 | 1621 | $ mkcommit ROOT |
|
1622 | 1622 | $ mkcommit A0 |
|
1623 | 1623 | $ hg debugobsolete --record-parent `getid "."` |
|
1624 | 1624 | obsoleted 1 changesets |
|
1625 | 1625 | |
|
1626 | 1626 | Check output |
|
1627 | 1627 | ------------ |
|
1628 | 1628 | |
|
1629 | 1629 | $ hg up "desc(A0)" --hidden |
|
1630 | 1630 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1631 | 1631 | $ hg tlog |
|
1632 | 1632 | @ 471f378eab4c |
|
1633 | 1633 | | |
|
1634 | 1634 | o ea207398892e |
|
1635 | 1635 | |
|
1636 | 1636 | $ hg fatelog |
|
1637 | 1637 | @ 471f378eab4c |
|
1638 | 1638 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
|
1639 | 1639 | o ea207398892e |
|
1640 | 1640 | |
|
1641 | 1641 | $ hg fatelog -v |
|
1642 | 1642 | @ 471f378eab4c |
|
1643 | 1643 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
|
1644 | 1644 | o ea207398892e |
|
1645 | 1645 | |
|
1646 | Test templates with multiple pruned commits | |
|
1647 | =========================================== | |
|
1648 | ||
|
1649 | Test setup | |
|
1650 | ---------- | |
|
1651 | ||
|
1652 | $ hg init $TESTTMP/multiple-local-prune | |
|
1653 | $ cd $TESTTMP/multiple-local-prune | |
|
1654 | $ mkcommit ROOT | |
|
1655 | $ mkcommit A0 | |
|
1656 | $ hg commit --amend -m "A1" | |
|
1657 | $ hg debugobsolete --record-parent `getid "."` | |
|
1658 | obsoleted 1 changesets | |
|
1659 | ||
|
1660 | $ hg up -r "desc(A0)" --hidden | |
|
1661 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
1662 | $ hg commit --amend -m "A2" | |
|
1663 | $ hg debugobsolete --record-parent `getid "."` | |
|
1664 | obsoleted 1 changesets | |
|
1665 | ||
|
1666 | Check output | |
|
1667 | ------------ | |
|
1668 | ||
|
1669 | $ hg up "desc(A0)" --hidden | |
|
1670 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
1671 | $ hg tlog | |
|
1672 | @ 471f378eab4c | |
|
1673 | | | |
|
1674 | o ea207398892e | |
|
1675 | ||
|
1676 | # todo: the obsfate output is not ideal | |
|
1677 | $ hg fatelog | |
|
1678 | @ 471f378eab4c | |
|
1679 | | Obsfate: pruned; | |
|
1680 | o ea207398892e | |
|
1681 | ||
|
1682 | $ hg fatelog -v --hidden | |
|
1683 | x 65b757b745b9 | |
|
1684 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | |
|
1685 | | x fdf9bde5129a | |
|
1686 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | |
|
1687 | | @ 471f378eab4c | |
|
1688 | |/ 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); | |
|
1689 | o ea207398892e | |
|
1690 | ||
|
1691 | ||
|
1692 | Test templates with splitted and pruned commit | |
|
1693 | ============================================== | |
|
1694 | ||
|
1695 | $ hg init $TESTTMP/templates-local-split-prune | |
|
1696 | $ cd $TESTTMP/templates-local-split-prune | |
|
1697 | $ mkcommit ROOT | |
|
1698 | $ echo 42 >> a | |
|
1699 | $ echo 43 >> b | |
|
1700 | $ hg commit -A -m "A0" | |
|
1701 | adding a | |
|
1702 | adding b | |
|
1703 | $ hg log --hidden -G | |
|
1704 | @ changeset: 1:471597cad322 | |
|
1705 | | tag: tip | |
|
1706 | | user: test | |
|
1707 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1708 | | summary: A0 | |
|
1709 | | | |
|
1710 | o changeset: 0:ea207398892e | |
|
1711 | user: test | |
|
1712 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1713 | summary: ROOT | |
|
1714 | ||
|
1715 | # Simulate split | |
|
1716 | $ hg up -r "desc(ROOT)" | |
|
1717 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
1718 | $ echo 42 >> a | |
|
1719 | $ hg commit -A -m "A1" | |
|
1720 | adding a | |
|
1721 | created new head | |
|
1722 | $ echo 43 >> b | |
|
1723 | $ hg commit -A -m "A2" | |
|
1724 | adding b | |
|
1725 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` | |
|
1726 | obsoleted 1 changesets | |
|
1727 | ||
|
1728 | # Simulate prune | |
|
1729 | $ hg debugobsolete --record-parent `getid "."` | |
|
1730 | obsoleted 1 changesets | |
|
1731 | ||
|
1732 | $ hg log --hidden -G | |
|
1733 | @ changeset: 3:0d0ef4bdf70e | |
|
1734 | | tag: tip | |
|
1735 | | user: test | |
|
1736 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1737 | | summary: A2 | |
|
1738 | | | |
|
1739 | o changeset: 2:617adc3a144c | |
|
1740 | | parent: 0:ea207398892e | |
|
1741 | | user: test | |
|
1742 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1743 | | summary: A1 | |
|
1744 | | | |
|
1745 | | x changeset: 1:471597cad322 | |
|
1746 | |/ user: test | |
|
1747 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1748 | | summary: A0 | |
|
1749 | | | |
|
1750 | o changeset: 0:ea207398892e | |
|
1751 | user: test | |
|
1752 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1753 | summary: ROOT | |
|
1754 | ||
|
1755 | Check templates | |
|
1756 | --------------- | |
|
1757 | ||
|
1758 | $ hg up 'desc("A0")' --hidden | |
|
1759 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
1760 | ||
|
1761 | # todo: the obsfate output is not ideal | |
|
1762 | $ hg fatelog | |
|
1763 | o 617adc3a144c | |
|
1764 | | | |
|
1765 | | @ 471597cad322 | |
|
1766 | |/ Obsfate: pruned; | |
|
1767 | o ea207398892e | |
|
1768 | ||
|
1769 | $ hg up -r 'desc("A2")' --hidden | |
|
1770 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
1771 | ||
|
1772 | $ hg fatelog --hidden | |
|
1773 | @ 0d0ef4bdf70e | |
|
1774 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | |
|
1775 | o 617adc3a144c | |
|
1776 | | | |
|
1777 | | x 471597cad322 | |
|
1778 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000); | |
|
1779 | o ea207398892e | |
|
1780 |
General Comments 0
You need to be logged in to leave comments.
Login now