comparison tests/test-obsmarker-template.t @ 32909:89610c586fa2

templatekw: reference predecessor node id as {node} in map operation More predecessor-depending values will be populated by the next patch.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 17 Jun 2017 13:18:03 +0900
parents 1858fc2327ef
children 498e9dcc5fa9
comparison
equal deleted inserted replaced
32908:661025fd3e1c 32909:89610c586fa2
13 > evolution=all 13 > evolution=all
14 > [alias] 14 > [alias]
15 > tlog = log -G -T '{node|short}\ 15 > tlog = log -G -T '{node|short}\
16 > {if(predecessors, "\n Predecessors: {predecessors}")}\ 16 > {if(predecessors, "\n Predecessors: {predecessors}")}\
17 > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ 17 > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\
18 > {if(predecessors, "\n json: {predecessors|json}")}\n' 18 > {if(predecessors, "\n json: {predecessors|json}")}\
19 > {if(predecessors, "\n map: {join(predecessors % "{node}", " ")}")}\n'
19 > EOF 20 > EOF
20 21
21 Test templates on amended commit 22 Test templates on amended commit
22 ================================ 23 ================================
23 24
70 $ hg tlog 71 $ hg tlog
71 o d004c8f274b9 72 o d004c8f274b9
72 | Predecessors: 471f378eab4c 73 | Predecessors: 471f378eab4c
73 | semi-colon: 471f378eab4c 74 | semi-colon: 471f378eab4c
74 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 75 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
76 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
75 | @ 471f378eab4c 77 | @ 471f378eab4c
76 |/ 78 |/
77 o ea207398892e 79 o ea207398892e
78 80
79 $ hg up 'desc(A1)' --hidden 81 $ hg up 'desc(A1)' --hidden
83 $ hg tlog 85 $ hg tlog
84 o d004c8f274b9 86 o d004c8f274b9
85 | Predecessors: a468dc9b3633 87 | Predecessors: a468dc9b3633
86 | semi-colon: a468dc9b3633 88 | semi-colon: a468dc9b3633
87 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] 89 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
90 | map: a468dc9b36338b14fdb7825f55ce3df4e71517ad
88 | @ a468dc9b3633 91 | @ a468dc9b3633
89 |/ 92 |/
90 o ea207398892e 93 o ea207398892e
91 94
92 Predecessors template should show all the predecessors as we force their display 95 Predecessors template should show all the predecessors as we force their display
94 $ hg tlog --hidden 97 $ hg tlog --hidden
95 o d004c8f274b9 98 o d004c8f274b9
96 | Predecessors: a468dc9b3633 99 | Predecessors: a468dc9b3633
97 | semi-colon: a468dc9b3633 100 | semi-colon: a468dc9b3633
98 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] 101 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
102 | map: a468dc9b36338b14fdb7825f55ce3df4e71517ad
99 | @ a468dc9b3633 103 | @ a468dc9b3633
100 |/ Predecessors: 471f378eab4c 104 |/ Predecessors: 471f378eab4c
101 | semi-colon: 471f378eab4c 105 | semi-colon: 471f378eab4c
102 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 106 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
107 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
103 | x f137d23bb3e1 108 | x f137d23bb3e1
104 | | 109 | |
105 | x 471f378eab4c 110 | x 471f378eab4c
106 |/ 111 |/
107 o ea207398892e 112 o ea207398892e
119 $ hg tlog --hidden 124 $ hg tlog --hidden
120 @ d004c8f274b9 125 @ d004c8f274b9
121 | Predecessors: a468dc9b3633 126 | Predecessors: a468dc9b3633
122 | semi-colon: a468dc9b3633 127 | semi-colon: a468dc9b3633
123 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] 128 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
129 | map: a468dc9b36338b14fdb7825f55ce3df4e71517ad
124 | x a468dc9b3633 130 | x a468dc9b3633
125 |/ Predecessors: 471f378eab4c 131 |/ Predecessors: 471f378eab4c
126 | semi-colon: 471f378eab4c 132 | semi-colon: 471f378eab4c
127 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 133 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
134 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
128 | x f137d23bb3e1 135 | x f137d23bb3e1
129 | | 136 | |
130 | x 471f378eab4c 137 | x 471f378eab4c
131 |/ 138 |/
132 o ea207398892e 139 o ea207398892e
200 $ hg tlog 207 $ hg tlog
201 o f257fde29c7a 208 o f257fde29c7a
202 | Predecessors: 471597cad322 209 | Predecessors: 471597cad322
203 | semi-colon: 471597cad322 210 | semi-colon: 471597cad322
204 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] 211 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
212 | map: 471597cad322d1f659bb169751be9133dad92ef3
205 o 337fec4d2edc 213 o 337fec4d2edc
206 | Predecessors: 471597cad322 214 | Predecessors: 471597cad322
207 | semi-colon: 471597cad322 215 | semi-colon: 471597cad322
208 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] 216 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
217 | map: 471597cad322d1f659bb169751be9133dad92ef3
209 | @ 471597cad322 218 | @ 471597cad322
210 |/ 219 |/
211 o ea207398892e 220 o ea207398892e
212 221
213 $ hg up f257fde29c7a 222 $ hg up f257fde29c7a
227 $ hg tlog --hidden 236 $ hg tlog --hidden
228 @ f257fde29c7a 237 @ f257fde29c7a
229 | Predecessors: 471597cad322 238 | Predecessors: 471597cad322
230 | semi-colon: 471597cad322 239 | semi-colon: 471597cad322
231 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] 240 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
241 | map: 471597cad322d1f659bb169751be9133dad92ef3
232 o 337fec4d2edc 242 o 337fec4d2edc
233 | Predecessors: 471597cad322 243 | Predecessors: 471597cad322
234 | semi-colon: 471597cad322 244 | semi-colon: 471597cad322
235 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] 245 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
246 | map: 471597cad322d1f659bb169751be9133dad92ef3
236 | x 471597cad322 247 | x 471597cad322
237 |/ 248 |/
238 o ea207398892e 249 o ea207398892e
239 250
240 Test templates with folded commit 251 Test templates with folded commit
310 $ hg tlog 321 $ hg tlog
311 o eb5a0daa2192 322 o eb5a0daa2192
312 | Predecessors: 471f378eab4c 323 | Predecessors: 471f378eab4c
313 | semi-colon: 471f378eab4c 324 | semi-colon: 471f378eab4c
314 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 325 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
326 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
315 | @ 471f378eab4c 327 | @ 471f378eab4c
316 |/ 328 |/
317 o ea207398892e 329 o ea207398892e
318 330
319 $ hg up 'desc(B0)' --hidden 331 $ hg up 'desc(B0)' --hidden
324 $ hg tlog 336 $ hg tlog
325 o eb5a0daa2192 337 o eb5a0daa2192
326 | Predecessors: 0dec01379d3b 471f378eab4c 338 | Predecessors: 0dec01379d3b 471f378eab4c
327 | semi-colon: 0dec01379d3b; 471f378eab4c 339 | semi-colon: 0dec01379d3b; 471f378eab4c
328 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] 340 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
341 | map: 0dec01379d3be6318c470ead31b1fe7ae7cb53d5 471f378eab4c5e25f6c77f785b27c936efb22874
329 | @ 0dec01379d3b 342 | @ 0dec01379d3b
330 | | 343 | |
331 | x 471f378eab4c 344 | x 471f378eab4c
332 |/ 345 |/
333 o ea207398892e 346 o ea207398892e
347 $ hg tlog --hidden 360 $ hg tlog --hidden
348 @ eb5a0daa2192 361 @ eb5a0daa2192
349 | Predecessors: 0dec01379d3b 471f378eab4c 362 | Predecessors: 0dec01379d3b 471f378eab4c
350 | semi-colon: 0dec01379d3b; 471f378eab4c 363 | semi-colon: 0dec01379d3b; 471f378eab4c
351 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] 364 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
365 | map: 0dec01379d3be6318c470ead31b1fe7ae7cb53d5 471f378eab4c5e25f6c77f785b27c936efb22874
352 | x 0dec01379d3b 366 | x 0dec01379d3b
353 | | 367 | |
354 | x 471f378eab4c 368 | x 471f378eab4c
355 |/ 369 |/
356 o ea207398892e 370 o ea207398892e
458 $ hg tlog 472 $ hg tlog
459 o 019fadeab383 473 o 019fadeab383
460 | Predecessors: 471f378eab4c 474 | Predecessors: 471f378eab4c
461 | semi-colon: 471f378eab4c 475 | semi-colon: 471f378eab4c
462 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 476 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
477 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
463 | o fdf9bde5129a 478 | o fdf9bde5129a
464 |/ Predecessors: 471f378eab4c 479 |/ Predecessors: 471f378eab4c
465 | semi-colon: 471f378eab4c 480 | semi-colon: 471f378eab4c
466 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 481 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
482 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
467 | @ 471f378eab4c 483 | @ 471f378eab4c
468 |/ 484 |/
469 o ea207398892e 485 o ea207398892e
470 486
471 $ hg up 'desc(A1)' 487 $ hg up 'desc(A1)'
485 $ hg tlog --hidden 501 $ hg tlog --hidden
486 o 019fadeab383 502 o 019fadeab383
487 | Predecessors: 65b757b745b9 503 | Predecessors: 65b757b745b9
488 | semi-colon: 65b757b745b9 504 | semi-colon: 65b757b745b9
489 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] 505 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
506 | map: 65b757b745b935093c87a2bccd877521cccffcbd
490 | x 65b757b745b9 507 | x 65b757b745b9
491 |/ Predecessors: 471f378eab4c 508 |/ Predecessors: 471f378eab4c
492 | semi-colon: 471f378eab4c 509 | semi-colon: 471f378eab4c
493 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 510 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
511 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
494 | @ fdf9bde5129a 512 | @ fdf9bde5129a
495 |/ Predecessors: 471f378eab4c 513 |/ Predecessors: 471f378eab4c
496 | semi-colon: 471f378eab4c 514 | semi-colon: 471f378eab4c
497 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 515 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
516 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
498 | x 471f378eab4c 517 | x 471f378eab4c
499 |/ 518 |/
500 o ea207398892e 519 o ea207398892e
501 520
502 521
586 $ hg tlog 605 $ hg tlog
587 o eb5a0daa2192 606 o eb5a0daa2192
588 | Predecessors: 471f378eab4c 607 | Predecessors: 471f378eab4c
589 | semi-colon: 471f378eab4c 608 | semi-colon: 471f378eab4c
590 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 609 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
610 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
591 | @ 471f378eab4c 611 | @ 471f378eab4c
592 |/ 612 |/
593 o ea207398892e 613 o ea207398892e
594 614
595 $ hg up 'desc(B0)' --hidden 615 $ hg up 'desc(B0)' --hidden
599 $ hg tlog 619 $ hg tlog
600 o eb5a0daa2192 620 o eb5a0daa2192
601 | Predecessors: 0dec01379d3b 471f378eab4c 621 | Predecessors: 0dec01379d3b 471f378eab4c
602 | semi-colon: 0dec01379d3b; 471f378eab4c 622 | semi-colon: 0dec01379d3b; 471f378eab4c
603 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] 623 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
624 | map: 0dec01379d3be6318c470ead31b1fe7ae7cb53d5 471f378eab4c5e25f6c77f785b27c936efb22874
604 | @ 0dec01379d3b 625 | @ 0dec01379d3b
605 | | 626 | |
606 | x 471f378eab4c 627 | x 471f378eab4c
607 |/ 628 |/
608 o ea207398892e 629 o ea207398892e
614 $ hg tlog 635 $ hg tlog
615 o eb5a0daa2192 636 o eb5a0daa2192
616 | Predecessors: 471f378eab4c b7ea6d14e664 637 | Predecessors: 471f378eab4c b7ea6d14e664
617 | semi-colon: 471f378eab4c; b7ea6d14e664 638 | semi-colon: 471f378eab4c; b7ea6d14e664
618 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] 639 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
640 | map: 471f378eab4c5e25f6c77f785b27c936efb22874 b7ea6d14e664bdc8922221f7992631b50da3fb07
619 | @ b7ea6d14e664 641 | @ b7ea6d14e664
620 | | 642 | |
621 | x 471f378eab4c 643 | x 471f378eab4c
622 |/ 644 |/
623 o ea207398892e 645 o ea207398892e
636 $ hg tlog --hidden 658 $ hg tlog --hidden
637 @ eb5a0daa2192 659 @ eb5a0daa2192
638 | Predecessors: 471f378eab4c b7ea6d14e664 660 | Predecessors: 471f378eab4c b7ea6d14e664
639 | semi-colon: 471f378eab4c; b7ea6d14e664 661 | semi-colon: 471f378eab4c; b7ea6d14e664
640 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] 662 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
663 | map: 471f378eab4c5e25f6c77f785b27c936efb22874 b7ea6d14e664bdc8922221f7992631b50da3fb07
641 | x b7ea6d14e664 664 | x b7ea6d14e664
642 | | Predecessors: 0dec01379d3b 665 | | Predecessors: 0dec01379d3b
643 | | semi-colon: 0dec01379d3b 666 | | semi-colon: 0dec01379d3b
644 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] 667 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
668 | | map: 0dec01379d3be6318c470ead31b1fe7ae7cb53d5
645 | | x 0dec01379d3b 669 | | x 0dec01379d3b
646 | |/ 670 | |/
647 | x 471f378eab4c 671 | x 471f378eab4c
648 |/ 672 |/
649 o ea207398892e 673 o ea207398892e
742 $ hg tlog 766 $ hg tlog
743 o 7a230b46bf61 767 o 7a230b46bf61
744 | Predecessors: 471f378eab4c 768 | Predecessors: 471f378eab4c
745 | semi-colon: 471f378eab4c 769 | semi-colon: 471f378eab4c
746 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 770 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
771 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
747 | @ 471f378eab4c 772 | @ 471f378eab4c
748 |/ 773 |/
749 o ea207398892e 774 o ea207398892e
750 775
751 $ hg up 'desc(A2)' 776 $ hg up 'desc(A2)'
762 $ hg tlog --hidden 787 $ hg tlog --hidden
763 @ 7a230b46bf61 788 @ 7a230b46bf61
764 | Predecessors: 471f378eab4c 789 | Predecessors: 471f378eab4c
765 | semi-colon: 471f378eab4c 790 | semi-colon: 471f378eab4c
766 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 791 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
792 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
767 | x 471f378eab4c 793 | x 471f378eab4c
768 |/ 794 |/
769 o ea207398892e 795 o ea207398892e
770 796
771 797
805 $ hg tlog 831 $ hg tlog
806 o f897c6137566 832 o f897c6137566
807 | Predecessors: 0dec01379d3b 833 | Predecessors: 0dec01379d3b
808 | semi-colon: 0dec01379d3b 834 | semi-colon: 0dec01379d3b
809 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] 835 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
836 | map: 0dec01379d3be6318c470ead31b1fe7ae7cb53d5
810 | @ 0dec01379d3b 837 | @ 0dec01379d3b
811 | | Predecessors: 471f378eab4c 838 | | Predecessors: 471f378eab4c
812 | | semi-colon: 471f378eab4c 839 | | semi-colon: 471f378eab4c
813 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 840 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
841 | | map: 471f378eab4c5e25f6c77f785b27c936efb22874
814 | x 471f378eab4c 842 | x 471f378eab4c
815 |/ Predecessors: 0dec01379d3b 843 |/ Predecessors: 0dec01379d3b
816 | semi-colon: 0dec01379d3b 844 | semi-colon: 0dec01379d3b
817 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] 845 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
846 | map: 0dec01379d3be6318c470ead31b1fe7ae7cb53d5
818 o ea207398892e 847 o ea207398892e
819 848
820 849
821 $ hg up -r "desc(A0)" --hidden 850 $ hg up -r "desc(A0)" --hidden
822 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 851 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
823 $ hg tlog 852 $ hg tlog
824 o f897c6137566 853 o f897c6137566
825 | Predecessors: 471f378eab4c 854 | Predecessors: 471f378eab4c
826 | semi-colon: 471f378eab4c 855 | semi-colon: 471f378eab4c
827 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 856 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
857 | map: 471f378eab4c5e25f6c77f785b27c936efb22874
828 | @ 471f378eab4c 858 | @ 471f378eab4c
829 |/ 859 |/
830 o ea207398892e 860 o ea207398892e
831 861
832 862
841 $ hg tlog --hidden 871 $ hg tlog --hidden
842 o f897c6137566 872 o f897c6137566
843 | Predecessors: 0dec01379d3b 873 | Predecessors: 0dec01379d3b
844 | semi-colon: 0dec01379d3b 874 | semi-colon: 0dec01379d3b
845 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] 875 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
876 | map: 0dec01379d3be6318c470ead31b1fe7ae7cb53d5
846 | x 0dec01379d3b 877 | x 0dec01379d3b
847 | | Predecessors: 471f378eab4c 878 | | Predecessors: 471f378eab4c
848 | | semi-colon: 471f378eab4c 879 | | semi-colon: 471f378eab4c
849 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] 880 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
881 | | map: 471f378eab4c5e25f6c77f785b27c936efb22874
850 | x 471f378eab4c 882 | x 471f378eab4c
851 |/ Predecessors: 0dec01379d3b 883 |/ Predecessors: 0dec01379d3b
852 | semi-colon: 0dec01379d3b 884 | semi-colon: 0dec01379d3b
853 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] 885 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
886 | map: 0dec01379d3be6318c470ead31b1fe7ae7cb53d5
854 @ ea207398892e 887 @ ea207398892e
855 888