equal
deleted
inserted
replaced
14 > [alias] |
14 > [alias] |
15 > tlog = log -G -T '{node|short}\ |
15 > tlog = log -G -T '{node|short}\ |
16 > {if(precursors, "\n Precursors: {precursors}")}\ |
16 > {if(precursors, "\n Precursors: {precursors}")}\ |
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ |
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ |
18 > {if(successors, "\n Successors: {successors}")}\ |
18 > {if(successors, "\n Successors: {successors}")}\ |
|
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ |
19 > {if(successors, "\n Fate: {obsfate_quiet}")}\n' |
20 > {if(successors, "\n Fate: {obsfate_quiet}")}\n' |
20 > EOF |
21 > EOF |
21 |
22 |
22 Test templates on amended commit |
23 Test templates on amended commit |
23 ================================ |
24 ================================ |
73 o d004c8f274b9 |
74 o d004c8f274b9 |
74 | Precursors: 471f378eab4c |
75 | Precursors: 471f378eab4c |
75 | semi-colon: 471f378eab4c |
76 | semi-colon: 471f378eab4c |
76 | @ 471f378eab4c |
77 | @ 471f378eab4c |
77 |/ Successors: [d004c8f274b9] |
78 |/ Successors: [d004c8f274b9] |
|
79 | semi-colon: [d004c8f274b9] |
78 | Fate: superseed as d004c8f274b9 |
80 | Fate: superseed as d004c8f274b9 |
79 o ea207398892e |
81 o ea207398892e |
80 |
82 |
81 $ hg up 'desc(A1)' --hidden |
83 $ hg up 'desc(A1)' --hidden |
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88 o d004c8f274b9 |
90 o d004c8f274b9 |
89 | Precursors: a468dc9b3633 |
91 | Precursors: a468dc9b3633 |
90 | semi-colon: a468dc9b3633 |
92 | semi-colon: a468dc9b3633 |
91 | @ a468dc9b3633 |
93 | @ a468dc9b3633 |
92 |/ Successors: [d004c8f274b9] |
94 |/ Successors: [d004c8f274b9] |
|
95 | semi-colon: [d004c8f274b9] |
93 | Fate: superseed as d004c8f274b9 |
96 | Fate: superseed as d004c8f274b9 |
94 o ea207398892e |
97 o ea207398892e |
95 |
98 |
96 Precursors template should show the precursor as we force its display with |
99 Precursors template should show the precursor as we force its display with |
97 --hidden |
100 --hidden |
101 | semi-colon: a468dc9b3633 |
104 | semi-colon: a468dc9b3633 |
102 | @ a468dc9b3633 |
105 | @ a468dc9b3633 |
103 |/ Precursors: 471f378eab4c |
106 |/ Precursors: 471f378eab4c |
104 | semi-colon: 471f378eab4c |
107 | semi-colon: 471f378eab4c |
105 | Successors: [d004c8f274b9] |
108 | Successors: [d004c8f274b9] |
|
109 | semi-colon: [d004c8f274b9] |
106 | Fate: superseed as d004c8f274b9 |
110 | Fate: superseed as d004c8f274b9 |
107 | x f137d23bb3e1 |
111 | x f137d23bb3e1 |
108 | | |
112 | | |
109 | x 471f378eab4c |
113 | x 471f378eab4c |
110 |/ Successors: [a468dc9b3633] |
114 |/ Successors: [a468dc9b3633] |
|
115 | semi-colon: [a468dc9b3633] |
111 | Fate: superseed as a468dc9b3633 |
116 | Fate: superseed as a468dc9b3633 |
112 o ea207398892e |
117 o ea207398892e |
113 |
118 |
114 |
119 |
115 $ hg up 'desc(A2)' |
120 $ hg up 'desc(A2)' |
125 | semi-colon: a468dc9b3633 |
130 | semi-colon: a468dc9b3633 |
126 | x a468dc9b3633 |
131 | x a468dc9b3633 |
127 |/ Precursors: 471f378eab4c |
132 |/ Precursors: 471f378eab4c |
128 | semi-colon: 471f378eab4c |
133 | semi-colon: 471f378eab4c |
129 | Successors: [d004c8f274b9] |
134 | Successors: [d004c8f274b9] |
|
135 | semi-colon: [d004c8f274b9] |
130 | Fate: superseed as d004c8f274b9 |
136 | Fate: superseed as d004c8f274b9 |
131 | x f137d23bb3e1 |
137 | x f137d23bb3e1 |
132 | | |
138 | | |
133 | x 471f378eab4c |
139 | x 471f378eab4c |
134 |/ Successors: [a468dc9b3633] |
140 |/ Successors: [a468dc9b3633] |
|
141 | semi-colon: [a468dc9b3633] |
135 | Fate: superseed as a468dc9b3633 |
142 | Fate: superseed as a468dc9b3633 |
136 o ea207398892e |
143 o ea207398892e |
137 |
144 |
138 |
145 |
139 Test templates with splitted commit |
146 Test templates with splitted commit |
234 o 337fec4d2edc |
241 o 337fec4d2edc |
235 | Precursors: 471597cad322 |
242 | Precursors: 471597cad322 |
236 | semi-colon: 471597cad322 |
243 | semi-colon: 471597cad322 |
237 | @ 471597cad322 |
244 | @ 471597cad322 |
238 |/ Successors: [337fec4d2edc, f257fde29c7a] |
245 |/ Successors: [337fec4d2edc, f257fde29c7a] |
|
246 | semi-colon: [337fec4d2edc, f257fde29c7a] |
239 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
247 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
240 o ea207398892e |
248 o ea207398892e |
241 |
249 |
242 $ hg up f257fde29c7a |
250 $ hg up f257fde29c7a |
243 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
251 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
260 o 337fec4d2edc |
268 o 337fec4d2edc |
261 | Precursors: 471597cad322 |
269 | Precursors: 471597cad322 |
262 | semi-colon: 471597cad322 |
270 | semi-colon: 471597cad322 |
263 | x 471597cad322 |
271 | x 471597cad322 |
264 |/ Successors: [337fec4d2edc, f257fde29c7a] |
272 |/ Successors: [337fec4d2edc, f257fde29c7a] |
|
273 | semi-colon: [337fec4d2edc, f257fde29c7a] |
265 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
274 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
266 o ea207398892e |
275 o ea207398892e |
267 |
276 |
268 Test templates with folded commit |
277 Test templates with folded commit |
269 ============================== |
278 ============================== |
332 o eb5a0daa2192 |
341 o eb5a0daa2192 |
333 | Precursors: 471f378eab4c |
342 | Precursors: 471f378eab4c |
334 | semi-colon: 471f378eab4c |
343 | semi-colon: 471f378eab4c |
335 | @ 471f378eab4c |
344 | @ 471f378eab4c |
336 |/ Successors: [eb5a0daa2192] |
345 |/ Successors: [eb5a0daa2192] |
|
346 | semi-colon: [eb5a0daa2192] |
337 | Fate: superseed as eb5a0daa2192 |
347 | Fate: superseed as eb5a0daa2192 |
338 o ea207398892e |
348 o ea207398892e |
339 |
349 |
340 $ hg up 'desc(B0)' --hidden |
350 $ hg up 'desc(B0)' --hidden |
341 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
351 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
348 o eb5a0daa2192 |
358 o eb5a0daa2192 |
349 | Precursors: 0dec01379d3b 471f378eab4c |
359 | Precursors: 0dec01379d3b 471f378eab4c |
350 | semi-colon: 0dec01379d3b; 471f378eab4c |
360 | semi-colon: 0dec01379d3b; 471f378eab4c |
351 | @ 0dec01379d3b |
361 | @ 0dec01379d3b |
352 | | Successors: [eb5a0daa2192] |
362 | | Successors: [eb5a0daa2192] |
|
363 | | semi-colon: [eb5a0daa2192] |
353 | | Fate: superseed as eb5a0daa2192 |
364 | | Fate: superseed as eb5a0daa2192 |
354 | x 471f378eab4c |
365 | x 471f378eab4c |
355 |/ Successors: [eb5a0daa2192] |
366 |/ Successors: [eb5a0daa2192] |
|
367 | semi-colon: [eb5a0daa2192] |
356 | Fate: superseed as eb5a0daa2192 |
368 | Fate: superseed as eb5a0daa2192 |
357 o ea207398892e |
369 o ea207398892e |
358 |
370 |
359 $ hg up 'desc(C0)' |
371 $ hg up 'desc(C0)' |
360 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
372 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
372 @ eb5a0daa2192 |
384 @ eb5a0daa2192 |
373 | Precursors: 0dec01379d3b 471f378eab4c |
385 | Precursors: 0dec01379d3b 471f378eab4c |
374 | semi-colon: 0dec01379d3b; 471f378eab4c |
386 | semi-colon: 0dec01379d3b; 471f378eab4c |
375 | x 0dec01379d3b |
387 | x 0dec01379d3b |
376 | | Successors: [eb5a0daa2192] |
388 | | Successors: [eb5a0daa2192] |
|
389 | | semi-colon: [eb5a0daa2192] |
377 | | Fate: superseed as eb5a0daa2192 |
390 | | Fate: superseed as eb5a0daa2192 |
378 | x 471f378eab4c |
391 | x 471f378eab4c |
379 |/ Successors: [eb5a0daa2192] |
392 |/ Successors: [eb5a0daa2192] |
|
393 | semi-colon: [eb5a0daa2192] |
380 | Fate: superseed as eb5a0daa2192 |
394 | Fate: superseed as eb5a0daa2192 |
381 o ea207398892e |
395 o ea207398892e |
382 |
396 |
383 |
397 |
384 Test templates with divergence |
398 Test templates with divergence |
460 | o fdf9bde5129a |
474 | o fdf9bde5129a |
461 |/ Precursors: 471f378eab4c |
475 |/ Precursors: 471f378eab4c |
462 | semi-colon: 471f378eab4c |
476 | semi-colon: 471f378eab4c |
463 | @ 471f378eab4c |
477 | @ 471f378eab4c |
464 |/ Successors: [fdf9bde5129a], [019fadeab383] |
478 |/ Successors: [fdf9bde5129a], [019fadeab383] |
|
479 | semi-colon: [fdf9bde5129a]; [019fadeab383] |
465 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 |
480 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 |
466 o ea207398892e |
481 o ea207398892e |
467 |
482 |
468 $ hg up 'desc(A1)' |
483 $ hg up 'desc(A1)' |
469 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
484 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
483 | semi-colon: 65b757b745b9 |
498 | semi-colon: 65b757b745b9 |
484 | x 65b757b745b9 |
499 | x 65b757b745b9 |
485 |/ Precursors: 471f378eab4c |
500 |/ Precursors: 471f378eab4c |
486 | semi-colon: 471f378eab4c |
501 | semi-colon: 471f378eab4c |
487 | Successors: [019fadeab383] |
502 | Successors: [019fadeab383] |
|
503 | semi-colon: [019fadeab383] |
488 | Fate: superseed as 019fadeab383 |
504 | Fate: superseed as 019fadeab383 |
489 | @ fdf9bde5129a |
505 | @ fdf9bde5129a |
490 |/ Precursors: 471f378eab4c |
506 |/ Precursors: 471f378eab4c |
491 | semi-colon: 471f378eab4c |
507 | semi-colon: 471f378eab4c |
492 | x 471f378eab4c |
508 | x 471f378eab4c |
493 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
509 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
|
510 | semi-colon: [fdf9bde5129a]; [65b757b745b9] |
494 | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 |
511 | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 |
495 o ea207398892e |
512 o ea207398892e |
496 |
513 |
497 Test templates with amended + folded commit |
514 Test templates with amended + folded commit |
498 =========================================== |
515 =========================================== |
572 o eb5a0daa2192 |
589 o eb5a0daa2192 |
573 | Precursors: 471f378eab4c |
590 | Precursors: 471f378eab4c |
574 | semi-colon: 471f378eab4c |
591 | semi-colon: 471f378eab4c |
575 | @ 471f378eab4c |
592 | @ 471f378eab4c |
576 |/ Successors: [eb5a0daa2192] |
593 |/ Successors: [eb5a0daa2192] |
|
594 | semi-colon: [eb5a0daa2192] |
577 | Fate: superseed as eb5a0daa2192 |
595 | Fate: superseed as eb5a0daa2192 |
578 o ea207398892e |
596 o ea207398892e |
579 |
597 |
580 $ hg up 'desc(B0)' --hidden |
598 $ hg up 'desc(B0)' --hidden |
581 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
599 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
585 o eb5a0daa2192 |
603 o eb5a0daa2192 |
586 | Precursors: 0dec01379d3b 471f378eab4c |
604 | Precursors: 0dec01379d3b 471f378eab4c |
587 | semi-colon: 0dec01379d3b; 471f378eab4c |
605 | semi-colon: 0dec01379d3b; 471f378eab4c |
588 | @ 0dec01379d3b |
606 | @ 0dec01379d3b |
589 | | Successors: [eb5a0daa2192] |
607 | | Successors: [eb5a0daa2192] |
|
608 | | semi-colon: [eb5a0daa2192] |
590 | | Fate: superseed as eb5a0daa2192 |
609 | | Fate: superseed as eb5a0daa2192 |
591 | x 471f378eab4c |
610 | x 471f378eab4c |
592 |/ Successors: [eb5a0daa2192] |
611 |/ Successors: [eb5a0daa2192] |
|
612 | semi-colon: [eb5a0daa2192] |
593 | Fate: superseed as eb5a0daa2192 |
613 | Fate: superseed as eb5a0daa2192 |
594 o ea207398892e |
614 o ea207398892e |
595 |
615 |
596 $ hg up 'desc(B1)' --hidden |
616 $ hg up 'desc(B1)' --hidden |
597 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
617 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
601 o eb5a0daa2192 |
621 o eb5a0daa2192 |
602 | Precursors: 471f378eab4c b7ea6d14e664 |
622 | Precursors: 471f378eab4c b7ea6d14e664 |
603 | semi-colon: 471f378eab4c; b7ea6d14e664 |
623 | semi-colon: 471f378eab4c; b7ea6d14e664 |
604 | @ b7ea6d14e664 |
624 | @ b7ea6d14e664 |
605 | | Successors: [eb5a0daa2192] |
625 | | Successors: [eb5a0daa2192] |
|
626 | | semi-colon: [eb5a0daa2192] |
606 | | Fate: superseed as eb5a0daa2192 |
627 | | Fate: superseed as eb5a0daa2192 |
607 | x 471f378eab4c |
628 | x 471f378eab4c |
608 |/ Successors: [eb5a0daa2192] |
629 |/ Successors: [eb5a0daa2192] |
|
630 | semi-colon: [eb5a0daa2192] |
609 | Fate: superseed as eb5a0daa2192 |
631 | Fate: superseed as eb5a0daa2192 |
610 o ea207398892e |
632 o ea207398892e |
611 |
633 |
612 $ hg up 'desc(C0)' |
634 $ hg up 'desc(C0)' |
613 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
635 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
622 | semi-colon: 471f378eab4c; b7ea6d14e664 |
644 | semi-colon: 471f378eab4c; b7ea6d14e664 |
623 | x b7ea6d14e664 |
645 | x b7ea6d14e664 |
624 | | Precursors: 0dec01379d3b |
646 | | Precursors: 0dec01379d3b |
625 | | semi-colon: 0dec01379d3b |
647 | | semi-colon: 0dec01379d3b |
626 | | Successors: [eb5a0daa2192] |
648 | | Successors: [eb5a0daa2192] |
|
649 | | semi-colon: [eb5a0daa2192] |
627 | | Fate: superseed as eb5a0daa2192 |
650 | | Fate: superseed as eb5a0daa2192 |
628 | | x 0dec01379d3b |
651 | | x 0dec01379d3b |
629 | |/ Successors: [b7ea6d14e664] |
652 | |/ Successors: [b7ea6d14e664] |
|
653 | | semi-colon: [b7ea6d14e664] |
630 | | Fate: superseed as b7ea6d14e664 |
654 | | Fate: superseed as b7ea6d14e664 |
631 | x 471f378eab4c |
655 | x 471f378eab4c |
632 |/ Successors: [eb5a0daa2192] |
656 |/ Successors: [eb5a0daa2192] |
|
657 | semi-colon: [eb5a0daa2192] |
633 | Fate: superseed as eb5a0daa2192 |
658 | Fate: superseed as eb5a0daa2192 |
634 o ea207398892e |
659 o ea207398892e |
635 |
660 |
636 |
661 |
637 Test template with pushed and pulled obs markers |
662 Test template with pushed and pulled obs markers |
725 o 7a230b46bf61 |
750 o 7a230b46bf61 |
726 | Precursors: 471f378eab4c |
751 | Precursors: 471f378eab4c |
727 | semi-colon: 471f378eab4c |
752 | semi-colon: 471f378eab4c |
728 | @ 471f378eab4c |
753 | @ 471f378eab4c |
729 |/ Successors: [7a230b46bf61] |
754 |/ Successors: [7a230b46bf61] |
|
755 | semi-colon: [7a230b46bf61] |
730 | Fate: superseed as 7a230b46bf61 |
756 | Fate: superseed as 7a230b46bf61 |
731 o ea207398892e |
757 o ea207398892e |
732 |
758 |
733 $ hg up 'desc(A2)' |
759 $ hg up 'desc(A2)' |
734 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
760 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
741 @ 7a230b46bf61 |
767 @ 7a230b46bf61 |
742 | Precursors: 471f378eab4c |
768 | Precursors: 471f378eab4c |
743 | semi-colon: 471f378eab4c |
769 | semi-colon: 471f378eab4c |
744 | x 471f378eab4c |
770 | x 471f378eab4c |
745 |/ Successors: [7a230b46bf61] |
771 |/ Successors: [7a230b46bf61] |
|
772 | semi-colon: [7a230b46bf61] |
746 | Fate: superseed as 7a230b46bf61 |
773 | Fate: superseed as 7a230b46bf61 |
747 o ea207398892e |
774 o ea207398892e |
748 |
775 |