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 semi-colon: {join(successors, "; ")}")}\n' |
20 > {if(successors, "\n Fate: {obsfate_quiet}")}\n' |
|
21 > EOF |
20 > EOF |
22 |
21 |
23 Test templates on amended commit |
22 Test templates on amended commit |
24 ================================ |
23 ================================ |
25 |
24 |
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
67 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69 working directory parent is obsolete! (471f378eab4c) |
68 working directory parent is obsolete! (471f378eab4c) |
70 (use 'hg evolve' to update to its successor: d004c8f274b9) |
69 (use 'hg evolve' to update to its successor: d004c8f274b9) |
71 |
70 |
72 Precursors template should show current revision as it is the working copy |
71 Precursors template should show current revision as it is the working copy |
|
72 $ hg olog tip |
|
73 o d004c8f274b9 (4) A2 |
|
74 | |
|
75 x a468dc9b3633 (3) A1 |
|
76 | rewritten(description) by test2 (*) as d004c8f274b9 (glob) |
|
77 | |
|
78 @ 471f378eab4c (1) A0 |
|
79 rewritten(description, content) by test1 (*) as a468dc9b3633 (glob) |
|
80 |
73 $ hg tlog |
81 $ hg tlog |
74 o d004c8f274b9 |
82 o d004c8f274b9 |
75 | Precursors: 471f378eab4c |
83 | Precursors: 471f378eab4c |
76 | semi-colon: 471f378eab4c |
84 | semi-colon: 471f378eab4c |
77 | @ 471f378eab4c |
85 | @ 471f378eab4c |
78 |/ Successors: [d004c8f274b9] |
86 |/ Successors: [d004c8f274b9] |
79 | semi-colon: [d004c8f274b9] |
87 | semi-colon: [d004c8f274b9] |
80 | Fate: superseed as d004c8f274b9 |
88 o ea207398892e |
81 o ea207398892e |
89 |
82 |
|
83 $ hg up 'desc(A1)' --hidden |
|
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
85 working directory parent is obsolete! (a468dc9b3633) |
|
86 (use 'hg evolve' to update to its successor: d004c8f274b9) |
|
87 |
90 |
88 Precursors template should show current revision as it is the working copy |
91 Precursors template should show current revision as it is the working copy |
89 $ hg tlog |
92 $ hg tlog |
90 o d004c8f274b9 |
93 o d004c8f274b9 |
91 | Precursors: a468dc9b3633 |
94 | Precursors: 471f378eab4c |
92 | semi-colon: a468dc9b3633 |
95 | semi-colon: 471f378eab4c |
93 | @ a468dc9b3633 |
96 | @ 471f378eab4c |
94 |/ Successors: [d004c8f274b9] |
97 |/ Successors: [d004c8f274b9] |
95 | semi-colon: [d004c8f274b9] |
98 | semi-colon: [d004c8f274b9] |
96 | Fate: superseed as d004c8f274b9 |
|
97 o ea207398892e |
99 o ea207398892e |
98 |
100 |
99 Precursors template should show the precursor as we force its display with |
101 Precursors template should show the precursor as we force its display with |
100 --hidden |
102 --hidden |
101 $ hg tlog --hidden |
103 $ hg tlog --hidden |
102 o d004c8f274b9 |
104 o d004c8f274b9 |
103 | Precursors: a468dc9b3633 |
|
104 | semi-colon: a468dc9b3633 |
|
105 | @ a468dc9b3633 |
|
106 |/ Precursors: 471f378eab4c |
|
107 | semi-colon: 471f378eab4c |
|
108 | Successors: [d004c8f274b9] |
|
109 | semi-colon: [d004c8f274b9] |
|
110 | Fate: superseed as d004c8f274b9 |
|
111 | x f137d23bb3e1 |
|
112 | | |
|
113 | x 471f378eab4c |
|
114 |/ Successors: [a468dc9b3633] |
|
115 | semi-colon: [a468dc9b3633] |
|
116 | Fate: superseed as a468dc9b3633 |
|
117 o ea207398892e |
|
118 |
|
119 |
|
120 $ hg up 'desc(A2)' |
|
121 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
122 $ hg tlog |
|
123 @ d004c8f274b9 |
|
124 | |
|
125 o ea207398892e |
|
126 |
|
127 $ hg tlog --hidden |
|
128 @ d004c8f274b9 |
|
129 | Precursors: a468dc9b3633 |
105 | Precursors: a468dc9b3633 |
130 | semi-colon: a468dc9b3633 |
106 | semi-colon: a468dc9b3633 |
131 | x a468dc9b3633 |
107 | x a468dc9b3633 |
132 |/ Precursors: 471f378eab4c |
108 |/ Precursors: 471f378eab4c |
133 | semi-colon: 471f378eab4c |
109 | semi-colon: 471f378eab4c |
134 | Successors: [d004c8f274b9] |
110 | Successors: [d004c8f274b9] |
135 | semi-colon: [d004c8f274b9] |
111 | semi-colon: [d004c8f274b9] |
136 | Fate: superseed as d004c8f274b9 |
|
137 | x f137d23bb3e1 |
112 | x f137d23bb3e1 |
138 | | |
113 | | |
139 | x 471f378eab4c |
114 | @ 471f378eab4c |
140 |/ Successors: [a468dc9b3633] |
115 |/ Successors: [a468dc9b3633] |
141 | semi-colon: [a468dc9b3633] |
116 | semi-colon: [a468dc9b3633] |
142 | Fate: superseed as a468dc9b3633 |
117 o ea207398892e |
|
118 |
|
119 $ hg tlog |
|
120 o d004c8f274b9 |
|
121 | Precursors: 471f378eab4c |
|
122 | semi-colon: 471f378eab4c |
|
123 | @ 471f378eab4c |
|
124 |/ Successors: [d004c8f274b9] |
|
125 | semi-colon: [d004c8f274b9] |
|
126 o ea207398892e |
|
127 |
|
128 $ hg tlog --hidden |
|
129 o d004c8f274b9 |
|
130 | Precursors: a468dc9b3633 |
|
131 | semi-colon: a468dc9b3633 |
|
132 | x a468dc9b3633 |
|
133 |/ Precursors: 471f378eab4c |
|
134 | semi-colon: 471f378eab4c |
|
135 | Successors: [d004c8f274b9] |
|
136 | semi-colon: [d004c8f274b9] |
|
137 | x f137d23bb3e1 |
|
138 | | |
|
139 | @ 471f378eab4c |
|
140 |/ Successors: [a468dc9b3633] |
|
141 | semi-colon: [a468dc9b3633] |
143 o ea207398892e |
142 o ea207398892e |
144 |
143 |
145 |
144 |
146 Test templates with splitted commit |
145 Test templates with splitted commit |
147 =================================== |
146 =================================== |
242 | Precursors: 471597cad322 |
241 | Precursors: 471597cad322 |
243 | semi-colon: 471597cad322 |
242 | semi-colon: 471597cad322 |
244 | @ 471597cad322 |
243 | @ 471597cad322 |
245 |/ Successors: [337fec4d2edc, f257fde29c7a] |
244 |/ Successors: [337fec4d2edc, f257fde29c7a] |
246 | semi-colon: [337fec4d2edc, f257fde29c7a] |
245 | semi-colon: [337fec4d2edc, f257fde29c7a] |
247 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
246 o ea207398892e |
248 o ea207398892e |
247 |
249 |
248 |
250 $ hg up f257fde29c7a |
249 $ hg up f257fde29c7a |
251 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
250 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
252 |
251 |
253 Precursors template should not show a precursor as it's not displayed in the |
252 Precursors template should not show a precursor as it's not displayed in the |
254 log |
253 log |
342 | Precursors: 471f378eab4c |
340 | Precursors: 471f378eab4c |
343 | semi-colon: 471f378eab4c |
341 | semi-colon: 471f378eab4c |
344 | @ 471f378eab4c |
342 | @ 471f378eab4c |
345 |/ Successors: [eb5a0daa2192] |
343 |/ Successors: [eb5a0daa2192] |
346 | semi-colon: [eb5a0daa2192] |
344 | semi-colon: [eb5a0daa2192] |
347 | Fate: superseed as eb5a0daa2192 |
345 o ea207398892e |
348 o ea207398892e |
346 |
349 |
|
350 $ hg up 'desc(B0)' --hidden |
|
351 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
352 working directory parent is obsolete! (0dec01379d3b) |
|
353 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
354 |
|
355 Precursors template should show both precursors as they should be both |
347 Precursors template should show both precursors as they should be both |
356 displayed |
348 displayed |
357 $ hg tlog |
349 $ hg tlog |
358 o eb5a0daa2192 |
350 o eb5a0daa2192 |
359 | Precursors: 0dec01379d3b 471f378eab4c |
351 | Precursors: 471f378eab4c |
360 | semi-colon: 0dec01379d3b; 471f378eab4c |
352 | semi-colon: 471f378eab4c |
361 | @ 0dec01379d3b |
353 | @ 471f378eab4c |
362 | | Successors: [eb5a0daa2192] |
|
363 | | semi-colon: [eb5a0daa2192] |
|
364 | | Fate: superseed as eb5a0daa2192 |
|
365 | x 471f378eab4c |
|
366 |/ Successors: [eb5a0daa2192] |
354 |/ Successors: [eb5a0daa2192] |
367 | semi-colon: [eb5a0daa2192] |
355 | semi-colon: [eb5a0daa2192] |
368 | Fate: superseed as eb5a0daa2192 |
|
369 o ea207398892e |
356 o ea207398892e |
370 |
357 |
371 $ hg up 'desc(C0)' |
358 $ hg up 'desc(C0)' |
372 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
359 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
373 |
360 |
374 Precursors template should not show precursors as it's not displayed in the |
361 Precursors template should not show precursors as it's not displayed in the |
375 log |
362 log |
376 $ hg tlog |
363 $ hg tlog |
377 @ eb5a0daa2192 |
364 @ eb5a0daa2192 |
385 | Precursors: 0dec01379d3b 471f378eab4c |
372 | Precursors: 0dec01379d3b 471f378eab4c |
386 | semi-colon: 0dec01379d3b; 471f378eab4c |
373 | semi-colon: 0dec01379d3b; 471f378eab4c |
387 | x 0dec01379d3b |
374 | x 0dec01379d3b |
388 | | Successors: [eb5a0daa2192] |
375 | | Successors: [eb5a0daa2192] |
389 | | semi-colon: [eb5a0daa2192] |
376 | | semi-colon: [eb5a0daa2192] |
390 | | Fate: superseed as eb5a0daa2192 |
|
391 | x 471f378eab4c |
377 | x 471f378eab4c |
392 |/ Successors: [eb5a0daa2192] |
378 |/ Successors: [eb5a0daa2192] |
393 | semi-colon: [eb5a0daa2192] |
379 | semi-colon: [eb5a0daa2192] |
394 | Fate: superseed as eb5a0daa2192 |
|
395 o ea207398892e |
380 o ea207398892e |
396 |
381 |
397 |
382 |
398 Test templates with divergence |
383 Test templates with divergence |
399 ============================== |
384 ============================== |
473 |/ Precursors: 471f378eab4c |
458 |/ Precursors: 471f378eab4c |
474 | semi-colon: 471f378eab4c |
459 | semi-colon: 471f378eab4c |
475 | @ 471f378eab4c |
460 | @ 471f378eab4c |
476 |/ Successors: [fdf9bde5129a], [019fadeab383] |
461 |/ Successors: [fdf9bde5129a], [019fadeab383] |
477 | semi-colon: [fdf9bde5129a]; [019fadeab383] |
462 | semi-colon: [fdf9bde5129a]; [019fadeab383] |
478 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 |
|
479 o ea207398892e |
463 o ea207398892e |
480 |
464 |
481 $ hg up 'desc(A1)' |
465 $ hg up 'desc(A1)' |
482 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
466 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
483 Precursors template should not show precursors as it's not displayed in the |
467 Precursors template should not show precursors as it's not displayed in the |
588 | Precursors: 471f378eab4c |
552 | Precursors: 471f378eab4c |
589 | semi-colon: 471f378eab4c |
553 | semi-colon: 471f378eab4c |
590 | @ 471f378eab4c |
554 | @ 471f378eab4c |
591 |/ Successors: [eb5a0daa2192] |
555 |/ Successors: [eb5a0daa2192] |
592 | semi-colon: [eb5a0daa2192] |
556 | semi-colon: [eb5a0daa2192] |
593 | Fate: superseed as eb5a0daa2192 |
557 o ea207398892e |
594 o ea207398892e |
558 |
595 |
559 $ hg tlog --hidden |
596 $ hg up 'desc(B0)' --hidden |
|
597 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
598 working directory parent is obsolete! (0dec01379d3b) |
|
599 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
600 $ hg tlog |
|
601 o eb5a0daa2192 |
560 o eb5a0daa2192 |
602 | Precursors: 0dec01379d3b 471f378eab4c |
|
603 | semi-colon: 0dec01379d3b; 471f378eab4c |
|
604 | @ 0dec01379d3b |
|
605 | | Successors: [eb5a0daa2192] |
|
606 | | semi-colon: [eb5a0daa2192] |
|
607 | | Fate: superseed as eb5a0daa2192 |
|
608 | x 471f378eab4c |
|
609 |/ Successors: [eb5a0daa2192] |
|
610 | semi-colon: [eb5a0daa2192] |
|
611 | Fate: superseed as eb5a0daa2192 |
|
612 o ea207398892e |
|
613 |
|
614 $ hg up 'desc(B1)' --hidden |
|
615 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
616 working directory parent is obsolete! (b7ea6d14e664) |
|
617 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
618 $ hg tlog |
|
619 o eb5a0daa2192 |
|
620 | Precursors: 471f378eab4c b7ea6d14e664 |
|
621 | semi-colon: 471f378eab4c; b7ea6d14e664 |
|
622 | @ b7ea6d14e664 |
|
623 | | Successors: [eb5a0daa2192] |
|
624 | | semi-colon: [eb5a0daa2192] |
|
625 | | Fate: superseed as eb5a0daa2192 |
|
626 | x 471f378eab4c |
|
627 |/ Successors: [eb5a0daa2192] |
|
628 | semi-colon: [eb5a0daa2192] |
|
629 | Fate: superseed as eb5a0daa2192 |
|
630 o ea207398892e |
|
631 |
|
632 $ hg up 'desc(C0)' |
|
633 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
634 $ hg tlog |
|
635 @ eb5a0daa2192 |
|
636 | |
|
637 o ea207398892e |
|
638 |
|
639 $ hg tlog --hidden |
|
640 @ eb5a0daa2192 |
|
641 | Precursors: 471f378eab4c b7ea6d14e664 |
561 | Precursors: 471f378eab4c b7ea6d14e664 |
642 | semi-colon: 471f378eab4c; b7ea6d14e664 |
562 | semi-colon: 471f378eab4c; b7ea6d14e664 |
643 | x b7ea6d14e664 |
563 | x b7ea6d14e664 |
644 | | Precursors: 0dec01379d3b |
564 | | Precursors: 0dec01379d3b |
645 | | semi-colon: 0dec01379d3b |
565 | | semi-colon: 0dec01379d3b |
646 | | Successors: [eb5a0daa2192] |
566 | | Successors: [eb5a0daa2192] |
647 | | semi-colon: [eb5a0daa2192] |
567 | | semi-colon: [eb5a0daa2192] |
648 | | Fate: superseed as eb5a0daa2192 |
|
649 | | x 0dec01379d3b |
568 | | x 0dec01379d3b |
650 | |/ Successors: [b7ea6d14e664] |
569 | |/ Successors: [b7ea6d14e664] |
651 | | semi-colon: [b7ea6d14e664] |
570 | | semi-colon: [b7ea6d14e664] |
652 | | Fate: superseed as b7ea6d14e664 |
571 | @ 471f378eab4c |
653 | x 471f378eab4c |
|
654 |/ Successors: [eb5a0daa2192] |
572 |/ Successors: [eb5a0daa2192] |
655 | semi-colon: [eb5a0daa2192] |
573 | semi-colon: [eb5a0daa2192] |
656 | Fate: superseed as eb5a0daa2192 |
574 o ea207398892e |
657 o ea207398892e |
575 |
658 |
|
659 |
|
660 Test template with pushed and pulled obs markers |
576 Test template with pushed and pulled obs markers |
661 ============================================== |
577 ============================================== |
662 |
578 |
663 Test setup |
579 Test setup |
664 ---------- |
580 ---------- |
738 o changeset: 0:ea207398892e |
654 o changeset: 0:ea207398892e |
739 user: test |
655 user: test |
740 date: Thu Jan 01 00:00:00 1970 +0000 |
656 date: Thu Jan 01 00:00:00 1970 +0000 |
741 summary: ROOT |
657 summary: ROOT |
742 |
658 |
743 |
|
744 Check templates |
659 Check templates |
745 --------------- |
660 --------------- |
746 |
661 |
747 $ hg tlog |
662 $ hg tlog |
748 o 7a230b46bf61 |
663 o 7a230b46bf61 |
749 | Precursors: 471f378eab4c |
664 | Precursors: 471f378eab4c |
750 | semi-colon: 471f378eab4c |
665 | semi-colon: 471f378eab4c |
751 | @ 471f378eab4c |
666 | @ 471f378eab4c |
752 |/ Successors: [7a230b46bf61] |
667 |/ Successors: [7a230b46bf61] |
753 | semi-colon: [7a230b46bf61] |
668 | semi-colon: [7a230b46bf61] |
754 | Fate: superseed as 7a230b46bf61 |
669 o ea207398892e |
755 o ea207398892e |
670 |
756 |
671 Test templates with pruned commits |
757 $ hg up 'desc(A2)' |
672 ================================== |
758 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
673 |
759 $ hg tlog |
674 Test setup |
760 @ 7a230b46bf61 |
675 ---------- |
761 | |
676 |
762 o ea207398892e |
677 $ hg init $TESTTMP/templates-local-prune |
763 |
678 $ cd $TESTTMP/templates-local-prune |
764 $ hg tlog --hidden |
679 $ mkcommit ROOT |
765 @ 7a230b46bf61 |
680 $ mkcommit A0 |
766 | Precursors: 471f378eab4c |
681 $ hg prune . |
767 | semi-colon: 471f378eab4c |
682 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
768 | x 471f378eab4c |
683 working directory now at ea207398892e |
769 |/ Successors: [7a230b46bf61] |
684 1 changesets pruned |
770 | semi-colon: [7a230b46bf61] |
685 |
771 | Fate: superseed as 7a230b46bf61 |
686 Check output |
772 o ea207398892e |
687 ------------ |
773 |
688 |
|
689 $ hg up "desc(A0)" --hidden |
|
690 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
691 working directory parent is obsolete! (471f378eab4c) |
|
692 (use 'hg evolve' to update to its parent successor) |
|
693 $ hg tlog |
|
694 @ 471f378eab4c |
|
695 | |
|
696 o ea207398892e |
|
697 |