##// END OF EJS Templates
tests: test output of {predecessors}, {successorssets} for non-obsolete csets...
Aay Jay Chan -
r46267:59ab7149 default
parent child Browse files
Show More
This diff has been collapsed as it changes many lines, (668 lines changed) Show them Hide them
@@ -1,2680 +1,3192
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 > evolution=true
14 14 > [templates]
15 15 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
16 16 > obsfateverb = "{obsfateverb(successors, markers)}"
17 17 > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}"
18 18 > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}"
19 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})")}")}"
20 20 > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
21 21 > [alias]
22 22 > tlog = log -G -T '{node|short}\
23 > {if(predecessors, "\n Predecessors: {predecessors}")}\
24 > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\
25 > {if(predecessors, "\n json: {predecessors|json}")}\
26 > {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\
27 > {if(successorssets, "\n Successors: {successorssets}")}\
28 > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\
29 > {if(successorssets, "\n json: {successorssets|json}")}\n'
23 > \n Predecessors: {predecessors}\
24 > \n semi-colon: {join(predecessors, "; ")}\
25 > \n json: {predecessors|json}\
26 > \n map: {join(predecessors % "{rev}:{node}", " ")}\
27 > \n Successors: {successorssets}\
28 > \n multi-line: {join(successorssets, "\n multi-line: ")}\
29 > \n json: {successorssets|json}\n'
30 30 > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}'
31 31 > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}'
32 32 > fatelogkw = log -G -T '{node|short}\n{if(obsfate, "{obsfate % " Obsfate: {fate}\n"}")}'
33 33 > EOF
34 34
35 35 Test templates on amended commit
36 36 ================================
37 37
38 38 Test setup
39 39 ----------
40 40
41 41 $ hg init $TESTTMP/templates-local-amend
42 42 $ cd $TESTTMP/templates-local-amend
43 43 $ mkcommit ROOT
44 44 $ mkcommit A0
45 45 $ echo 42 >> A0
46 46 $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0"
47 47 $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2
48 48
49 49 $ hg log --hidden -G
50 50 @ changeset: 3:d004c8f274b9
51 51 | tag: tip
52 52 | parent: 0:ea207398892e
53 53 | user: test
54 54 | date: Thu Jan 01 00:00:00 1970 +0000
55 55 | summary: A2
56 56 |
57 57 | x changeset: 2:a468dc9b3633
58 58 |/ parent: 0:ea207398892e
59 59 | user: test
60 60 | date: Thu Jan 01 00:00:00 1970 +0000
61 61 | obsolete: rewritten using amend as 3:d004c8f274b9 by test2
62 62 | summary: A1
63 63 |
64 64 | x changeset: 1:471f378eab4c
65 65 |/ user: test
66 66 | date: Thu Jan 01 00:00:00 1970 +0000
67 67 | obsolete: rewritten using amend as 2:a468dc9b3633
68 68 | summary: A0
69 69 |
70 70 o changeset: 0:ea207398892e
71 71 user: test
72 72 date: Thu Jan 01 00:00:00 1970 +0000
73 73 summary: ROOT
74 74
75 75 Check templates
76 76 ---------------
77 77 $ hg up 'desc(A0)' --hidden
78 78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
79 79 updated to hidden changeset 471f378eab4c
80 80 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
81 81
82 82 Predecessors template should show current revision as it is the working copy
83 83 $ hg tlog
84 84 o d004c8f274b9
85 85 | Predecessors: 1:471f378eab4c
86 86 | semi-colon: 1:471f378eab4c
87 87 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
88 88 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
89 | Successors:
90 | multi-line:
91 | json: ""
89 92 | @ 471f378eab4c
90 |/ Successors: 3:d004c8f274b9
93 |/ Predecessors:
94 | semi-colon:
95 | json: []
96 | map:
97 | Successors: 3:d004c8f274b9
91 98 | multi-line: 3:d004c8f274b9
92 99 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
93 100 o ea207398892e
94
101 Predecessors:
102 semi-colon:
103 json: []
104 map:
105 Successors:
106 multi-line:
107 json: ""
108
95 109 $ hg fatelog
96 110 o d004c8f274b9
97 111 |
98 112 | @ 471f378eab4c
99 113 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
100 114 o ea207398892e
101 115
102 116
103 117 $ hg fatelogkw
104 118 o d004c8f274b9
105 119 |
106 120 | @ 471f378eab4c
107 121 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
108 122 o ea207398892e
109 123
110 124
111 125 $ hg log -G --config ui.logtemplate=
112 126 o changeset: 3:d004c8f274b9
113 127 | tag: tip
114 128 | parent: 0:ea207398892e
115 129 | user: test
116 130 | date: Thu Jan 01 00:00:00 1970 +0000
117 131 | summary: A2
118 132 |
119 133 | @ changeset: 1:471f378eab4c
120 134 |/ user: test
121 135 | date: Thu Jan 01 00:00:00 1970 +0000
122 136 | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2
123 137 | summary: A0
124 138 |
125 139 o changeset: 0:ea207398892e
126 140 user: test
127 141 date: Thu Jan 01 00:00:00 1970 +0000
128 142 summary: ROOT
129 143
130 144
131 145 $ hg log -G -T "default"
132 146 o changeset: 3:d004c8f274b9
133 147 | tag: tip
134 148 | parent: 0:ea207398892e
135 149 | user: test
136 150 | date: Thu Jan 01 00:00:00 1970 +0000
137 151 | summary: A2
138 152 |
139 153 | @ changeset: 1:471f378eab4c
140 154 |/ user: test
141 155 | date: Thu Jan 01 00:00:00 1970 +0000
142 156 | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2
143 157 | summary: A0
144 158 |
145 159 o changeset: 0:ea207398892e
146 160 user: test
147 161 date: Thu Jan 01 00:00:00 1970 +0000
148 162 summary: ROOT
149 163
150 164 $ hg up 'desc(A1)' --hidden
151 165 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
152 166 updated to hidden changeset a468dc9b3633
153 167 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
154 168
155 169 Predecessors template should show current revision as it is the working copy
156 170 $ hg tlog
157 171 o d004c8f274b9
158 172 | Predecessors: 2:a468dc9b3633
159 173 | semi-colon: 2:a468dc9b3633
160 174 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
161 175 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
176 | Successors:
177 | multi-line:
178 | json: ""
162 179 | @ a468dc9b3633
163 |/ Successors: 3:d004c8f274b9
180 |/ Predecessors:
181 | semi-colon:
182 | json: []
183 | map:
184 | Successors: 3:d004c8f274b9
164 185 | multi-line: 3:d004c8f274b9
165 186 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
166 187 o ea207398892e
167
188 Predecessors:
189 semi-colon:
190 json: []
191 map:
192 Successors:
193 multi-line:
194 json: ""
195
168 196 $ hg fatelog
169 197 o d004c8f274b9
170 198 |
171 199 | @ a468dc9b3633
172 200 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
173 201 o ea207398892e
174 202
175 203 Predecessors template should show all the predecessors as we force their display
176 204 with --hidden
177 205 $ hg tlog --hidden
178 206 o d004c8f274b9
179 207 | Predecessors: 2:a468dc9b3633
180 208 | semi-colon: 2:a468dc9b3633
181 209 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
182 210 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
211 | Successors:
212 | multi-line:
213 | json: ""
183 214 | @ a468dc9b3633
184 215 |/ Predecessors: 1:471f378eab4c
185 216 | semi-colon: 1:471f378eab4c
186 217 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
187 218 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
188 219 | Successors: 3:d004c8f274b9
189 220 | multi-line: 3:d004c8f274b9
190 221 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
191 222 | x 471f378eab4c
192 |/ Successors: 2:a468dc9b3633
223 |/ Predecessors:
224 | semi-colon:
225 | json: []
226 | map:
227 | Successors: 2:a468dc9b3633
193 228 | multi-line: 2:a468dc9b3633
194 229 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
195 230 o ea207398892e
196
231 Predecessors:
232 semi-colon:
233 json: []
234 map:
235 Successors:
236 multi-line:
237 json: ""
238
197 239 $ hg fatelog --hidden
198 240 o d004c8f274b9
199 241 |
200 242 | @ a468dc9b3633
201 243 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
202 244 | x 471f378eab4c
203 245 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000);
204 246 o ea207398892e
205 247
206 248
207 249 Predecessors template shouldn't show anything as all obsolete commit are not
208 250 visible.
209 251 $ hg up 'desc(A2)'
210 252 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
211 253 $ hg tlog
212 254 @ d004c8f274b9
213 |
255 | Predecessors:
256 | semi-colon:
257 | json: []
258 | map:
259 | Successors:
260 | multi-line:
261 | json: ""
214 262 o ea207398892e
215
263 Predecessors:
264 semi-colon:
265 json: []
266 map:
267 Successors:
268 multi-line:
269 json: ""
270
216 271 $ hg tlog --hidden
217 272 @ d004c8f274b9
218 273 | Predecessors: 2:a468dc9b3633
219 274 | semi-colon: 2:a468dc9b3633
220 275 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
221 276 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
277 | Successors:
278 | multi-line:
279 | json: ""
222 280 | x a468dc9b3633
223 281 |/ Predecessors: 1:471f378eab4c
224 282 | semi-colon: 1:471f378eab4c
225 283 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
226 284 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
227 285 | Successors: 3:d004c8f274b9
228 286 | multi-line: 3:d004c8f274b9
229 287 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
230 288 | x 471f378eab4c
231 |/ Successors: 2:a468dc9b3633
289 |/ Predecessors:
290 | semi-colon:
291 | json: []
292 | map:
293 | Successors: 2:a468dc9b3633
232 294 | multi-line: 2:a468dc9b3633
233 295 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
234 296 o ea207398892e
235
297 Predecessors:
298 semi-colon:
299 json: []
300 map:
301 Successors:
302 multi-line:
303 json: ""
304
236 305 $ hg fatelog
237 306 @ d004c8f274b9
238 307 |
239 308 o ea207398892e
240 309
241 310
242 311 $ hg fatelog --hidden
243 312 @ d004c8f274b9
244 313 |
245 314 | x a468dc9b3633
246 315 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
247 316 | x 471f378eab4c
248 317 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000);
249 318 o ea207398892e
250 319
251 320 $ hg fatelogjson --hidden
252 321 @ d004c8f274b9
253 322 |
254 323 | x a468dc9b3633
255 324 |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}]
256 325 | x 471f378eab4c
257 326 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}]
258 327 o ea207398892e
259 328
260 329
261 330 Check other fatelog implementations
262 331 -----------------------------------
263 332
264 333 $ hg fatelogkw --hidden -q
265 334 @ d004c8f274b9
266 335 |
267 336 | x a468dc9b3633
268 337 |/ Obsfate: rewritten using amend as 3:d004c8f274b9
269 338 | x 471f378eab4c
270 339 |/ Obsfate: rewritten using amend as 2:a468dc9b3633
271 340 o ea207398892e
272 341
273 342 $ hg fatelogkw --hidden
274 343 @ d004c8f274b9
275 344 |
276 345 | x a468dc9b3633
277 346 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2
278 347 | x 471f378eab4c
279 348 |/ Obsfate: rewritten using amend as 2:a468dc9b3633
280 349 o ea207398892e
281 350
282 351 $ hg fatelogkw --hidden -v
283 352 @ d004c8f274b9
284 353 |
285 354 | x a468dc9b3633
286 355 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
287 356 | x 471f378eab4c
288 357 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
289 358 o ea207398892e
290 359
291 360
292 361 $ hg log -G -T "default" --hidden
293 362 @ changeset: 3:d004c8f274b9
294 363 | tag: tip
295 364 | parent: 0:ea207398892e
296 365 | user: test
297 366 | date: Thu Jan 01 00:00:00 1970 +0000
298 367 | summary: A2
299 368 |
300 369 | x changeset: 2:a468dc9b3633
301 370 |/ parent: 0:ea207398892e
302 371 | user: test
303 372 | date: Thu Jan 01 00:00:00 1970 +0000
304 373 | obsolete: rewritten using amend as 3:d004c8f274b9 by test2
305 374 | summary: A1
306 375 |
307 376 | x changeset: 1:471f378eab4c
308 377 |/ user: test
309 378 | date: Thu Jan 01 00:00:00 1970 +0000
310 379 | obsolete: rewritten using amend as 2:a468dc9b3633
311 380 | summary: A0
312 381 |
313 382 o changeset: 0:ea207398892e
314 383 user: test
315 384 date: Thu Jan 01 00:00:00 1970 +0000
316 385 summary: ROOT
317 386
318 387 $ hg log -G -T "default" --hidden -v
319 388 @ changeset: 3:d004c8f274b9
320 389 | tag: tip
321 390 | parent: 0:ea207398892e
322 391 | user: test
323 392 | date: Thu Jan 01 00:00:00 1970 +0000
324 393 | files: A0
325 394 | description:
326 395 | A2
327 396 |
328 397 |
329 398 | x changeset: 2:a468dc9b3633
330 399 |/ parent: 0:ea207398892e
331 400 | user: test
332 401 | date: Thu Jan 01 00:00:00 1970 +0000
333 402 | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
334 403 | files: A0
335 404 | description:
336 405 | A1
337 406 |
338 407 |
339 408 | x changeset: 1:471f378eab4c
340 409 |/ user: test
341 410 | date: Thu Jan 01 00:00:00 1970 +0000
342 411 | obsolete: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
343 412 | files: A0
344 413 | description:
345 414 | A0
346 415 |
347 416 |
348 417 o changeset: 0:ea207398892e
349 418 user: test
350 419 date: Thu Jan 01 00:00:00 1970 +0000
351 420 files: ROOT
352 421 description:
353 422 ROOT
354 423
355 424
356 425 Test templates with splitted commit
357 426 ===================================
358 427
359 428 $ hg init $TESTTMP/templates-local-split
360 429 $ cd $TESTTMP/templates-local-split
361 430 $ mkcommit ROOT
362 431 $ echo 42 >> a
363 432 $ echo 43 >> b
364 433 $ hg commit -A -m "A0"
365 434 adding a
366 435 adding b
367 436 $ hg log --hidden -G
368 437 @ changeset: 1:471597cad322
369 438 | tag: tip
370 439 | user: test
371 440 | date: Thu Jan 01 00:00:00 1970 +0000
372 441 | summary: A0
373 442 |
374 443 o changeset: 0:ea207398892e
375 444 user: test
376 445 date: Thu Jan 01 00:00:00 1970 +0000
377 446 summary: ROOT
378 447
379 448 # Simulate split
380 449 $ hg up -r "desc(ROOT)"
381 450 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
382 451 $ echo 42 >> a
383 452 $ hg commit -A -m "A0"
384 453 adding a
385 454 created new head
386 455 $ echo 43 >> b
387 456 $ hg commit -A -m "A0"
388 457 adding b
389 458 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
390 459 1 new obsolescence markers
391 460 obsoleted 1 changesets
392 461
393 462 $ hg log --hidden -G
394 463 @ changeset: 3:f257fde29c7a
395 464 | tag: tip
396 465 | user: test
397 466 | date: Thu Jan 01 00:00:00 1970 +0000
398 467 | summary: A0
399 468 |
400 469 o changeset: 2:337fec4d2edc
401 470 | parent: 0:ea207398892e
402 471 | user: test
403 472 | date: Thu Jan 01 00:00:00 1970 +0000
404 473 | summary: A0
405 474 |
406 475 | x changeset: 1:471597cad322
407 476 |/ user: test
408 477 | date: Thu Jan 01 00:00:00 1970 +0000
409 478 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a
410 479 | summary: A0
411 480 |
412 481 o changeset: 0:ea207398892e
413 482 user: test
414 483 date: Thu Jan 01 00:00:00 1970 +0000
415 484 summary: ROOT
416 485
417 486 Check templates
418 487 ---------------
419 488
420 489 $ hg up 'obsolete()' --hidden
421 490 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
422 491 updated to hidden changeset 471597cad322
423 492 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
424 493
425 494 Predecessors template should show current revision as it is the working copy
426 495 $ hg tlog
427 496 o f257fde29c7a
428 497 | Predecessors: 1:471597cad322
429 498 | semi-colon: 1:471597cad322
430 499 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
431 500 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
501 | Successors:
502 | multi-line:
503 | json: ""
432 504 o 337fec4d2edc
433 505 | Predecessors: 1:471597cad322
434 506 | semi-colon: 1:471597cad322
435 507 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
436 508 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
509 | Successors:
510 | multi-line:
511 | json: ""
437 512 | @ 471597cad322
438 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
513 |/ Predecessors:
514 | semi-colon:
515 | json: []
516 | map:
517 | Successors: 2:337fec4d2edc 3:f257fde29c7a
439 518 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
440 519 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
441 520 o ea207398892e
442
521 Predecessors:
522 semi-colon:
523 json: []
524 map:
525 Successors:
526 multi-line:
527 json: ""
443 528
444 529 $ hg fatelog
445 530 o f257fde29c7a
446 531 |
447 532 o 337fec4d2edc
448 533 |
449 534 | @ 471597cad322
450 535 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
451 536 o ea207398892e
452 537
453 538 $ hg up f257fde29c7a
454 539 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
455 540
456 541 Predecessors template should not show a predecessor as it's not displayed in
457 542 the log
458 543 $ hg tlog
459 544 @ f257fde29c7a
460 |
545 | Predecessors:
546 | semi-colon:
547 | json: []
548 | map:
549 | Successors:
550 | multi-line:
551 | json: ""
461 552 o 337fec4d2edc
462 |
553 | Predecessors:
554 | semi-colon:
555 | json: []
556 | map:
557 | Successors:
558 | multi-line:
559 | json: ""
463 560 o ea207398892e
464
561 Predecessors:
562 semi-colon:
563 json: []
564 map:
565 Successors:
566 multi-line:
567 json: ""
568
465 569 Predecessors template should show both predecessors as we force their display
466 570 with --hidden
467 571 $ hg tlog --hidden
468 572 @ f257fde29c7a
469 573 | Predecessors: 1:471597cad322
470 574 | semi-colon: 1:471597cad322
471 575 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
472 576 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
577 | Successors:
578 | multi-line:
579 | json: ""
473 580 o 337fec4d2edc
474 581 | Predecessors: 1:471597cad322
475 582 | semi-colon: 1:471597cad322
476 583 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
477 584 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
585 | Successors:
586 | multi-line:
587 | json: ""
478 588 | x 471597cad322
479 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
589 |/ Predecessors:
590 | semi-colon:
591 | json: []
592 | map:
593 | Successors: 2:337fec4d2edc 3:f257fde29c7a
480 594 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
481 595 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
482 596 o ea207398892e
483
597 Predecessors:
598 semi-colon:
599 json: []
600 map:
601 Successors:
602 multi-line:
603 json: ""
484 604
485 605 $ hg fatelog --hidden
486 606 @ f257fde29c7a
487 607 |
488 608 o 337fec4d2edc
489 609 |
490 610 | x 471597cad322
491 611 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
492 612 o ea207398892e
493 613
494 614 $ hg fatelogjson --hidden
495 615 @ f257fde29c7a
496 616 |
497 617 o 337fec4d2edc
498 618 |
499 619 | x 471597cad322
500 620 |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}]
501 621 o ea207398892e
502 622
503 623 Check other fatelog implementations
504 624 -----------------------------------
505 625
506 626 $ hg fatelogkw --hidden -q
507 627 @ f257fde29c7a
508 628 |
509 629 o 337fec4d2edc
510 630 |
511 631 | x 471597cad322
512 632 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a
513 633 o ea207398892e
514 634
515 635 $ hg fatelogkw --hidden
516 636 @ f257fde29c7a
517 637 |
518 638 o 337fec4d2edc
519 639 |
520 640 | x 471597cad322
521 641 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a
522 642 o ea207398892e
523 643
524 644 $ hg fatelogkw --hidden -v
525 645 @ f257fde29c7a
526 646 |
527 647 o 337fec4d2edc
528 648 |
529 649 | x 471597cad322
530 650 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000)
531 651 o ea207398892e
532 652
533 653
534 654 $ hg log -G -T "default" --hidden
535 655 @ changeset: 3:f257fde29c7a
536 656 | tag: tip
537 657 | user: test
538 658 | date: Thu Jan 01 00:00:00 1970 +0000
539 659 | summary: A0
540 660 |
541 661 o changeset: 2:337fec4d2edc
542 662 | parent: 0:ea207398892e
543 663 | user: test
544 664 | date: Thu Jan 01 00:00:00 1970 +0000
545 665 | summary: A0
546 666 |
547 667 | x changeset: 1:471597cad322
548 668 |/ user: test
549 669 | date: Thu Jan 01 00:00:00 1970 +0000
550 670 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a
551 671 | summary: A0
552 672 |
553 673 o changeset: 0:ea207398892e
554 674 user: test
555 675 date: Thu Jan 01 00:00:00 1970 +0000
556 676 summary: ROOT
557 677
558 678
559 679 Test templates with folded commit
560 680 =================================
561 681
562 682 Test setup
563 683 ----------
564 684
565 685 $ hg init $TESTTMP/templates-local-fold
566 686 $ cd $TESTTMP/templates-local-fold
567 687 $ mkcommit ROOT
568 688 $ mkcommit A0
569 689 $ mkcommit B0
570 690 $ hg log --hidden -G
571 691 @ changeset: 2:0dec01379d3b
572 692 | tag: tip
573 693 | user: test
574 694 | date: Thu Jan 01 00:00:00 1970 +0000
575 695 | summary: B0
576 696 |
577 697 o changeset: 1:471f378eab4c
578 698 | user: test
579 699 | date: Thu Jan 01 00:00:00 1970 +0000
580 700 | summary: A0
581 701 |
582 702 o changeset: 0:ea207398892e
583 703 user: test
584 704 date: Thu Jan 01 00:00:00 1970 +0000
585 705 summary: ROOT
586 706
587 707 Simulate a fold
588 708 $ hg up -r "desc(ROOT)"
589 709 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
590 710 $ echo "A0" > A0
591 711 $ echo "B0" > B0
592 712 $ hg commit -A -m "C0"
593 713 adding A0
594 714 adding B0
595 715 created new head
596 716 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
597 717 1 new obsolescence markers
598 718 obsoleted 1 changesets
599 719 1 new orphan changesets
600 720 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
601 721 1 new obsolescence markers
602 722 obsoleted 1 changesets
603 723
604 724 $ hg log --hidden -G
605 725 @ changeset: 3:eb5a0daa2192
606 726 | tag: tip
607 727 | parent: 0:ea207398892e
608 728 | user: test
609 729 | date: Thu Jan 01 00:00:00 1970 +0000
610 730 | summary: C0
611 731 |
612 732 | x changeset: 2:0dec01379d3b
613 733 | | user: test
614 734 | | date: Thu Jan 01 00:00:00 1970 +0000
615 735 | | obsolete: rewritten as 3:eb5a0daa2192
616 736 | | summary: B0
617 737 | |
618 738 | x changeset: 1:471f378eab4c
619 739 |/ user: test
620 740 | date: Thu Jan 01 00:00:00 1970 +0000
621 741 | obsolete: rewritten as 3:eb5a0daa2192
622 742 | summary: A0
623 743 |
624 744 o changeset: 0:ea207398892e
625 745 user: test
626 746 date: Thu Jan 01 00:00:00 1970 +0000
627 747 summary: ROOT
628 748
629 749 Check templates
630 750 ---------------
631 751
632 752 $ hg up 'desc(A0)' --hidden
633 753 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
634 754 updated to hidden changeset 471f378eab4c
635 755 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
636 756
637 757 Predecessors template should show current revision as it is the working copy
638 758 $ hg tlog
639 759 o eb5a0daa2192
640 760 | Predecessors: 1:471f378eab4c
641 761 | semi-colon: 1:471f378eab4c
642 762 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
643 763 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
764 | Successors:
765 | multi-line:
766 | json: ""
644 767 | @ 471f378eab4c
645 |/ Successors: 3:eb5a0daa2192
768 |/ Predecessors:
769 | semi-colon:
770 | json: []
771 | map:
772 | Successors: 3:eb5a0daa2192
646 773 | multi-line: 3:eb5a0daa2192
647 774 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
648 775 o ea207398892e
649
776 Predecessors:
777 semi-colon:
778 json: []
779 map:
780 Successors:
781 multi-line:
782 json: ""
650 783
651 784 $ hg fatelog
652 785 o eb5a0daa2192
653 786 |
654 787 | @ 471f378eab4c
655 788 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
656 789 o ea207398892e
657 790
658 791 $ hg up 'desc(B0)' --hidden
659 792 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
660 793 updated to hidden changeset 0dec01379d3b
661 794 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
662 795
663 796 Predecessors template should show both predecessors as they should be both
664 797 displayed
665 798 $ hg tlog
666 799 o eb5a0daa2192
667 800 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
668 801 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
669 802 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
670 803 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
804 | Successors:
805 | multi-line:
806 | json: ""
671 807 | @ 0dec01379d3b
808 | | Predecessors:
809 | | semi-colon:
810 | | json: []
811 | | map:
672 812 | | Successors: 3:eb5a0daa2192
673 813 | | multi-line: 3:eb5a0daa2192
674 814 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
675 815 | x 471f378eab4c
676 |/ Successors: 3:eb5a0daa2192
816 |/ Predecessors:
817 | semi-colon:
818 | json: []
819 | map:
820 | Successors: 3:eb5a0daa2192
677 821 | multi-line: 3:eb5a0daa2192
678 822 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
679 823 o ea207398892e
680
824 Predecessors:
825 semi-colon:
826 json: []
827 map:
828 Successors:
829 multi-line:
830 json: ""
681 831
682 832 $ hg fatelog
683 833 o eb5a0daa2192
684 834 |
685 835 | @ 0dec01379d3b
686 836 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
687 837 | x 471f378eab4c
688 838 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
689 839 o ea207398892e
690 840
691 841 $ hg up 'desc(C0)'
692 842 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
693 843
694 844 Predecessors template should not show predecessors as they are not displayed in
695 845 the log
696 846 $ hg tlog
697 847 @ eb5a0daa2192
698 |
848 | Predecessors:
849 | semi-colon:
850 | json: []
851 | map:
852 | Successors:
853 | multi-line:
854 | json: ""
699 855 o ea207398892e
700
856 Predecessors:
857 semi-colon:
858 json: []
859 map:
860 Successors:
861 multi-line:
862 json: ""
701 863 Predecessors template should show both predecessors as we force their display
702 864 with --hidden
703 865 $ hg tlog --hidden
704 866 @ eb5a0daa2192
705 867 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
706 868 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
707 869 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
708 870 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
871 | Successors:
872 | multi-line:
873 | json: ""
709 874 | x 0dec01379d3b
875 | | Predecessors:
876 | | semi-colon:
877 | | json: []
878 | | map:
710 879 | | Successors: 3:eb5a0daa2192
711 880 | | multi-line: 3:eb5a0daa2192
712 881 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
713 882 | x 471f378eab4c
714 |/ Successors: 3:eb5a0daa2192
883 |/ Predecessors:
884 | semi-colon:
885 | json: []
886 | map:
887 | Successors: 3:eb5a0daa2192
715 888 | multi-line: 3:eb5a0daa2192
716 889 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
717 890 o ea207398892e
718
891 Predecessors:
892 semi-colon:
893 json: []
894 map:
895 Successors:
896 multi-line:
897 json: ""
719 898
720 899 $ hg fatelog --hidden
721 900 @ eb5a0daa2192
722 901 |
723 902 | x 0dec01379d3b
724 903 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
725 904 | x 471f378eab4c
726 905 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
727 906 o ea207398892e
728 907
729 908
730 909 $ hg fatelogjson --hidden
731 910 @ eb5a0daa2192
732 911 |
733 912 | x 0dec01379d3b
734 913 | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
735 914 | x 471f378eab4c
736 915 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
737 916 o ea207398892e
738 917
739 918 Check other fatelog implementations
740 919 -----------------------------------
741 920
742 921 $ hg fatelogkw --hidden -q
743 922 @ eb5a0daa2192
744 923 |
745 924 | x 0dec01379d3b
746 925 | | Obsfate: rewritten as 3:eb5a0daa2192
747 926 | x 471f378eab4c
748 927 |/ Obsfate: rewritten as 3:eb5a0daa2192
749 928 o ea207398892e
750 929
751 930 $ hg fatelogkw --hidden
752 931 @ eb5a0daa2192
753 932 |
754 933 | x 0dec01379d3b
755 934 | | Obsfate: rewritten as 3:eb5a0daa2192
756 935 | x 471f378eab4c
757 936 |/ Obsfate: rewritten as 3:eb5a0daa2192
758 937 o ea207398892e
759 938
760 939 $ hg fatelogkw --hidden -v
761 940 @ eb5a0daa2192
762 941 |
763 942 | x 0dec01379d3b
764 943 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
765 944 | x 471f378eab4c
766 945 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
767 946 o ea207398892e
768 947
769 948 $ hg log -G -T "default" --hidden
770 949 @ changeset: 3:eb5a0daa2192
771 950 | tag: tip
772 951 | parent: 0:ea207398892e
773 952 | user: test
774 953 | date: Thu Jan 01 00:00:00 1970 +0000
775 954 | summary: C0
776 955 |
777 956 | x changeset: 2:0dec01379d3b
778 957 | | user: test
779 958 | | date: Thu Jan 01 00:00:00 1970 +0000
780 959 | | obsolete: rewritten as 3:eb5a0daa2192
781 960 | | summary: B0
782 961 | |
783 962 | x changeset: 1:471f378eab4c
784 963 |/ user: test
785 964 | date: Thu Jan 01 00:00:00 1970 +0000
786 965 | obsolete: rewritten as 3:eb5a0daa2192
787 966 | summary: A0
788 967 |
789 968 o changeset: 0:ea207398892e
790 969 user: test
791 970 date: Thu Jan 01 00:00:00 1970 +0000
792 971 summary: ROOT
793 972
794 973
795 974 Test templates with divergence
796 975 ==============================
797 976
798 977 Test setup
799 978 ----------
800 979
801 980 $ hg init $TESTTMP/templates-local-divergence
802 981 $ cd $TESTTMP/templates-local-divergence
803 982 $ mkcommit ROOT
804 983 $ mkcommit A0
805 984 $ hg commit --amend -m "A1"
806 985 $ hg log --hidden -G
807 986 @ changeset: 2:fdf9bde5129a
808 987 | tag: tip
809 988 | parent: 0:ea207398892e
810 989 | user: test
811 990 | date: Thu Jan 01 00:00:00 1970 +0000
812 991 | summary: A1
813 992 |
814 993 | x changeset: 1:471f378eab4c
815 994 |/ user: test
816 995 | date: Thu Jan 01 00:00:00 1970 +0000
817 996 | obsolete: rewritten using amend as 2:fdf9bde5129a
818 997 | summary: A0
819 998 |
820 999 o changeset: 0:ea207398892e
821 1000 user: test
822 1001 date: Thu Jan 01 00:00:00 1970 +0000
823 1002 summary: ROOT
824 1003
825 1004 $ hg update --hidden 'desc(A0)'
826 1005 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
827 1006 updated to hidden changeset 471f378eab4c
828 1007 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
829 1008 $ hg commit --amend -m "A2"
830 1009 2 new content-divergent changesets
831 1010 $ hg log --hidden -G
832 1011 @ changeset: 3:65b757b745b9
833 1012 | tag: tip
834 1013 | parent: 0:ea207398892e
835 1014 | user: test
836 1015 | date: Thu Jan 01 00:00:00 1970 +0000
837 1016 | instability: content-divergent
838 1017 | summary: A2
839 1018 |
840 1019 | * changeset: 2:fdf9bde5129a
841 1020 |/ parent: 0:ea207398892e
842 1021 | user: test
843 1022 | date: Thu Jan 01 00:00:00 1970 +0000
844 1023 | instability: content-divergent
845 1024 | summary: A1
846 1025 |
847 1026 | x changeset: 1:471f378eab4c
848 1027 |/ user: test
849 1028 | date: Thu Jan 01 00:00:00 1970 +0000
850 1029 | obsolete: rewritten using amend as 2:fdf9bde5129a
851 1030 | obsolete: rewritten using amend as 3:65b757b745b9
852 1031 | summary: A0
853 1032 |
854 1033 o changeset: 0:ea207398892e
855 1034 user: test
856 1035 date: Thu Jan 01 00:00:00 1970 +0000
857 1036 summary: ROOT
858 1037
859 1038 $ hg commit --amend -m 'A3'
860 1039 $ hg log --hidden -G
861 1040 @ changeset: 4:019fadeab383
862 1041 | tag: tip
863 1042 | parent: 0:ea207398892e
864 1043 | user: test
865 1044 | date: Thu Jan 01 00:00:00 1970 +0000
866 1045 | instability: content-divergent
867 1046 | summary: A3
868 1047 |
869 1048 | x changeset: 3:65b757b745b9
870 1049 |/ parent: 0:ea207398892e
871 1050 | user: test
872 1051 | date: Thu Jan 01 00:00:00 1970 +0000
873 1052 | obsolete: rewritten using amend as 4:019fadeab383
874 1053 | summary: A2
875 1054 |
876 1055 | * changeset: 2:fdf9bde5129a
877 1056 |/ parent: 0:ea207398892e
878 1057 | user: test
879 1058 | date: Thu Jan 01 00:00:00 1970 +0000
880 1059 | instability: content-divergent
881 1060 | summary: A1
882 1061 |
883 1062 | x changeset: 1:471f378eab4c
884 1063 |/ user: test
885 1064 | date: Thu Jan 01 00:00:00 1970 +0000
886 1065 | obsolete: rewritten using amend as 2:fdf9bde5129a
887 1066 | obsolete: rewritten using amend as 3:65b757b745b9
888 1067 | summary: A0
889 1068 |
890 1069 o changeset: 0:ea207398892e
891 1070 user: test
892 1071 date: Thu Jan 01 00:00:00 1970 +0000
893 1072 summary: ROOT
894 1073
895 1074
896 1075 Check templates
897 1076 ---------------
898 1077
899 1078 $ hg up 'desc(A0)' --hidden
900 1079 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
901 1080 updated to hidden changeset 471f378eab4c
902 1081 (hidden revision '471f378eab4c' has diverged)
903 1082
904 1083 Predecessors template should show current revision as it is the working copy
905 1084 $ hg tlog
906 1085 * 019fadeab383
907 1086 | Predecessors: 1:471f378eab4c
908 1087 | semi-colon: 1:471f378eab4c
909 1088 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
910 1089 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1090 | Successors:
1091 | multi-line:
1092 | json: ""
911 1093 | * fdf9bde5129a
912 1094 |/ Predecessors: 1:471f378eab4c
913 1095 | semi-colon: 1:471f378eab4c
914 1096 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
915 1097 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1098 | Successors:
1099 | multi-line:
1100 | json: ""
916 1101 | @ 471f378eab4c
917 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
1102 |/ Predecessors:
1103 | semi-colon:
1104 | json: []
1105 | map:
1106 | Successors: 2:fdf9bde5129a; 4:019fadeab383
918 1107 | multi-line: 2:fdf9bde5129a
919 1108 | multi-line: 4:019fadeab383
920 1109 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
921 1110 o ea207398892e
922
1111 Predecessors:
1112 semi-colon:
1113 json: []
1114 map:
1115 Successors:
1116 multi-line:
1117 json: ""
923 1118 $ hg fatelog
924 1119 * 019fadeab383
925 1120 |
926 1121 | * fdf9bde5129a
927 1122 |/
928 1123 | @ 471f378eab4c
929 1124 |/ 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);
930 1125 o ea207398892e
931 1126
932 1127 $ hg up 'desc(A1)'
933 1128 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
934 1129
935 1130 Predecessors template should not show predecessors as they are not displayed in
936 1131 the log
937 1132 $ hg tlog
938 1133 * 019fadeab383
939 |
1134 | Predecessors:
1135 | semi-colon:
1136 | json: []
1137 | map:
1138 | Successors:
1139 | multi-line:
1140 | json: ""
940 1141 | @ fdf9bde5129a
941 |/
1142 |/ Predecessors:
1143 | semi-colon:
1144 | json: []
1145 | map:
1146 | Successors:
1147 | multi-line:
1148 | json: ""
942 1149 o ea207398892e
943
1150 Predecessors:
1151 semi-colon:
1152 json: []
1153 map:
1154 Successors:
1155 multi-line:
1156 json: ""
944 1157
945 1158 $ hg fatelog
946 1159 * 019fadeab383
947 1160 |
948 1161 | @ fdf9bde5129a
949 1162 |/
950 1163 o ea207398892e
951 1164
952 1165 Predecessors template should the predecessors as we force their display with
953 1166 --hidden
954 1167 $ hg tlog --hidden
955 1168 * 019fadeab383
956 1169 | Predecessors: 3:65b757b745b9
957 1170 | semi-colon: 3:65b757b745b9
958 1171 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
959 1172 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd
1173 | Successors:
1174 | multi-line:
1175 | json: ""
960 1176 | x 65b757b745b9
961 1177 |/ Predecessors: 1:471f378eab4c
962 1178 | semi-colon: 1:471f378eab4c
963 1179 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
964 1180 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
965 1181 | Successors: 4:019fadeab383
966 1182 | multi-line: 4:019fadeab383
967 1183 | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
968 1184 | @ fdf9bde5129a
969 1185 |/ Predecessors: 1:471f378eab4c
970 1186 | semi-colon: 1:471f378eab4c
971 1187 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
972 1188 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1189 | Successors:
1190 | multi-line:
1191 | json: ""
973 1192 | x 471f378eab4c
974 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
1193 |/ Predecessors:
1194 | semi-colon:
1195 | json: []
1196 | map:
1197 | Successors: 2:fdf9bde5129a; 3:65b757b745b9
975 1198 | multi-line: 2:fdf9bde5129a
976 1199 | multi-line: 3:65b757b745b9
977 1200 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
978 1201 o ea207398892e
979
1202 Predecessors:
1203 semi-colon:
1204 json: []
1205 map:
1206 Successors:
1207 multi-line:
1208 json: ""
980 1209
981 1210 $ hg fatelog --hidden
982 1211 * 019fadeab383
983 1212 |
984 1213 | x 65b757b745b9
985 1214 |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
986 1215 | @ fdf9bde5129a
987 1216 |/
988 1217 | x 471f378eab4c
989 1218 |/ 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);
990 1219 o ea207398892e
991 1220
992 1221
993 1222 $ hg fatelogjson --hidden
994 1223 * 019fadeab383
995 1224 |
996 1225 | x 65b757b745b9
997 1226 |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
998 1227 | @ fdf9bde5129a
999 1228 |/
1000 1229 | x 471f378eab4c
1001 1230 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}]
1002 1231 o ea207398892e
1003 1232
1004 1233
1005 1234 Check other fatelog implementations
1006 1235 -----------------------------------
1007 1236
1008 1237 $ hg fatelogkw --hidden -q
1009 1238 * 019fadeab383
1010 1239 |
1011 1240 | x 65b757b745b9
1012 1241 |/ Obsfate: rewritten using amend as 4:019fadeab383
1013 1242 | @ fdf9bde5129a
1014 1243 |/
1015 1244 | x 471f378eab4c
1016 1245 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a
1017 1246 | Obsfate: rewritten using amend as 3:65b757b745b9
1018 1247 o ea207398892e
1019 1248
1020 1249 $ hg fatelogkw --hidden
1021 1250 * 019fadeab383
1022 1251 |
1023 1252 | x 65b757b745b9
1024 1253 |/ Obsfate: rewritten using amend as 4:019fadeab383
1025 1254 | @ fdf9bde5129a
1026 1255 |/
1027 1256 | x 471f378eab4c
1028 1257 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a
1029 1258 | Obsfate: rewritten using amend as 3:65b757b745b9
1030 1259 o ea207398892e
1031 1260
1032 1261 $ hg fatelogkw --hidden -v
1033 1262 * 019fadeab383
1034 1263 |
1035 1264 | x 65b757b745b9
1036 1265 |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000)
1037 1266 | @ fdf9bde5129a
1038 1267 |/
1039 1268 | x 471f378eab4c
1040 1269 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000)
1041 1270 | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000)
1042 1271 o ea207398892e
1043 1272
1044 1273 $ hg log -G -T "default" --hidden
1045 1274 * changeset: 4:019fadeab383
1046 1275 | tag: tip
1047 1276 | parent: 0:ea207398892e
1048 1277 | user: test
1049 1278 | date: Thu Jan 01 00:00:00 1970 +0000
1050 1279 | instability: content-divergent
1051 1280 | summary: A3
1052 1281 |
1053 1282 | x changeset: 3:65b757b745b9
1054 1283 |/ parent: 0:ea207398892e
1055 1284 | user: test
1056 1285 | date: Thu Jan 01 00:00:00 1970 +0000
1057 1286 | obsolete: rewritten using amend as 4:019fadeab383
1058 1287 | summary: A2
1059 1288 |
1060 1289 | @ changeset: 2:fdf9bde5129a
1061 1290 |/ parent: 0:ea207398892e
1062 1291 | user: test
1063 1292 | date: Thu Jan 01 00:00:00 1970 +0000
1064 1293 | instability: content-divergent
1065 1294 | summary: A1
1066 1295 |
1067 1296 | x changeset: 1:471f378eab4c
1068 1297 |/ user: test
1069 1298 | date: Thu Jan 01 00:00:00 1970 +0000
1070 1299 | obsolete: rewritten using amend as 2:fdf9bde5129a
1071 1300 | obsolete: rewritten using amend as 3:65b757b745b9
1072 1301 | summary: A0
1073 1302 |
1074 1303 o changeset: 0:ea207398892e
1075 1304 user: test
1076 1305 date: Thu Jan 01 00:00:00 1970 +0000
1077 1306 summary: ROOT
1078 1307
1079 1308
1080 1309 Test templates with amended + folded commit
1081 1310 ===========================================
1082 1311
1083 1312 Test setup
1084 1313 ----------
1085 1314
1086 1315 $ hg init $TESTTMP/templates-local-amend-fold
1087 1316 $ cd $TESTTMP/templates-local-amend-fold
1088 1317 $ mkcommit ROOT
1089 1318 $ mkcommit A0
1090 1319 $ mkcommit B0
1091 1320 $ hg commit --amend -m "B1"
1092 1321 $ hg log --hidden -G
1093 1322 @ changeset: 3:b7ea6d14e664
1094 1323 | tag: tip
1095 1324 | parent: 1:471f378eab4c
1096 1325 | user: test
1097 1326 | date: Thu Jan 01 00:00:00 1970 +0000
1098 1327 | summary: B1
1099 1328 |
1100 1329 | x changeset: 2:0dec01379d3b
1101 1330 |/ user: test
1102 1331 | date: Thu Jan 01 00:00:00 1970 +0000
1103 1332 | obsolete: rewritten using amend as 3:b7ea6d14e664
1104 1333 | summary: B0
1105 1334 |
1106 1335 o changeset: 1:471f378eab4c
1107 1336 | user: test
1108 1337 | date: Thu Jan 01 00:00:00 1970 +0000
1109 1338 | summary: A0
1110 1339 |
1111 1340 o changeset: 0:ea207398892e
1112 1341 user: test
1113 1342 date: Thu Jan 01 00:00:00 1970 +0000
1114 1343 summary: ROOT
1115 1344
1116 1345 # Simulate a fold
1117 1346 $ hg up -r "desc(ROOT)"
1118 1347 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1119 1348 $ echo "A0" > A0
1120 1349 $ echo "B0" > B0
1121 1350 $ hg commit -A -m "C0"
1122 1351 adding A0
1123 1352 adding B0
1124 1353 created new head
1125 1354 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
1126 1355 1 new obsolescence markers
1127 1356 obsoleted 1 changesets
1128 1357 1 new orphan changesets
1129 1358 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
1130 1359 1 new obsolescence markers
1131 1360 obsoleted 1 changesets
1132 1361
1133 1362 $ hg log --hidden -G
1134 1363 @ changeset: 4:eb5a0daa2192
1135 1364 | tag: tip
1136 1365 | parent: 0:ea207398892e
1137 1366 | user: test
1138 1367 | date: Thu Jan 01 00:00:00 1970 +0000
1139 1368 | summary: C0
1140 1369 |
1141 1370 | x changeset: 3:b7ea6d14e664
1142 1371 | | parent: 1:471f378eab4c
1143 1372 | | user: test
1144 1373 | | date: Thu Jan 01 00:00:00 1970 +0000
1145 1374 | | obsolete: rewritten as 4:eb5a0daa2192
1146 1375 | | summary: B1
1147 1376 | |
1148 1377 | | x changeset: 2:0dec01379d3b
1149 1378 | |/ user: test
1150 1379 | | date: Thu Jan 01 00:00:00 1970 +0000
1151 1380 | | obsolete: rewritten using amend as 3:b7ea6d14e664
1152 1381 | | summary: B0
1153 1382 | |
1154 1383 | x changeset: 1:471f378eab4c
1155 1384 |/ user: test
1156 1385 | date: Thu Jan 01 00:00:00 1970 +0000
1157 1386 | obsolete: rewritten as 4:eb5a0daa2192
1158 1387 | summary: A0
1159 1388 |
1160 1389 o changeset: 0:ea207398892e
1161 1390 user: test
1162 1391 date: Thu Jan 01 00:00:00 1970 +0000
1163 1392 summary: ROOT
1164 1393
1165 1394 Check templates
1166 1395 ---------------
1167 1396
1168 1397 $ hg up 'desc(A0)' --hidden
1169 1398 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1170 1399 updated to hidden changeset 471f378eab4c
1171 1400 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
1172 1401
1173 1402 Predecessors template should show current revision as it is the working copy
1174 1403 $ hg tlog
1175 1404 o eb5a0daa2192
1176 1405 | Predecessors: 1:471f378eab4c
1177 1406 | semi-colon: 1:471f378eab4c
1178 1407 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1179 1408 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1409 | Successors:
1410 | multi-line:
1411 | json: ""
1180 1412 | @ 471f378eab4c
1181 |/ Successors: 4:eb5a0daa2192
1413 |/ Predecessors:
1414 | semi-colon:
1415 | json: []
1416 | map:
1417 | Successors: 4:eb5a0daa2192
1182 1418 | multi-line: 4:eb5a0daa2192
1183 1419 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
1184 1420 o ea207398892e
1185
1421 Predecessors:
1422 semi-colon:
1423 json: []
1424 map:
1425 Successors:
1426 multi-line:
1427 json: ""
1186 1428
1187 1429 $ hg fatelog
1188 1430 o eb5a0daa2192
1189 1431 |
1190 1432 | @ 471f378eab4c
1191 1433 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
1192 1434 o ea207398892e
1193 1435
1194 1436 $ hg up 'desc(B0)' --hidden
1195 1437 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1196 1438 updated to hidden changeset 0dec01379d3b
1197 1439 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1198 1440
1199 1441 Predecessors template should both predecessors as they are visible
1200 1442 $ hg tlog
1201 1443 o eb5a0daa2192
1202 1444 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
1203 1445 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
1204 1446 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
1205 1447 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
1448 | Successors:
1449 | multi-line:
1450 | json: ""
1206 1451 | @ 0dec01379d3b
1452 | | Predecessors:
1453 | | semi-colon:
1454 | | json: []
1455 | | map:
1207 1456 | | Successors: 4:eb5a0daa2192
1208 1457 | | multi-line: 4:eb5a0daa2192
1209 1458 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
1210 1459 | x 471f378eab4c
1211 |/ Successors: 4:eb5a0daa2192
1460 |/ Predecessors:
1461 | semi-colon:
1462 | json: []
1463 | map:
1464 | Successors: 4:eb5a0daa2192
1212 1465 | multi-line: 4:eb5a0daa2192
1213 1466 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
1214 1467 o ea207398892e
1215
1468 Predecessors:
1469 semi-colon:
1470 json: []
1471 map:
1472 Successors:
1473 multi-line:
1474 json: ""
1216 1475
1217 1476 $ hg fatelog
1218 1477 o eb5a0daa2192
1219 1478 |
1220 1479 | @ 0dec01379d3b
1221 1480 | | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
1222 1481 | x 471f378eab4c
1223 1482 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
1224 1483 o ea207398892e
1225 1484
1226 1485 $ hg up 'desc(B1)' --hidden
1227 1486 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1228 1487 updated to hidden changeset b7ea6d14e664
1229 1488 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
1230 1489
1231 1490 Predecessors template should both predecessors as they are visible
1232 1491 $ hg tlog
1233 1492 o eb5a0daa2192
1234 1493 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
1235 1494 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
1236 1495 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
1237 1496 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
1497 | Successors:
1498 | multi-line:
1499 | json: ""
1238 1500 | @ b7ea6d14e664
1501 | | Predecessors:
1502 | | semi-colon:
1503 | | json: []
1504 | | map:
1239 1505 | | Successors: 4:eb5a0daa2192
1240 1506 | | multi-line: 4:eb5a0daa2192
1241 1507 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
1242 1508 | x 471f378eab4c
1243 |/ Successors: 4:eb5a0daa2192
1509 |/ Predecessors:
1510 | semi-colon:
1511 | json: []
1512 | map:
1513 | Successors: 4:eb5a0daa2192
1244 1514 | multi-line: 4:eb5a0daa2192
1245 1515 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
1246 1516 o ea207398892e
1247
1517 Predecessors:
1518 semi-colon:
1519 json: []
1520 map:
1521 Successors:
1522 multi-line:
1523 json: ""
1248 1524
1249 1525 $ hg fatelog
1250 1526 o eb5a0daa2192
1251 1527 |
1252 1528 | @ b7ea6d14e664
1253 1529 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
1254 1530 | x 471f378eab4c
1255 1531 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
1256 1532 o ea207398892e
1257 1533
1258 1534 $ hg up 'desc(C0)'
1259 1535 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1260 1536
1261 1537 Predecessors template should show no predecessors as they are both non visible
1262 1538 $ hg tlog
1263 1539 @ eb5a0daa2192
1264 |
1540 | Predecessors:
1541 | semi-colon:
1542 | json: []
1543 | map:
1544 | Successors:
1545 | multi-line:
1546 | json: ""
1265 1547 o ea207398892e
1266
1548 Predecessors:
1549 semi-colon:
1550 json: []
1551 map:
1552 Successors:
1553 multi-line:
1554 json: ""
1267 1555
1268 1556 $ hg fatelog
1269 1557 @ eb5a0daa2192
1270 1558 |
1271 1559 o ea207398892e
1272 1560
1273 1561 Predecessors template should show all predecessors as we force their display
1274 1562 with --hidden
1275 1563 $ hg tlog --hidden
1276 1564 @ eb5a0daa2192
1277 1565 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
1278 1566 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
1279 1567 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
1280 1568 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
1569 | Successors:
1570 | multi-line:
1571 | json: ""
1281 1572 | x b7ea6d14e664
1282 1573 | | Predecessors: 2:0dec01379d3b
1283 1574 | | semi-colon: 2:0dec01379d3b
1284 1575 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1285 1576 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1286 1577 | | Successors: 4:eb5a0daa2192
1287 1578 | | multi-line: 4:eb5a0daa2192
1288 1579 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
1289 1580 | | x 0dec01379d3b
1290 | |/ Successors: 3:b7ea6d14e664
1581 | |/ Predecessors:
1582 | | semi-colon:
1583 | | json: []
1584 | | map:
1585 | | Successors: 3:b7ea6d14e664
1291 1586 | | multi-line: 3:b7ea6d14e664
1292 1587 | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]]
1293 1588 | x 471f378eab4c
1294 |/ Successors: 4:eb5a0daa2192
1589 |/ Predecessors:
1590 | semi-colon:
1591 | json: []
1592 | map:
1593 | Successors: 4:eb5a0daa2192
1295 1594 | multi-line: 4:eb5a0daa2192
1296 1595 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
1297 1596 o ea207398892e
1298
1597 Predecessors:
1598 semi-colon:
1599 json: []
1600 map:
1601 Successors:
1602 multi-line:
1603 json: ""
1299 1604
1300 1605 $ hg fatelog --hidden
1301 1606 @ eb5a0daa2192
1302 1607 |
1303 1608 | x b7ea6d14e664
1304 1609 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
1305 1610 | | x 0dec01379d3b
1306 1611 | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000);
1307 1612 | x 471f378eab4c
1308 1613 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
1309 1614 o ea207398892e
1310 1615
1311 1616
1312 1617 $ hg fatelogjson --hidden
1313 1618 @ eb5a0daa2192
1314 1619 |
1315 1620 | x b7ea6d14e664
1316 1621 | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
1317 1622 | | x 0dec01379d3b
1318 1623 | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}]
1319 1624 | x 471f378eab4c
1320 1625 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
1321 1626 o ea207398892e
1322 1627
1323 1628
1324 1629 Check other fatelog implementations
1325 1630 -----------------------------------
1326 1631
1327 1632 $ hg fatelogkw --hidden -q
1328 1633 @ eb5a0daa2192
1329 1634 |
1330 1635 | x b7ea6d14e664
1331 1636 | | Obsfate: rewritten as 4:eb5a0daa2192
1332 1637 | | x 0dec01379d3b
1333 1638 | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664
1334 1639 | x 471f378eab4c
1335 1640 |/ Obsfate: rewritten as 4:eb5a0daa2192
1336 1641 o ea207398892e
1337 1642
1338 1643 $ hg fatelogkw --hidden
1339 1644 @ eb5a0daa2192
1340 1645 |
1341 1646 | x b7ea6d14e664
1342 1647 | | Obsfate: rewritten as 4:eb5a0daa2192
1343 1648 | | x 0dec01379d3b
1344 1649 | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664
1345 1650 | x 471f378eab4c
1346 1651 |/ Obsfate: rewritten as 4:eb5a0daa2192
1347 1652 o ea207398892e
1348 1653
1349 1654 $ hg fatelogkw --hidden -v
1350 1655 @ eb5a0daa2192
1351 1656 |
1352 1657 | x b7ea6d14e664
1353 1658 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
1354 1659 | | x 0dec01379d3b
1355 1660 | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000)
1356 1661 | x 471f378eab4c
1357 1662 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
1358 1663 o ea207398892e
1359 1664
1360 1665 $ hg log -G -T "default" --hidden
1361 1666 @ changeset: 4:eb5a0daa2192
1362 1667 | tag: tip
1363 1668 | parent: 0:ea207398892e
1364 1669 | user: test
1365 1670 | date: Thu Jan 01 00:00:00 1970 +0000
1366 1671 | summary: C0
1367 1672 |
1368 1673 | x changeset: 3:b7ea6d14e664
1369 1674 | | parent: 1:471f378eab4c
1370 1675 | | user: test
1371 1676 | | date: Thu Jan 01 00:00:00 1970 +0000
1372 1677 | | obsolete: rewritten as 4:eb5a0daa2192
1373 1678 | | summary: B1
1374 1679 | |
1375 1680 | | x changeset: 2:0dec01379d3b
1376 1681 | |/ user: test
1377 1682 | | date: Thu Jan 01 00:00:00 1970 +0000
1378 1683 | | obsolete: rewritten using amend as 3:b7ea6d14e664
1379 1684 | | summary: B0
1380 1685 | |
1381 1686 | x changeset: 1:471f378eab4c
1382 1687 |/ user: test
1383 1688 | date: Thu Jan 01 00:00:00 1970 +0000
1384 1689 | obsolete: rewritten as 4:eb5a0daa2192
1385 1690 | summary: A0
1386 1691 |
1387 1692 o changeset: 0:ea207398892e
1388 1693 user: test
1389 1694 date: Thu Jan 01 00:00:00 1970 +0000
1390 1695 summary: ROOT
1391 1696
1392 1697
1393 1698 Test template with pushed and pulled obs markers
1394 1699 ================================================
1395 1700
1396 1701 Test setup
1397 1702 ----------
1398 1703
1399 1704 $ hg init $TESTTMP/templates-local-remote-markers-1
1400 1705 $ cd $TESTTMP/templates-local-remote-markers-1
1401 1706 $ mkcommit ROOT
1402 1707 $ mkcommit A0
1403 1708 $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
1404 1709 updating to branch default
1405 1710 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1406 1711 $ cd $TESTTMP/templates-local-remote-markers-2
1407 1712 $ hg log --hidden -G
1408 1713 @ changeset: 1:471f378eab4c
1409 1714 | tag: tip
1410 1715 | user: test
1411 1716 | date: Thu Jan 01 00:00:00 1970 +0000
1412 1717 | summary: A0
1413 1718 |
1414 1719 o changeset: 0:ea207398892e
1415 1720 user: test
1416 1721 date: Thu Jan 01 00:00:00 1970 +0000
1417 1722 summary: ROOT
1418 1723
1419 1724 $ cd $TESTTMP/templates-local-remote-markers-1
1420 1725 $ hg commit --amend -m "A1"
1421 1726 $ hg commit --amend -m "A2"
1422 1727 $ hg log --hidden -G
1423 1728 @ changeset: 3:7a230b46bf61
1424 1729 | tag: tip
1425 1730 | parent: 0:ea207398892e
1426 1731 | user: test
1427 1732 | date: Thu Jan 01 00:00:00 1970 +0000
1428 1733 | summary: A2
1429 1734 |
1430 1735 | x changeset: 2:fdf9bde5129a
1431 1736 |/ parent: 0:ea207398892e
1432 1737 | user: test
1433 1738 | date: Thu Jan 01 00:00:00 1970 +0000
1434 1739 | obsolete: rewritten using amend as 3:7a230b46bf61
1435 1740 | summary: A1
1436 1741 |
1437 1742 | x changeset: 1:471f378eab4c
1438 1743 |/ user: test
1439 1744 | date: Thu Jan 01 00:00:00 1970 +0000
1440 1745 | obsolete: rewritten using amend as 2:fdf9bde5129a
1441 1746 | summary: A0
1442 1747 |
1443 1748 o changeset: 0:ea207398892e
1444 1749 user: test
1445 1750 date: Thu Jan 01 00:00:00 1970 +0000
1446 1751 summary: ROOT
1447 1752
1448 1753 $ cd $TESTTMP/templates-local-remote-markers-2
1449 1754 $ hg pull
1450 1755 pulling from $TESTTMP/templates-local-remote-markers-1
1451 1756 searching for changes
1452 1757 adding changesets
1453 1758 adding manifests
1454 1759 adding file changes
1455 1760 added 1 changesets with 0 changes to 1 files (+1 heads)
1456 1761 2 new obsolescence markers
1457 1762 obsoleted 1 changesets
1458 1763 new changesets 7a230b46bf61 (1 drafts)
1459 1764 (run 'hg heads' to see heads, 'hg merge' to merge)
1460 1765 $ hg log --hidden -G
1461 1766 o changeset: 2:7a230b46bf61
1462 1767 | tag: tip
1463 1768 | parent: 0:ea207398892e
1464 1769 | user: test
1465 1770 | date: Thu Jan 01 00:00:00 1970 +0000
1466 1771 | summary: A2
1467 1772 |
1468 1773 | @ changeset: 1:471f378eab4c
1469 1774 |/ user: test
1470 1775 | date: Thu Jan 01 00:00:00 1970 +0000
1471 1776 | obsolete: rewritten using amend as 2:7a230b46bf61
1472 1777 | summary: A0
1473 1778 |
1474 1779 o changeset: 0:ea207398892e
1475 1780 user: test
1476 1781 date: Thu Jan 01 00:00:00 1970 +0000
1477 1782 summary: ROOT
1478 1783
1479 1784
1480 1785 $ hg debugobsolete
1481 1786 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1482 1787 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1483 1788
1484 1789 Check templates
1485 1790 ---------------
1486 1791
1487 1792 Predecessors template should show current revision as it is the working copy
1488 1793 $ hg tlog
1489 1794 o 7a230b46bf61
1490 1795 | Predecessors: 1:471f378eab4c
1491 1796 | semi-colon: 1:471f378eab4c
1492 1797 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1493 1798 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1799 | Successors:
1800 | multi-line:
1801 | json: ""
1494 1802 | @ 471f378eab4c
1495 |/ Successors: 2:7a230b46bf61
1803 |/ Predecessors:
1804 | semi-colon:
1805 | json: []
1806 | map:
1807 | Successors: 2:7a230b46bf61
1496 1808 | multi-line: 2:7a230b46bf61
1497 1809 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
1498 1810 o ea207398892e
1499
1811 Predecessors:
1812 semi-colon:
1813 json: []
1814 map:
1815 Successors:
1816 multi-line:
1817 json: ""
1500 1818
1501 1819 $ hg fatelog
1502 1820 o 7a230b46bf61
1503 1821 |
1504 1822 | @ 471f378eab4c
1505 1823 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
1506 1824 o ea207398892e
1507 1825
1508 1826 $ hg up 'desc(A2)'
1509 1827 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1510 1828
1511 1829 Predecessors template should show no predecessors as they are non visible
1512 1830 $ hg tlog
1513 1831 @ 7a230b46bf61
1514 |
1832 | Predecessors:
1833 | semi-colon:
1834 | json: []
1835 | map:
1836 | Successors:
1837 | multi-line:
1838 | json: ""
1515 1839 o ea207398892e
1516
1840 Predecessors:
1841 semi-colon:
1842 json: []
1843 map:
1844 Successors:
1845 multi-line:
1846 json: ""
1517 1847
1518 1848 $ hg fatelog
1519 1849 @ 7a230b46bf61
1520 1850 |
1521 1851 o ea207398892e
1522 1852
1523 1853 Predecessors template should show all predecessors as we force their display
1524 1854 with --hidden
1525 1855 $ hg tlog --hidden
1526 1856 @ 7a230b46bf61
1527 1857 | Predecessors: 1:471f378eab4c
1528 1858 | semi-colon: 1:471f378eab4c
1529 1859 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1530 1860 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1861 | Successors:
1862 | multi-line:
1863 | json: ""
1531 1864 | x 471f378eab4c
1532 |/ Successors: 2:7a230b46bf61
1865 |/ Predecessors:
1866 | semi-colon:
1867 | json: []
1868 | map:
1869 | Successors: 2:7a230b46bf61
1533 1870 | multi-line: 2:7a230b46bf61
1534 1871 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
1535 1872 o ea207398892e
1536
1873 Predecessors:
1874 semi-colon:
1875 json: []
1876 map:
1877 Successors:
1878 multi-line:
1879 json: ""
1537 1880
1538 1881 $ hg fatelog --hidden
1539 1882 @ 7a230b46bf61
1540 1883 |
1541 1884 | x 471f378eab4c
1542 1885 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
1543 1886 o ea207398892e
1544 1887
1545 1888
1546 1889 Check other fatelog implementations
1547 1890 -----------------------------------
1548 1891
1549 1892 $ hg fatelogkw --hidden -q
1550 1893 @ 7a230b46bf61
1551 1894 |
1552 1895 | x 471f378eab4c
1553 1896 |/ Obsfate: rewritten using amend as 2:7a230b46bf61
1554 1897 o ea207398892e
1555 1898
1556 1899 $ hg fatelogkw --hidden
1557 1900 @ 7a230b46bf61
1558 1901 |
1559 1902 | x 471f378eab4c
1560 1903 |/ Obsfate: rewritten using amend as 2:7a230b46bf61
1561 1904 o ea207398892e
1562 1905
1563 1906 $ hg fatelogkw --hidden -v
1564 1907 @ 7a230b46bf61
1565 1908 |
1566 1909 | x 471f378eab4c
1567 1910 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
1568 1911 o ea207398892e
1569 1912
1570 1913 $ hg log -G -T "default" --hidden
1571 1914 @ changeset: 2:7a230b46bf61
1572 1915 | tag: tip
1573 1916 | parent: 0:ea207398892e
1574 1917 | user: test
1575 1918 | date: Thu Jan 01 00:00:00 1970 +0000
1576 1919 | summary: A2
1577 1920 |
1578 1921 | x changeset: 1:471f378eab4c
1579 1922 |/ user: test
1580 1923 | date: Thu Jan 01 00:00:00 1970 +0000
1581 1924 | obsolete: rewritten using amend as 2:7a230b46bf61
1582 1925 | summary: A0
1583 1926 |
1584 1927 o changeset: 0:ea207398892e
1585 1928 user: test
1586 1929 date: Thu Jan 01 00:00:00 1970 +0000
1587 1930 summary: ROOT
1588 1931
1589 1932
1590 1933 Test template with obsmarkers cycle
1591 1934 ===================================
1592 1935
1593 1936 Test setup
1594 1937 ----------
1595 1938
1596 1939 $ hg init $TESTTMP/templates-local-cycle
1597 1940 $ cd $TESTTMP/templates-local-cycle
1598 1941 $ mkcommit ROOT
1599 1942 $ mkcommit A0
1600 1943 $ mkcommit B0
1601 1944 $ hg up -r 0
1602 1945 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1603 1946 $ mkcommit C0
1604 1947 created new head
1605 1948
1606 1949 Create the cycle
1607 1950
1608 1951 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
1609 1952 1 new obsolescence markers
1610 1953 obsoleted 1 changesets
1611 1954 1 new orphan changesets
1612 1955 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
1613 1956 1 new obsolescence markers
1614 1957 obsoleted 1 changesets
1615 1958 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1616 1959 1 new obsolescence markers
1617 1960
1618 1961 Check templates
1619 1962 ---------------
1620 1963
1621 1964 $ hg tlog
1622 1965 @ f897c6137566
1623 |
1966 | Predecessors:
1967 | semi-colon:
1968 | json: []
1969 | map:
1970 | Successors:
1971 | multi-line:
1972 | json: ""
1624 1973 o ea207398892e
1625
1974 Predecessors:
1975 semi-colon:
1976 json: []
1977 map:
1978 Successors:
1979 multi-line:
1980 json: ""
1626 1981
1627 1982 $ hg fatelog
1628 1983 @ f897c6137566
1629 1984 |
1630 1985 o ea207398892e
1631 1986
1632 1987
1633 1988 $ hg up -r "desc(B0)" --hidden
1634 1989 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1635 1990 updated to hidden changeset 0dec01379d3b
1636 1991 (hidden revision '0dec01379d3b' is pruned)
1637 1992 $ hg tlog
1638 1993 o f897c6137566
1639 1994 | Predecessors: 2:0dec01379d3b
1640 1995 | semi-colon: 2:0dec01379d3b
1641 1996 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1642 1997 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1998 | Successors:
1999 | multi-line:
2000 | json: ""
1643 2001 | @ 0dec01379d3b
1644 2002 | | Predecessors: 1:471f378eab4c
1645 2003 | | semi-colon: 1:471f378eab4c
1646 2004 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1647 2005 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1648 2006 | | Successors: 3:f897c6137566; 1:471f378eab4c
1649 2007 | | multi-line: 3:f897c6137566
1650 2008 | | multi-line: 1:471f378eab4c
1651 2009 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1652 2010 | x 471f378eab4c
1653 2011 |/ Predecessors: 2:0dec01379d3b
1654 2012 | semi-colon: 2:0dec01379d3b
1655 2013 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1656 2014 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1657 2015 | Successors: 2:0dec01379d3b
1658 2016 | multi-line: 2:0dec01379d3b
1659 2017 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1660 2018 o ea207398892e
1661
2019 Predecessors:
2020 semi-colon:
2021 json: []
2022 map:
2023 Successors:
2024 multi-line:
2025 json: ""
1662 2026
1663 2027 $ hg fatelog
1664 2028 o f897c6137566
1665 2029 |
1666 2030 | @ 0dec01379d3b
1667 2031 | | 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);
1668 2032 | x 471f378eab4c
1669 2033 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
1670 2034 o ea207398892e
1671 2035
1672 2036
1673 2037 $ hg up -r "desc(A0)" --hidden
1674 2038 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1675 2039 $ hg tlog
1676 2040 o f897c6137566
1677 2041 | Predecessors: 1:471f378eab4c
1678 2042 | semi-colon: 1:471f378eab4c
1679 2043 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1680 2044 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
2045 | Successors:
2046 | multi-line:
2047 | json: ""
1681 2048 | @ 471f378eab4c
1682 |/
2049 |/ Predecessors:
2050 | semi-colon:
2051 | json: []
2052 | map:
2053 | Successors:
2054 | multi-line:
2055 | json: []
1683 2056 o ea207398892e
1684
2057 Predecessors:
2058 semi-colon:
2059 json: []
2060 map:
2061 Successors:
2062 multi-line:
2063 json: ""
1685 2064
1686 2065 $ hg fatelog
1687 2066 o f897c6137566
1688 2067 |
1689 2068 | @ 471f378eab4c
1690 2069 |/ Obsfate: pruned;
1691 2070 o ea207398892e
1692 2071
1693 2072
1694 2073 $ hg up -r "desc(ROOT)" --hidden
1695 2074 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1696 2075 $ hg tlog
1697 2076 o f897c6137566
1698 |
2077 | Predecessors:
2078 | semi-colon:
2079 | json: []
2080 | map:
2081 | Successors:
2082 | multi-line:
2083 | json: ""
1699 2084 @ ea207398892e
1700
2085 Predecessors:
2086 semi-colon:
2087 json: []
2088 map:
2089 Successors:
2090 multi-line:
2091 json: ""
1701 2092
1702 2093 $ hg fatelog
1703 2094 o f897c6137566
1704 2095 |
1705 2096 @ ea207398892e
1706 2097
1707 2098
1708 2099 $ hg tlog --hidden
1709 2100 o f897c6137566
1710 2101 | Predecessors: 2:0dec01379d3b
1711 2102 | semi-colon: 2:0dec01379d3b
1712 2103 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1713 2104 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
2105 | Successors:
2106 | multi-line:
2107 | json: ""
1714 2108 | x 0dec01379d3b
1715 2109 | | Predecessors: 1:471f378eab4c
1716 2110 | | semi-colon: 1:471f378eab4c
1717 2111 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1718 2112 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1719 2113 | | Successors: 3:f897c6137566; 1:471f378eab4c
1720 2114 | | multi-line: 3:f897c6137566
1721 2115 | | multi-line: 1:471f378eab4c
1722 2116 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1723 2117 | x 471f378eab4c
1724 2118 |/ Predecessors: 2:0dec01379d3b
1725 2119 | semi-colon: 2:0dec01379d3b
1726 2120 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1727 2121 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1728 2122 | Successors: 2:0dec01379d3b
1729 2123 | multi-line: 2:0dec01379d3b
1730 2124 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1731 2125 @ ea207398892e
1732
2126 Predecessors:
2127 semi-colon:
2128 json: []
2129 map:
2130 Successors:
2131 multi-line:
2132 json: ""
1733 2133
1734 2134 Check other fatelog implementations
1735 2135 -----------------------------------
1736 2136
1737 2137 $ hg fatelogkw --hidden -q
1738 2138 o f897c6137566
1739 2139 |
1740 2140 | x 0dec01379d3b
1741 2141 | | Obsfate: rewritten as 3:f897c6137566
1742 2142 | | Obsfate: rewritten as 1:471f378eab4c
1743 2143 | x 471f378eab4c
1744 2144 |/ Obsfate: rewritten as 2:0dec01379d3b
1745 2145 @ ea207398892e
1746 2146
1747 2147 $ hg fatelogkw --hidden
1748 2148 o f897c6137566
1749 2149 |
1750 2150 | x 0dec01379d3b
1751 2151 | | Obsfate: rewritten as 3:f897c6137566
1752 2152 | | Obsfate: rewritten as 1:471f378eab4c
1753 2153 | x 471f378eab4c
1754 2154 |/ Obsfate: rewritten as 2:0dec01379d3b
1755 2155 @ ea207398892e
1756 2156
1757 2157 $ hg fatelogkw --hidden -v
1758 2158 o f897c6137566
1759 2159 |
1760 2160 | x 0dec01379d3b
1761 2161 | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000)
1762 2162 | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000)
1763 2163 | x 471f378eab4c
1764 2164 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000)
1765 2165 @ ea207398892e
1766 2166
1767 2167 $ hg log -G -T "default" --hidden
1768 2168 o changeset: 3:f897c6137566
1769 2169 | tag: tip
1770 2170 | parent: 0:ea207398892e
1771 2171 | user: test
1772 2172 | date: Thu Jan 01 00:00:00 1970 +0000
1773 2173 | summary: C0
1774 2174 |
1775 2175 | x changeset: 2:0dec01379d3b
1776 2176 | | user: test
1777 2177 | | date: Thu Jan 01 00:00:00 1970 +0000
1778 2178 | | obsolete: rewritten as 3:f897c6137566
1779 2179 | | obsolete: rewritten as 1:471f378eab4c
1780 2180 | | summary: B0
1781 2181 | |
1782 2182 | x changeset: 1:471f378eab4c
1783 2183 |/ user: test
1784 2184 | date: Thu Jan 01 00:00:00 1970 +0000
1785 2185 | obsolete: rewritten as 2:0dec01379d3b
1786 2186 | summary: A0
1787 2187 |
1788 2188 @ changeset: 0:ea207398892e
1789 2189 user: test
1790 2190 date: Thu Jan 01 00:00:00 1970 +0000
1791 2191 summary: ROOT
1792 2192
1793 2193
1794 2194 Test template with split + divergence with cycles
1795 2195 =================================================
1796 2196
1797 2197 $ hg log -G
1798 2198 o changeset: 3:f897c6137566
1799 2199 | tag: tip
1800 2200 | parent: 0:ea207398892e
1801 2201 | user: test
1802 2202 | date: Thu Jan 01 00:00:00 1970 +0000
1803 2203 | summary: C0
1804 2204 |
1805 2205 @ changeset: 0:ea207398892e
1806 2206 user: test
1807 2207 date: Thu Jan 01 00:00:00 1970 +0000
1808 2208 summary: ROOT
1809 2209
1810 2210 $ hg up
1811 2211 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1812 2212
1813 2213 Create a commit with three files
1814 2214 $ touch A B C
1815 2215 $ hg commit -A -m "Add A,B,C" A B C
1816 2216
1817 2217 Split it
1818 2218 $ hg up 3
1819 2219 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
1820 2220 $ touch A
1821 2221 $ hg commit -A -m "Add A,B,C" A
1822 2222 created new head
1823 2223
1824 2224 $ touch B
1825 2225 $ hg commit -A -m "Add A,B,C" B
1826 2226
1827 2227 $ touch C
1828 2228 $ hg commit -A -m "Add A,B,C" C
1829 2229
1830 2230 $ hg log -G
1831 2231 @ changeset: 7:ba2ed02b0c9a
1832 2232 | tag: tip
1833 2233 | user: test
1834 2234 | date: Thu Jan 01 00:00:00 1970 +0000
1835 2235 | summary: Add A,B,C
1836 2236 |
1837 2237 o changeset: 6:4a004186e638
1838 2238 | user: test
1839 2239 | date: Thu Jan 01 00:00:00 1970 +0000
1840 2240 | summary: Add A,B,C
1841 2241 |
1842 2242 o changeset: 5:dd800401bd8c
1843 2243 | parent: 3:f897c6137566
1844 2244 | user: test
1845 2245 | date: Thu Jan 01 00:00:00 1970 +0000
1846 2246 | summary: Add A,B,C
1847 2247 |
1848 2248 | o changeset: 4:9bd10a0775e4
1849 2249 |/ user: test
1850 2250 | date: Thu Jan 01 00:00:00 1970 +0000
1851 2251 | summary: Add A,B,C
1852 2252 |
1853 2253 o changeset: 3:f897c6137566
1854 2254 | parent: 0:ea207398892e
1855 2255 | user: test
1856 2256 | date: Thu Jan 01 00:00:00 1970 +0000
1857 2257 | summary: C0
1858 2258 |
1859 2259 o changeset: 0:ea207398892e
1860 2260 user: test
1861 2261 date: Thu Jan 01 00:00:00 1970 +0000
1862 2262 summary: ROOT
1863 2263
1864 2264 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
1865 2265 1 new obsolescence markers
1866 2266 obsoleted 1 changesets
1867 2267 $ hg log -G
1868 2268 @ changeset: 7:ba2ed02b0c9a
1869 2269 | tag: tip
1870 2270 | user: test
1871 2271 | date: Thu Jan 01 00:00:00 1970 +0000
1872 2272 | summary: Add A,B,C
1873 2273 |
1874 2274 o changeset: 6:4a004186e638
1875 2275 | user: test
1876 2276 | date: Thu Jan 01 00:00:00 1970 +0000
1877 2277 | summary: Add A,B,C
1878 2278 |
1879 2279 o changeset: 5:dd800401bd8c
1880 2280 | parent: 3:f897c6137566
1881 2281 | user: test
1882 2282 | date: Thu Jan 01 00:00:00 1970 +0000
1883 2283 | summary: Add A,B,C
1884 2284 |
1885 2285 o changeset: 3:f897c6137566
1886 2286 | parent: 0:ea207398892e
1887 2287 | user: test
1888 2288 | date: Thu Jan 01 00:00:00 1970 +0000
1889 2289 | summary: C0
1890 2290 |
1891 2291 o changeset: 0:ea207398892e
1892 2292 user: test
1893 2293 date: Thu Jan 01 00:00:00 1970 +0000
1894 2294 summary: ROOT
1895 2295
1896 2296 Diverge one of the splitted commit
1897 2297
1898 2298 $ hg up 6
1899 2299 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1900 2300 $ hg commit --amend -m "Add only B"
1901 2301 1 new orphan changesets
1902 2302
1903 2303 $ hg up 6 --hidden
1904 2304 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1905 2305 $ hg commit --amend -m "Add B only"
1906 2306 4 new content-divergent changesets
1907 2307
1908 2308 $ hg log -G
1909 2309 @ changeset: 9:0b997eb7ceee
1910 2310 | tag: tip
1911 2311 | parent: 5:dd800401bd8c
1912 2312 | user: test
1913 2313 | date: Thu Jan 01 00:00:00 1970 +0000
1914 2314 | instability: content-divergent
1915 2315 | summary: Add B only
1916 2316 |
1917 2317 | * changeset: 8:b18bc8331526
1918 2318 |/ parent: 5:dd800401bd8c
1919 2319 | user: test
1920 2320 | date: Thu Jan 01 00:00:00 1970 +0000
1921 2321 | instability: content-divergent
1922 2322 | summary: Add only B
1923 2323 |
1924 2324 | * changeset: 7:ba2ed02b0c9a
1925 2325 | | user: test
1926 2326 | | date: Thu Jan 01 00:00:00 1970 +0000
1927 2327 | | instability: orphan, content-divergent
1928 2328 | | summary: Add A,B,C
1929 2329 | |
1930 2330 | x changeset: 6:4a004186e638
1931 2331 |/ user: test
1932 2332 | date: Thu Jan 01 00:00:00 1970 +0000
1933 2333 | obsolete: rewritten using amend as 8:b18bc8331526
1934 2334 | obsolete: rewritten using amend as 9:0b997eb7ceee
1935 2335 | summary: Add A,B,C
1936 2336 |
1937 2337 * changeset: 5:dd800401bd8c
1938 2338 | parent: 3:f897c6137566
1939 2339 | user: test
1940 2340 | date: Thu Jan 01 00:00:00 1970 +0000
1941 2341 | instability: content-divergent
1942 2342 | summary: Add A,B,C
1943 2343 |
1944 2344 o changeset: 3:f897c6137566
1945 2345 | parent: 0:ea207398892e
1946 2346 | user: test
1947 2347 | date: Thu Jan 01 00:00:00 1970 +0000
1948 2348 | summary: C0
1949 2349 |
1950 2350 o changeset: 0:ea207398892e
1951 2351 user: test
1952 2352 date: Thu Jan 01 00:00:00 1970 +0000
1953 2353 summary: ROOT
1954 2354
1955 2355
1956 2356 Check templates
1957 2357 ---------------
1958 2358
1959 2359 $ hg tlog
1960 2360 @ 0b997eb7ceee
1961 2361 | Predecessors: 6:4a004186e638
1962 2362 | semi-colon: 6:4a004186e638
1963 2363 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1964 2364 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
2365 | Successors:
2366 | multi-line:
2367 | json: ""
1965 2368 | * b18bc8331526
1966 2369 |/ Predecessors: 6:4a004186e638
1967 2370 | semi-colon: 6:4a004186e638
1968 2371 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1969 2372 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
2373 | Successors:
2374 | multi-line:
2375 | json: ""
1970 2376 | * ba2ed02b0c9a
1971 | |
2377 | | Predecessors:
2378 | | semi-colon:
2379 | | json: []
2380 | | map:
2381 | | Successors:
2382 | | multi-line:
2383 | | json: ""
1972 2384 | x 4a004186e638
1973 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
2385 |/ Predecessors:
2386 | semi-colon:
2387 | json: []
2388 | map:
2389 | Successors: 8:b18bc8331526; 9:0b997eb7ceee
1974 2390 | multi-line: 8:b18bc8331526
1975 2391 | multi-line: 9:0b997eb7ceee
1976 2392 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
1977 2393 * dd800401bd8c
1978 |
2394 | Predecessors:
2395 | semi-colon:
2396 | json: []
2397 | map:
2398 | Successors:
2399 | multi-line:
2400 | json: ""
1979 2401 o f897c6137566
1980 |
2402 | Predecessors:
2403 | semi-colon:
2404 | json: []
2405 | map:
2406 | Successors:
2407 | multi-line:
2408 | json: ""
1981 2409 o ea207398892e
1982
2410 Predecessors:
2411 semi-colon:
2412 json: []
2413 map:
2414 Successors:
2415 multi-line:
2416 json: ""
1983 2417 $ hg fatelog
1984 2418 @ 0b997eb7ceee
1985 2419 |
1986 2420 | * b18bc8331526
1987 2421 |/
1988 2422 | * ba2ed02b0c9a
1989 2423 | |
1990 2424 | x 4a004186e638
1991 2425 |/ 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);
1992 2426 * dd800401bd8c
1993 2427 |
1994 2428 o f897c6137566
1995 2429 |
1996 2430 o ea207398892e
1997 2431
1998 2432 $ hg tlog --hidden
1999 2433 @ 0b997eb7ceee
2000 2434 | Predecessors: 6:4a004186e638
2001 2435 | semi-colon: 6:4a004186e638
2002 2436 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
2003 2437 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
2438 | Successors:
2439 | multi-line:
2440 | json: ""
2004 2441 | * b18bc8331526
2005 2442 |/ Predecessors: 6:4a004186e638
2006 2443 | semi-colon: 6:4a004186e638
2007 2444 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
2008 2445 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
2446 | Successors:
2447 | multi-line:
2448 | json: ""
2009 2449 | * ba2ed02b0c9a
2010 2450 | | Predecessors: 4:9bd10a0775e4
2011 2451 | | semi-colon: 4:9bd10a0775e4
2012 2452 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
2013 2453 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
2454 | | Successors:
2455 | | multi-line:
2456 | | json: ""
2014 2457 | x 4a004186e638
2015 2458 |/ Predecessors: 4:9bd10a0775e4
2016 2459 | semi-colon: 4:9bd10a0775e4
2017 2460 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
2018 2461 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
2019 2462 | Successors: 8:b18bc8331526; 9:0b997eb7ceee
2020 2463 | multi-line: 8:b18bc8331526
2021 2464 | multi-line: 9:0b997eb7ceee
2022 2465 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
2023 2466 * dd800401bd8c
2024 2467 | Predecessors: 4:9bd10a0775e4
2025 2468 | semi-colon: 4:9bd10a0775e4
2026 2469 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
2027 2470 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
2471 | Successors:
2472 | multi-line:
2473 | json: ""
2028 2474 | x 9bd10a0775e4
2029 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
2475 |/ Predecessors:
2476 | semi-colon:
2477 | json: []
2478 | map:
2479 | Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
2030 2480 | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
2031 2481 | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]]
2032 2482 o f897c6137566
2033 2483 | Predecessors: 2:0dec01379d3b
2034 2484 | semi-colon: 2:0dec01379d3b
2035 2485 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
2036 2486 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
2487 | Successors:
2488 | multi-line:
2489 | json: ""
2037 2490 | x 0dec01379d3b
2038 2491 | | Predecessors: 1:471f378eab4c
2039 2492 | | semi-colon: 1:471f378eab4c
2040 2493 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
2041 2494 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
2042 2495 | | Successors: 3:f897c6137566; 1:471f378eab4c
2043 2496 | | multi-line: 3:f897c6137566
2044 2497 | | multi-line: 1:471f378eab4c
2045 2498 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
2046 2499 | x 471f378eab4c
2047 2500 |/ Predecessors: 2:0dec01379d3b
2048 2501 | semi-colon: 2:0dec01379d3b
2049 2502 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
2050 2503 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
2051 2504 | Successors: 2:0dec01379d3b
2052 2505 | multi-line: 2:0dec01379d3b
2053 2506 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
2054 2507 o ea207398892e
2055
2508 Predecessors:
2509 semi-colon:
2510 json: []
2511 map:
2512 Successors:
2513 multi-line:
2514 json: ""
2056 2515 $ hg fatelog --hidden
2057 2516 @ 0b997eb7ceee
2058 2517 |
2059 2518 | * b18bc8331526
2060 2519 |/
2061 2520 | * ba2ed02b0c9a
2062 2521 | |
2063 2522 | x 4a004186e638
2064 2523 |/ 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);
2065 2524 * dd800401bd8c
2066 2525 |
2067 2526 | x 9bd10a0775e4
2068 2527 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000);
2069 2528 o f897c6137566
2070 2529 |
2071 2530 | x 0dec01379d3b
2072 2531 | | 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);
2073 2532 | x 471f378eab4c
2074 2533 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
2075 2534 o ea207398892e
2076 2535
2077 2536 $ hg fatelogjson --hidden
2078 2537 @ 0b997eb7ceee
2079 2538 |
2080 2539 | * b18bc8331526
2081 2540 |/
2082 2541 | * ba2ed02b0c9a
2083 2542 | |
2084 2543 | x 4a004186e638
2085 2544 |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}]
2086 2545 * dd800401bd8c
2087 2546 |
2088 2547 | x 9bd10a0775e4
2089 2548 |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}]
2090 2549 o f897c6137566
2091 2550 |
2092 2551 | x 0dec01379d3b
2093 2552 | | 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"]}]
2094 2553 | x 471f378eab4c
2095 2554 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}]
2096 2555 o ea207398892e
2097 2556
2098 2557 $ hg up --hidden 4
2099 2558 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2100 2559 updated to hidden changeset 9bd10a0775e4
2101 2560 (hidden revision '9bd10a0775e4' has diverged)
2102 2561 $ hg rebase -r 7 -d 8 --config extensions.rebase=
2103 2562 rebasing 7:ba2ed02b0c9a "Add A,B,C"
2104 2563 $ hg tlog
2105 2564 * eceed8f98ffc
2106 2565 | Predecessors: 4:9bd10a0775e4
2107 2566 | semi-colon: 4:9bd10a0775e4
2108 2567 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
2109 2568 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
2569 | Successors:
2570 | multi-line:
2571 | json: ""
2110 2572 | * 0b997eb7ceee
2111 2573 | | Predecessors: 4:9bd10a0775e4
2112 2574 | | semi-colon: 4:9bd10a0775e4
2113 2575 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
2114 2576 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
2577 | | Successors:
2578 | | multi-line:
2579 | | json: ""
2115 2580 * | b18bc8331526
2116 2581 |/ Predecessors: 4:9bd10a0775e4
2117 2582 | semi-colon: 4:9bd10a0775e4
2118 2583 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
2119 2584 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
2585 | Successors:
2586 | multi-line:
2587 | json: ""
2120 2588 * dd800401bd8c
2121 2589 | Predecessors: 4:9bd10a0775e4
2122 2590 | semi-colon: 4:9bd10a0775e4
2123 2591 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
2124 2592 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
2593 | Successors:
2594 | multi-line:
2595 | json: ""
2125 2596 | @ 9bd10a0775e4
2126 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
2597 |/ Predecessors:
2598 | semi-colon:
2599 | json: []
2600 | map:
2601 | Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
2127 2602 | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc
2128 2603 | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
2129 2604 | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]]
2130 2605 o f897c6137566
2131 |
2606 | Predecessors:
2607 | semi-colon:
2608 | json: []
2609 | map:
2610 | Successors:
2611 | multi-line:
2612 | json: ""
2132 2613 o ea207398892e
2133
2614 Predecessors:
2615 semi-colon:
2616 json: []
2617 map:
2618 Successors:
2619 multi-line:
2620 json: ""
2134 2621
2135 2622 $ hg fatelog
2136 2623 * eceed8f98ffc
2137 2624 |
2138 2625 | * 0b997eb7ceee
2139 2626 | |
2140 2627 * | b18bc8331526
2141 2628 |/
2142 2629 * dd800401bd8c
2143 2630 |
2144 2631 | @ 9bd10a0775e4
2145 2632 |/ 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);
2146 2633 o f897c6137566
2147 2634 |
2148 2635 o ea207398892e
2149 2636
2150 2637 Check other fatelog implementations
2151 2638 -----------------------------------
2152 2639
2153 2640 $ hg fatelogkw --hidden -q
2154 2641 * eceed8f98ffc
2155 2642 |
2156 2643 | * 0b997eb7ceee
2157 2644 | |
2158 2645 * | b18bc8331526
2159 2646 |/
2160 2647 | x ba2ed02b0c9a
2161 2648 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc
2162 2649 | x 4a004186e638
2163 2650 |/ Obsfate: rewritten using amend as 8:b18bc8331526
2164 2651 | Obsfate: rewritten using amend as 9:0b997eb7ceee
2165 2652 * dd800401bd8c
2166 2653 |
2167 2654 | @ 9bd10a0775e4
2168 2655 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
2169 2656 o f897c6137566
2170 2657 |
2171 2658 | x 0dec01379d3b
2172 2659 | | Obsfate: rewritten as 3:f897c6137566
2173 2660 | | Obsfate: rewritten as 1:471f378eab4c
2174 2661 | x 471f378eab4c
2175 2662 |/ Obsfate: rewritten as 2:0dec01379d3b
2176 2663 o ea207398892e
2177 2664
2178 2665 $ hg fatelogkw --hidden
2179 2666 * eceed8f98ffc
2180 2667 |
2181 2668 | * 0b997eb7ceee
2182 2669 | |
2183 2670 * | b18bc8331526
2184 2671 |/
2185 2672 | x ba2ed02b0c9a
2186 2673 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc
2187 2674 | x 4a004186e638
2188 2675 |/ Obsfate: rewritten using amend as 8:b18bc8331526
2189 2676 | Obsfate: rewritten using amend as 9:0b997eb7ceee
2190 2677 * dd800401bd8c
2191 2678 |
2192 2679 | @ 9bd10a0775e4
2193 2680 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
2194 2681 o f897c6137566
2195 2682 |
2196 2683 | x 0dec01379d3b
2197 2684 | | Obsfate: rewritten as 3:f897c6137566
2198 2685 | | Obsfate: rewritten as 1:471f378eab4c
2199 2686 | x 471f378eab4c
2200 2687 |/ Obsfate: rewritten as 2:0dec01379d3b
2201 2688 o ea207398892e
2202 2689
2203 2690 $ hg fatelogkw --hidden -v
2204 2691 * eceed8f98ffc
2205 2692 |
2206 2693 | * 0b997eb7ceee
2207 2694 | |
2208 2695 * | b18bc8331526
2209 2696 |/
2210 2697 | x ba2ed02b0c9a
2211 2698 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000)
2212 2699 | x 4a004186e638
2213 2700 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000)
2214 2701 | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000)
2215 2702 * dd800401bd8c
2216 2703 |
2217 2704 | @ 9bd10a0775e4
2218 2705 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000)
2219 2706 o f897c6137566
2220 2707 |
2221 2708 | x 0dec01379d3b
2222 2709 | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000)
2223 2710 | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000)
2224 2711 | x 471f378eab4c
2225 2712 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000)
2226 2713 o ea207398892e
2227 2714
2228 2715 $ hg log -G -T "default" --hidden
2229 2716 * changeset: 10:eceed8f98ffc
2230 2717 | tag: tip
2231 2718 | parent: 8:b18bc8331526
2232 2719 | user: test
2233 2720 | date: Thu Jan 01 00:00:00 1970 +0000
2234 2721 | instability: content-divergent
2235 2722 | summary: Add A,B,C
2236 2723 |
2237 2724 | * changeset: 9:0b997eb7ceee
2238 2725 | | parent: 5:dd800401bd8c
2239 2726 | | user: test
2240 2727 | | date: Thu Jan 01 00:00:00 1970 +0000
2241 2728 | | instability: content-divergent
2242 2729 | | summary: Add B only
2243 2730 | |
2244 2731 * | changeset: 8:b18bc8331526
2245 2732 |/ parent: 5:dd800401bd8c
2246 2733 | user: test
2247 2734 | date: Thu Jan 01 00:00:00 1970 +0000
2248 2735 | instability: content-divergent
2249 2736 | summary: Add only B
2250 2737 |
2251 2738 | x changeset: 7:ba2ed02b0c9a
2252 2739 | | user: test
2253 2740 | | date: Thu Jan 01 00:00:00 1970 +0000
2254 2741 | | obsolete: rewritten using rebase as 10:eceed8f98ffc
2255 2742 | | summary: Add A,B,C
2256 2743 | |
2257 2744 | x changeset: 6:4a004186e638
2258 2745 |/ user: test
2259 2746 | date: Thu Jan 01 00:00:00 1970 +0000
2260 2747 | obsolete: rewritten using amend as 8:b18bc8331526
2261 2748 | obsolete: rewritten using amend as 9:0b997eb7ceee
2262 2749 | summary: Add A,B,C
2263 2750 |
2264 2751 * changeset: 5:dd800401bd8c
2265 2752 | parent: 3:f897c6137566
2266 2753 | user: test
2267 2754 | date: Thu Jan 01 00:00:00 1970 +0000
2268 2755 | instability: content-divergent
2269 2756 | summary: Add A,B,C
2270 2757 |
2271 2758 | @ changeset: 4:9bd10a0775e4
2272 2759 |/ user: test
2273 2760 | date: Thu Jan 01 00:00:00 1970 +0000
2274 2761 | obsolete: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
2275 2762 | summary: Add A,B,C
2276 2763 |
2277 2764 o changeset: 3:f897c6137566
2278 2765 | parent: 0:ea207398892e
2279 2766 | user: test
2280 2767 | date: Thu Jan 01 00:00:00 1970 +0000
2281 2768 | summary: C0
2282 2769 |
2283 2770 | x changeset: 2:0dec01379d3b
2284 2771 | | user: test
2285 2772 | | date: Thu Jan 01 00:00:00 1970 +0000
2286 2773 | | obsolete: rewritten as 3:f897c6137566
2287 2774 | | obsolete: rewritten as 1:471f378eab4c
2288 2775 | | summary: B0
2289 2776 | |
2290 2777 | x changeset: 1:471f378eab4c
2291 2778 |/ user: test
2292 2779 | date: Thu Jan 01 00:00:00 1970 +0000
2293 2780 | obsolete: rewritten as 2:0dec01379d3b
2294 2781 | summary: A0
2295 2782 |
2296 2783 o changeset: 0:ea207398892e
2297 2784 user: test
2298 2785 date: Thu Jan 01 00:00:00 1970 +0000
2299 2786 summary: ROOT
2300 2787
2301 2788
2302 2789 Test templates with pruned commits
2303 2790 ==================================
2304 2791
2305 2792 Test setup
2306 2793 ----------
2307 2794
2308 2795 $ hg init $TESTTMP/templates-local-prune
2309 2796 $ cd $TESTTMP/templates-local-prune
2310 2797 $ mkcommit ROOT
2311 2798 $ mkcommit A0
2312 2799 $ hg debugobsolete --record-parent `getid "."`
2313 2800 1 new obsolescence markers
2314 2801 obsoleted 1 changesets
2315 2802
2316 2803 Check output
2317 2804 ------------
2318 2805
2319 2806 $ hg up "desc(A0)" --hidden
2320 2807 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2321 2808 $ hg tlog
2322 2809 @ 471f378eab4c
2323 |
2810 | Predecessors:
2811 | semi-colon:
2812 | json: []
2813 | map:
2814 | Successors:
2815 | multi-line:
2816 | json: []
2324 2817 o ea207398892e
2325
2818 Predecessors:
2819 semi-colon:
2820 json: []
2821 map:
2822 Successors:
2823 multi-line:
2824 json: ""
2326 2825 $ hg fatelog
2327 2826 @ 471f378eab4c
2328 2827 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
2329 2828 o ea207398892e
2330 2829
2331 2830 Test templates with multiple pruned commits
2332 2831 ===========================================
2333 2832
2334 2833 Test setup
2335 2834 ----------
2336 2835
2337 2836 $ hg init $TESTTMP/multiple-local-prune
2338 2837 $ cd $TESTTMP/multiple-local-prune
2339 2838 $ mkcommit ROOT
2340 2839 $ mkcommit A0
2341 2840 $ hg commit --amend -m "A1"
2342 2841 $ hg debugobsolete --record-parent `getid "."`
2343 2842 1 new obsolescence markers
2344 2843 obsoleted 1 changesets
2345 2844
2346 2845 $ hg up -r "desc(A0)" --hidden
2347 2846 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2348 2847 updated to hidden changeset 471f378eab4c
2349 2848 (hidden revision '471f378eab4c' is pruned)
2350 2849 $ hg commit --amend -m "A2"
2351 2850 $ hg debugobsolete --record-parent `getid "."`
2352 2851 1 new obsolescence markers
2353 2852 obsoleted 1 changesets
2354 2853
2355 2854 Check output
2356 2855 ------------
2357 2856
2358 2857 $ hg up "desc(A0)" --hidden
2359 2858 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2360 2859 updated to hidden changeset 471f378eab4c
2361 2860 (hidden revision '471f378eab4c' is pruned)
2362 2861 $ hg tlog
2363 2862 @ 471f378eab4c
2364 |
2863 | Predecessors:
2864 | semi-colon:
2865 | json: []
2866 | map:
2867 | Successors:
2868 | multi-line:
2869 | json: []
2365 2870 o ea207398892e
2366
2871 Predecessors:
2872 semi-colon:
2873 json: []
2874 map:
2875 Successors:
2876 multi-line:
2877 json: ""
2878
2367 2879 # todo: the obsfate output is not ideal
2368 2880 $ hg fatelog
2369 2881 @ 471f378eab4c
2370 2882 | Obsfate: pruned;
2371 2883 o ea207398892e
2372 2884
2373 2885 $ hg fatelog --hidden
2374 2886 x 65b757b745b9
2375 2887 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
2376 2888 | x fdf9bde5129a
2377 2889 |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
2378 2890 | @ 471f378eab4c
2379 2891 |/ 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);
2380 2892 o ea207398892e
2381 2893
2382 2894 Check other fatelog implementations
2383 2895 -----------------------------------
2384 2896
2385 2897 $ hg fatelogkw --hidden -q
2386 2898 x 65b757b745b9
2387 2899 | Obsfate: pruned
2388 2900 | x fdf9bde5129a
2389 2901 |/ Obsfate: pruned
2390 2902 | @ 471f378eab4c
2391 2903 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a
2392 2904 | Obsfate: rewritten using amend as 3:65b757b745b9
2393 2905 o ea207398892e
2394 2906
2395 2907 $ hg fatelogkw --hidden
2396 2908 x 65b757b745b9
2397 2909 | Obsfate: pruned
2398 2910 | x fdf9bde5129a
2399 2911 |/ Obsfate: pruned
2400 2912 | @ 471f378eab4c
2401 2913 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a
2402 2914 | Obsfate: rewritten using amend as 3:65b757b745b9
2403 2915 o ea207398892e
2404 2916
2405 2917 $ hg fatelogkw --hidden -v
2406 2918 x 65b757b745b9
2407 2919 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
2408 2920 | x fdf9bde5129a
2409 2921 |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
2410 2922 | @ 471f378eab4c
2411 2923 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000)
2412 2924 | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000)
2413 2925 o ea207398892e
2414 2926
2415 2927
2416 2928 $ hg log -G -T "default" --hidden
2417 2929 x changeset: 3:65b757b745b9
2418 2930 | tag: tip
2419 2931 | parent: 0:ea207398892e
2420 2932 | user: test
2421 2933 | date: Thu Jan 01 00:00:00 1970 +0000
2422 2934 | obsolete: pruned
2423 2935 | summary: A2
2424 2936 |
2425 2937 | x changeset: 2:fdf9bde5129a
2426 2938 |/ parent: 0:ea207398892e
2427 2939 | user: test
2428 2940 | date: Thu Jan 01 00:00:00 1970 +0000
2429 2941 | obsolete: pruned
2430 2942 | summary: A1
2431 2943 |
2432 2944 | @ changeset: 1:471f378eab4c
2433 2945 |/ user: test
2434 2946 | date: Thu Jan 01 00:00:00 1970 +0000
2435 2947 | obsolete: rewritten using amend as 2:fdf9bde5129a
2436 2948 | obsolete: rewritten using amend as 3:65b757b745b9
2437 2949 | summary: A0
2438 2950 |
2439 2951 o changeset: 0:ea207398892e
2440 2952 user: test
2441 2953 date: Thu Jan 01 00:00:00 1970 +0000
2442 2954 summary: ROOT
2443 2955
2444 2956 Check that {negrev} shows usable negative revisions despite hidden commits
2445 2957
2446 2958 $ hg log -G -T "{negrev}\n"
2447 2959 @ -3
2448 2960 |
2449 2961 o -4
2450 2962
2451 2963
2452 2964 $ hg log -G -T "{negrev}\n" --hidden
2453 2965 x -1
2454 2966 |
2455 2967 | x -2
2456 2968 |/
2457 2969 | @ -3
2458 2970 |/
2459 2971 o -4
2460 2972
2461 2973
2462 2974 Test templates with splitted and pruned commit
2463 2975 ==============================================
2464 2976
2465 2977 $ hg init $TESTTMP/templates-local-split-prune
2466 2978 $ cd $TESTTMP/templates-local-split-prune
2467 2979 $ mkcommit ROOT
2468 2980 $ echo 42 >> a
2469 2981 $ echo 43 >> b
2470 2982 $ hg commit -A -m "A0"
2471 2983 adding a
2472 2984 adding b
2473 2985 $ hg log --hidden -G
2474 2986 @ changeset: 1:471597cad322
2475 2987 | tag: tip
2476 2988 | user: test
2477 2989 | date: Thu Jan 01 00:00:00 1970 +0000
2478 2990 | summary: A0
2479 2991 |
2480 2992 o changeset: 0:ea207398892e
2481 2993 user: test
2482 2994 date: Thu Jan 01 00:00:00 1970 +0000
2483 2995 summary: ROOT
2484 2996
2485 2997 # Simulate split
2486 2998 $ hg up -r "desc(ROOT)"
2487 2999 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
2488 3000 $ echo 42 >> a
2489 3001 $ hg commit -A -m "A1"
2490 3002 adding a
2491 3003 created new head
2492 3004 $ echo 43 >> b
2493 3005 $ hg commit -A -m "A2"
2494 3006 adding b
2495 3007 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
2496 3008 1 new obsolescence markers
2497 3009 obsoleted 1 changesets
2498 3010
2499 3011 # Simulate prune
2500 3012 $ hg debugobsolete --record-parent `getid "."`
2501 3013 1 new obsolescence markers
2502 3014 obsoleted 1 changesets
2503 3015
2504 3016 $ hg log --hidden -G
2505 3017 @ changeset: 3:0d0ef4bdf70e
2506 3018 | tag: tip
2507 3019 | user: test
2508 3020 | date: Thu Jan 01 00:00:00 1970 +0000
2509 3021 | obsolete: pruned
2510 3022 | summary: A2
2511 3023 |
2512 3024 o changeset: 2:617adc3a144c
2513 3025 | parent: 0:ea207398892e
2514 3026 | user: test
2515 3027 | date: Thu Jan 01 00:00:00 1970 +0000
2516 3028 | summary: A1
2517 3029 |
2518 3030 | x changeset: 1:471597cad322
2519 3031 |/ user: test
2520 3032 | date: Thu Jan 01 00:00:00 1970 +0000
2521 3033 | obsolete: split as 2:617adc3a144c, 3:0d0ef4bdf70e
2522 3034 | summary: A0
2523 3035 |
2524 3036 o changeset: 0:ea207398892e
2525 3037 user: test
2526 3038 date: Thu Jan 01 00:00:00 1970 +0000
2527 3039 summary: ROOT
2528 3040
2529 3041 Check templates
2530 3042 ---------------
2531 3043
2532 3044 $ hg up 'desc("A0")' --hidden
2533 3045 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2534 3046 updated to hidden changeset 471597cad322
2535 3047 (hidden revision '471597cad322' was rewritten as: 617adc3a144c)
2536 3048
2537 3049 # todo: the obsfate output is not ideal
2538 3050 $ hg fatelog
2539 3051 o 617adc3a144c
2540 3052 |
2541 3053 | @ 471597cad322
2542 3054 |/ Obsfate: rewritten as 2:617adc3a144c by test (at 1970-01-01 00:00 +0000);
2543 3055 o ea207398892e
2544 3056
2545 3057 $ hg up -r 'desc("A2")' --hidden
2546 3058 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2547 3059 updated to hidden changeset 0d0ef4bdf70e
2548 3060 (hidden revision '0d0ef4bdf70e' is pruned)
2549 3061
2550 3062 $ hg fatelog --hidden
2551 3063 @ 0d0ef4bdf70e
2552 3064 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
2553 3065 o 617adc3a144c
2554 3066 |
2555 3067 | x 471597cad322
2556 3068 |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000);
2557 3069 o ea207398892e
2558 3070
2559 3071
2560 3072 Check other fatelog implementations
2561 3073 -----------------------------------
2562 3074
2563 3075 $ hg fatelogkw --hidden -q
2564 3076 @ 0d0ef4bdf70e
2565 3077 | Obsfate: pruned
2566 3078 o 617adc3a144c
2567 3079 |
2568 3080 | x 471597cad322
2569 3081 |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e
2570 3082 o ea207398892e
2571 3083
2572 3084 $ hg fatelogkw --hidden
2573 3085 @ 0d0ef4bdf70e
2574 3086 | Obsfate: pruned
2575 3087 o 617adc3a144c
2576 3088 |
2577 3089 | x 471597cad322
2578 3090 |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e
2579 3091 o ea207398892e
2580 3092
2581 3093 $ hg fatelogkw --hidden -v
2582 3094 @ 0d0ef4bdf70e
2583 3095 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
2584 3096 o 617adc3a144c
2585 3097 |
2586 3098 | x 471597cad322
2587 3099 |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000)
2588 3100 o ea207398892e
2589 3101
2590 3102 $ hg log -G -T "default" --hidden
2591 3103 @ changeset: 3:0d0ef4bdf70e
2592 3104 | tag: tip
2593 3105 | user: test
2594 3106 | date: Thu Jan 01 00:00:00 1970 +0000
2595 3107 | obsolete: pruned
2596 3108 | summary: A2
2597 3109 |
2598 3110 o changeset: 2:617adc3a144c
2599 3111 | parent: 0:ea207398892e
2600 3112 | user: test
2601 3113 | date: Thu Jan 01 00:00:00 1970 +0000
2602 3114 | summary: A1
2603 3115 |
2604 3116 | x changeset: 1:471597cad322
2605 3117 |/ user: test
2606 3118 | date: Thu Jan 01 00:00:00 1970 +0000
2607 3119 | obsolete: split as 2:617adc3a144c, 3:0d0ef4bdf70e
2608 3120 | summary: A0
2609 3121 |
2610 3122 o changeset: 0:ea207398892e
2611 3123 user: test
2612 3124 date: Thu Jan 01 00:00:00 1970 +0000
2613 3125 summary: ROOT
2614 3126
2615 3127
2616 3128 Test metadata encoding (issue5754)
2617 3129 ==================================
2618 3130
2619 3131 $ hg init $TESTTMP/metadata-encoding
2620 3132 $ cd $TESTTMP/metadata-encoding
2621 3133 $ cat <<'EOF' >> .hg/hgrc
2622 3134 > [extensions]
2623 3135 > amend =
2624 3136 > EOF
2625 3137 $ "$PYTHON" <<'EOF'
2626 3138 > with open('test1', 'wb') as f:
2627 3139 > f.write(b't\xe8st1') and None
2628 3140 > with open('test2', 'wb') as f:
2629 3141 > f.write(b't\xe8st2') and None
2630 3142 > EOF
2631 3143 $ mkcommit ROOT
2632 3144 $ ( HGENCODING=latin-1 HGUSER="`cat test1`" mkcommit A0 )
2633 3145 $ echo 42 >> A0
2634 3146 $ HGENCODING=latin-1 hg amend -m "A1" --note "`cat test2`"
2635 3147 $ HGENCODING=latin-1 hg amend -m "A2" \
2636 3148 > --config devel.user.obsmarker="`cat test2`"
2637 3149 $ mkcommit B0
2638 3150 $ HGENCODING=latin-1 hg debugobsolete -u "`cat test2`" "`getid 'desc(B0)'`"
2639 3151 1 new obsolescence markers
2640 3152 obsoleted 1 changesets
2641 3153
2642 3154 metadata should be stored in UTF-8, and debugobsolete doesn't decode it to
2643 3155 local encoding since the command is supposed to show unmodified content:
2644 3156
2645 3157 $ HGENCODING=latin-1 hg debugobsolete
2646 3158 5f66a482f0bb2fcaccfc215554ad5eb9f40b50f5 718c0d00cee1429bdb73064e0d88908c601507a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'note': 't\xc3\xa8st2', 'operation': 'amend', 'user': 'test'}
2647 3159 718c0d00cee1429bdb73064e0d88908c601507a8 1132562159b35bb27e1d6b80c80ee94a1659a4da 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 't\xc3\xa8st2'}
2648 3160 8f82db6f991db367fdbb3b6dba5e187ecc3ebd96 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 't\xc3\xa8st2'}
2649 3161
2650 3162 metadata should be converted back to local encoding when displaying:
2651 3163
2652 3164 $ HGENCODING=latin-1 hg fatelog --hidden
2653 3165 @ 8f82db6f991d
2654 3166 | Obsfate: pruned by t\xe8st2 (at 1970-01-01 00:00 +0000); (esc)
2655 3167 o 1132562159b3
2656 3168 |
2657 3169 | x 718c0d00cee1
2658 3170 |/ Obsfate: rewritten using amend as 3:1132562159b3 by t\xe8st2 (at 1970-01-01 00:00 +0000); (esc)
2659 3171 | x 5f66a482f0bb
2660 3172 |/ Obsfate: rewritten using amend as 2:718c0d00cee1 by test (at 1970-01-01 00:00 +0000);
2661 3173 o ea207398892e
2662 3174
2663 3175 $ HGENCODING=utf-8 hg fatelog --hidden
2664 3176 @ 8f82db6f991d
2665 3177 | Obsfate: pruned by t\xc3\xa8st2 (at 1970-01-01 00:00 +0000); (esc)
2666 3178 o 1132562159b3
2667 3179 |
2668 3180 | x 718c0d00cee1
2669 3181 |/ Obsfate: rewritten using amend as 3:1132562159b3 by t\xc3\xa8st2 (at 1970-01-01 00:00 +0000); (esc)
2670 3182 | x 5f66a482f0bb
2671 3183 |/ Obsfate: rewritten using amend as 2:718c0d00cee1 by test (at 1970-01-01 00:00 +0000);
2672 3184 o ea207398892e
2673 3185
2674 3186 $ hg log -G -T "{negrev}\n"
2675 3187 @ -1
2676 3188 |
2677 3189 o -2
2678 3190 |
2679 3191 o -5
2680 3192
General Comments 0
You need to be logged in to leave comments. Login now