equal
deleted
inserted
replaced
12 > [extensions] |
12 > [extensions] |
13 > evolve = |
13 > evolve = |
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(successors, "\n Successors: {successors}")}\ |
18 > {if(successors, "\n Successors: {successors}")}\ |
18 > {if(successors, "\n Fate: {obsfate_quiet}")}\n' |
19 > {if(successors, "\n Fate: {obsfate_quiet}")}\n' |
19 > EOF |
20 > EOF |
20 |
21 |
21 Test templates on amended commit |
22 Test templates on amended commit |
69 |
70 |
70 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 |
71 $ hg tlog |
72 $ hg tlog |
72 o d004c8f274b9 |
73 o d004c8f274b9 |
73 | Precursors: 471f378eab4c |
74 | Precursors: 471f378eab4c |
|
75 | semi-colon: 471f378eab4c |
74 | @ 471f378eab4c |
76 | @ 471f378eab4c |
75 |/ Successors: [d004c8f274b9] |
77 |/ Successors: [d004c8f274b9] |
76 | Fate: superseed as d004c8f274b9 |
78 | Fate: superseed as d004c8f274b9 |
77 o ea207398892e |
79 o ea207398892e |
78 |
80 |
83 |
85 |
84 Precursors template should show current revision as it is the working copy |
86 Precursors template should show current revision as it is the working copy |
85 $ hg tlog |
87 $ hg tlog |
86 o d004c8f274b9 |
88 o d004c8f274b9 |
87 | Precursors: a468dc9b3633 |
89 | Precursors: a468dc9b3633 |
|
90 | semi-colon: a468dc9b3633 |
88 | @ a468dc9b3633 |
91 | @ a468dc9b3633 |
89 |/ Successors: [d004c8f274b9] |
92 |/ Successors: [d004c8f274b9] |
90 | Fate: superseed as d004c8f274b9 |
93 | Fate: superseed as d004c8f274b9 |
91 o ea207398892e |
94 o ea207398892e |
92 |
95 |
93 Precursors template should show the precursor as we force its display with |
96 Precursors template should show the precursor as we force its display with |
94 --hidden |
97 --hidden |
95 $ hg tlog --hidden |
98 $ hg tlog --hidden |
96 o d004c8f274b9 |
99 o d004c8f274b9 |
97 | Precursors: a468dc9b3633 |
100 | Precursors: a468dc9b3633 |
|
101 | semi-colon: a468dc9b3633 |
98 | @ a468dc9b3633 |
102 | @ a468dc9b3633 |
99 |/ Precursors: 471f378eab4c |
103 |/ Precursors: 471f378eab4c |
|
104 | semi-colon: 471f378eab4c |
100 | Successors: [d004c8f274b9] |
105 | Successors: [d004c8f274b9] |
101 | Fate: superseed as d004c8f274b9 |
106 | Fate: superseed as d004c8f274b9 |
102 | x f137d23bb3e1 |
107 | x f137d23bb3e1 |
103 | | |
108 | | |
104 | x 471f378eab4c |
109 | x 471f378eab4c |
115 o ea207398892e |
120 o ea207398892e |
116 |
121 |
117 $ hg tlog --hidden |
122 $ hg tlog --hidden |
118 @ d004c8f274b9 |
123 @ d004c8f274b9 |
119 | Precursors: a468dc9b3633 |
124 | Precursors: a468dc9b3633 |
|
125 | semi-colon: a468dc9b3633 |
120 | x a468dc9b3633 |
126 | x a468dc9b3633 |
121 |/ Precursors: 471f378eab4c |
127 |/ Precursors: 471f378eab4c |
|
128 | semi-colon: 471f378eab4c |
122 | Successors: [d004c8f274b9] |
129 | Successors: [d004c8f274b9] |
123 | Fate: superseed as d004c8f274b9 |
130 | Fate: superseed as d004c8f274b9 |
124 | x f137d23bb3e1 |
131 | x f137d23bb3e1 |
125 | | |
132 | | |
126 | x 471f378eab4c |
133 | x 471f378eab4c |
221 |
228 |
222 Precursors template should show current revision as it is the working copy |
229 Precursors template should show current revision as it is the working copy |
223 $ hg tlog |
230 $ hg tlog |
224 o f257fde29c7a |
231 o f257fde29c7a |
225 | Precursors: 471597cad322 |
232 | Precursors: 471597cad322 |
|
233 | semi-colon: 471597cad322 |
226 o 337fec4d2edc |
234 o 337fec4d2edc |
227 | Precursors: 471597cad322 |
235 | Precursors: 471597cad322 |
|
236 | semi-colon: 471597cad322 |
228 | @ 471597cad322 |
237 | @ 471597cad322 |
229 |/ Successors: [337fec4d2edc, f257fde29c7a] |
238 |/ Successors: [337fec4d2edc, f257fde29c7a] |
230 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
239 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
231 o ea207398892e |
240 o ea207398892e |
232 |
241 |
245 Precursors template should show the precursor as we force its display with |
254 Precursors template should show the precursor as we force its display with |
246 --hidden |
255 --hidden |
247 $ hg tlog --hidden |
256 $ hg tlog --hidden |
248 @ f257fde29c7a |
257 @ f257fde29c7a |
249 | Precursors: 471597cad322 |
258 | Precursors: 471597cad322 |
|
259 | semi-colon: 471597cad322 |
250 o 337fec4d2edc |
260 o 337fec4d2edc |
251 | Precursors: 471597cad322 |
261 | Precursors: 471597cad322 |
|
262 | semi-colon: 471597cad322 |
252 | x 471597cad322 |
263 | x 471597cad322 |
253 |/ Successors: [337fec4d2edc, f257fde29c7a] |
264 |/ Successors: [337fec4d2edc, f257fde29c7a] |
254 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
265 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
255 o ea207398892e |
266 o ea207398892e |
256 |
267 |
318 |
329 |
319 Precursors template should show current revision as it is the working copy |
330 Precursors template should show current revision as it is the working copy |
320 $ hg tlog |
331 $ hg tlog |
321 o eb5a0daa2192 |
332 o eb5a0daa2192 |
322 | Precursors: 471f378eab4c |
333 | Precursors: 471f378eab4c |
|
334 | semi-colon: 471f378eab4c |
323 | @ 471f378eab4c |
335 | @ 471f378eab4c |
324 |/ Successors: [eb5a0daa2192] |
336 |/ Successors: [eb5a0daa2192] |
325 | Fate: superseed as eb5a0daa2192 |
337 | Fate: superseed as eb5a0daa2192 |
326 o ea207398892e |
338 o ea207398892e |
327 |
339 |
332 |
344 |
333 Precursors template should show both precursors as they should be both |
345 Precursors template should show both precursors as they should be both |
334 displayed |
346 displayed |
335 $ hg tlog |
347 $ hg tlog |
336 o eb5a0daa2192 |
348 o eb5a0daa2192 |
337 | Precursors: 0dec01379d3b, 471f378eab4c |
349 | Precursors: 0dec01379d3b 471f378eab4c |
|
350 | semi-colon: 0dec01379d3b; 471f378eab4c |
338 | @ 0dec01379d3b |
351 | @ 0dec01379d3b |
339 | | Successors: [eb5a0daa2192] |
352 | | Successors: [eb5a0daa2192] |
340 | | Fate: superseed as eb5a0daa2192 |
353 | | Fate: superseed as eb5a0daa2192 |
341 | x 471f378eab4c |
354 | x 471f378eab4c |
342 |/ Successors: [eb5a0daa2192] |
355 |/ Successors: [eb5a0daa2192] |
355 |
368 |
356 Precursors template should show both precursors as we force its display with |
369 Precursors template should show both precursors as we force its display with |
357 --hidden |
370 --hidden |
358 $ hg tlog --hidden |
371 $ hg tlog --hidden |
359 @ eb5a0daa2192 |
372 @ eb5a0daa2192 |
360 | Precursors: 0dec01379d3b, 471f378eab4c |
373 | Precursors: 0dec01379d3b 471f378eab4c |
|
374 | semi-colon: 0dec01379d3b; 471f378eab4c |
361 | x 0dec01379d3b |
375 | x 0dec01379d3b |
362 | | Successors: [eb5a0daa2192] |
376 | | Successors: [eb5a0daa2192] |
363 | | Fate: superseed as eb5a0daa2192 |
377 | | Fate: superseed as eb5a0daa2192 |
364 | x 471f378eab4c |
378 | x 471f378eab4c |
365 |/ Successors: [eb5a0daa2192] |
379 |/ Successors: [eb5a0daa2192] |
440 |
454 |
441 Precursors template should show current revision as it is the working copy |
455 Precursors template should show current revision as it is the working copy |
442 $ hg tlog |
456 $ hg tlog |
443 o 019fadeab383 |
457 o 019fadeab383 |
444 | Precursors: 471f378eab4c |
458 | Precursors: 471f378eab4c |
|
459 | semi-colon: 471f378eab4c |
445 | o fdf9bde5129a |
460 | o fdf9bde5129a |
446 |/ Precursors: 471f378eab4c |
461 |/ Precursors: 471f378eab4c |
|
462 | semi-colon: 471f378eab4c |
447 | @ 471f378eab4c |
463 | @ 471f378eab4c |
448 |/ Successors: [fdf9bde5129a], [019fadeab383] |
464 |/ Successors: [fdf9bde5129a], [019fadeab383] |
449 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 |
465 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 |
450 o ea207398892e |
466 o ea207398892e |
451 |
467 |
462 |
478 |
463 Precursors template should a precursor as we force its display with --hidden |
479 Precursors template should a precursor as we force its display with --hidden |
464 $ hg tlog --hidden |
480 $ hg tlog --hidden |
465 o 019fadeab383 |
481 o 019fadeab383 |
466 | Precursors: 65b757b745b9 |
482 | Precursors: 65b757b745b9 |
|
483 | semi-colon: 65b757b745b9 |
467 | x 65b757b745b9 |
484 | x 65b757b745b9 |
468 |/ Precursors: 471f378eab4c |
485 |/ Precursors: 471f378eab4c |
|
486 | semi-colon: 471f378eab4c |
469 | Successors: [019fadeab383] |
487 | Successors: [019fadeab383] |
470 | Fate: superseed as 019fadeab383 |
488 | Fate: superseed as 019fadeab383 |
471 | @ fdf9bde5129a |
489 | @ fdf9bde5129a |
472 |/ Precursors: 471f378eab4c |
490 |/ Precursors: 471f378eab4c |
|
491 | semi-colon: 471f378eab4c |
473 | x 471f378eab4c |
492 | x 471f378eab4c |
474 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
493 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
475 | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 |
494 | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 |
476 o ea207398892e |
495 o ea207398892e |
477 |
496 |
550 working directory parent is obsolete! (471f378eab4c) |
569 working directory parent is obsolete! (471f378eab4c) |
551 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
570 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
552 $ hg tlog |
571 $ hg tlog |
553 o eb5a0daa2192 |
572 o eb5a0daa2192 |
554 | Precursors: 471f378eab4c |
573 | Precursors: 471f378eab4c |
|
574 | semi-colon: 471f378eab4c |
555 | @ 471f378eab4c |
575 | @ 471f378eab4c |
556 |/ Successors: [eb5a0daa2192] |
576 |/ Successors: [eb5a0daa2192] |
557 | Fate: superseed as eb5a0daa2192 |
577 | Fate: superseed as eb5a0daa2192 |
558 o ea207398892e |
578 o ea207398892e |
559 |
579 |
561 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
581 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
562 working directory parent is obsolete! (0dec01379d3b) |
582 working directory parent is obsolete! (0dec01379d3b) |
563 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
583 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
564 $ hg tlog |
584 $ hg tlog |
565 o eb5a0daa2192 |
585 o eb5a0daa2192 |
566 | Precursors: 0dec01379d3b, 471f378eab4c |
586 | Precursors: 0dec01379d3b 471f378eab4c |
|
587 | semi-colon: 0dec01379d3b; 471f378eab4c |
567 | @ 0dec01379d3b |
588 | @ 0dec01379d3b |
568 | | Successors: [eb5a0daa2192] |
589 | | Successors: [eb5a0daa2192] |
569 | | Fate: superseed as eb5a0daa2192 |
590 | | Fate: superseed as eb5a0daa2192 |
570 | x 471f378eab4c |
591 | x 471f378eab4c |
571 |/ Successors: [eb5a0daa2192] |
592 |/ Successors: [eb5a0daa2192] |
576 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
597 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
577 working directory parent is obsolete! (b7ea6d14e664) |
598 working directory parent is obsolete! (b7ea6d14e664) |
578 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
599 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
579 $ hg tlog |
600 $ hg tlog |
580 o eb5a0daa2192 |
601 o eb5a0daa2192 |
581 | Precursors: 471f378eab4c, b7ea6d14e664 |
602 | Precursors: 471f378eab4c b7ea6d14e664 |
|
603 | semi-colon: 471f378eab4c; b7ea6d14e664 |
582 | @ b7ea6d14e664 |
604 | @ b7ea6d14e664 |
583 | | Successors: [eb5a0daa2192] |
605 | | Successors: [eb5a0daa2192] |
584 | | Fate: superseed as eb5a0daa2192 |
606 | | Fate: superseed as eb5a0daa2192 |
585 | x 471f378eab4c |
607 | x 471f378eab4c |
586 |/ Successors: [eb5a0daa2192] |
608 |/ Successors: [eb5a0daa2192] |
594 | |
616 | |
595 o ea207398892e |
617 o ea207398892e |
596 |
618 |
597 $ hg tlog --hidden |
619 $ hg tlog --hidden |
598 @ eb5a0daa2192 |
620 @ eb5a0daa2192 |
599 | Precursors: 471f378eab4c, b7ea6d14e664 |
621 | Precursors: 471f378eab4c b7ea6d14e664 |
|
622 | semi-colon: 471f378eab4c; b7ea6d14e664 |
600 | x b7ea6d14e664 |
623 | x b7ea6d14e664 |
601 | | Precursors: 0dec01379d3b |
624 | | Precursors: 0dec01379d3b |
|
625 | | semi-colon: 0dec01379d3b |
602 | | Successors: [eb5a0daa2192] |
626 | | Successors: [eb5a0daa2192] |
603 | | Fate: superseed as eb5a0daa2192 |
627 | | Fate: superseed as eb5a0daa2192 |
604 | | x 0dec01379d3b |
628 | | x 0dec01379d3b |
605 | |/ Successors: [b7ea6d14e664] |
629 | |/ Successors: [b7ea6d14e664] |
606 | | Fate: superseed as b7ea6d14e664 |
630 | | Fate: superseed as b7ea6d14e664 |
698 --------------- |
722 --------------- |
699 |
723 |
700 $ hg tlog |
724 $ hg tlog |
701 o 7a230b46bf61 |
725 o 7a230b46bf61 |
702 | Precursors: 471f378eab4c |
726 | Precursors: 471f378eab4c |
|
727 | semi-colon: 471f378eab4c |
703 | @ 471f378eab4c |
728 | @ 471f378eab4c |
704 |/ Successors: [7a230b46bf61] |
729 |/ Successors: [7a230b46bf61] |
705 | Fate: superseed as 7a230b46bf61 |
730 | Fate: superseed as 7a230b46bf61 |
706 o ea207398892e |
731 o ea207398892e |
707 |
732 |
713 o ea207398892e |
738 o ea207398892e |
714 |
739 |
715 $ hg tlog --hidden |
740 $ hg tlog --hidden |
716 @ 7a230b46bf61 |
741 @ 7a230b46bf61 |
717 | Precursors: 471f378eab4c |
742 | Precursors: 471f378eab4c |
|
743 | semi-colon: 471f378eab4c |
718 | x 471f378eab4c |
744 | x 471f378eab4c |
719 |/ Successors: [7a230b46bf61] |
745 |/ Successors: [7a230b46bf61] |
720 | Fate: superseed as 7a230b46bf61 |
746 | Fate: superseed as 7a230b46bf61 |
721 o ea207398892e |
747 o ea207398892e |
722 |
748 |