Mercurial > evolve
comparison tests/test-evolve-templates.t @ 2630:8503ba8b82e3
merge: get stable change back into default
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 19 Jun 2017 18:44:17 +0200 |
parents | 6e5f5de46c50 9c0f6b85c28f |
children | b6e50897b94e |
comparison
equal
deleted
inserted
replaced
2627:42abd3bd30ee | 2630:8503ba8b82e3 |
---|---|
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, "; ")}")}\ |
20 > {if(obsfate, "\n Fate: {obsfate}")}\n' | 20 > {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n' |
21 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {obsfate}\n")}' | 21 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}' |
22 > fatelogjson = log -G -T '{node|short} {obsfate|json}\n' | 22 > fatelogjson = log -G -T '{node|short} {obsfate|json}\n' |
23 > EOF | 23 > EOF |
24 | 24 |
25 Test templates on amended commit | 25 Test templates on amended commit |
26 ================================ | 26 ================================ |
658 | semi-colon: 471f378eab4c | 658 | semi-colon: 471f378eab4c |
659 | @ 471f378eab4c | 659 | @ 471f378eab4c |
660 |/ Successors: [fdf9bde5129a], [019fadeab383] | 660 |/ Successors: [fdf9bde5129a], [019fadeab383] |
661 | semi-colon: [fdf9bde5129a]; [019fadeab383] | 661 | semi-colon: [fdf9bde5129a]; [019fadeab383] |
662 | Fate: rewritten as fdf9bde5129a | 662 | Fate: rewritten as fdf9bde5129a |
663 | rewritten as 019fadeab383 | 663 | Fate: rewritten as 019fadeab383 |
664 | | 664 | |
665 o ea207398892e | 665 o ea207398892e |
666 | 666 |
667 $ hg fatelog | 667 $ hg fatelog |
668 o 019fadeab383 | 668 o 019fadeab383 |
669 | | 669 | |
670 | o fdf9bde5129a | 670 | o fdf9bde5129a |
671 |/ | 671 |/ |
672 | @ 471f378eab4c | 672 | @ 471f378eab4c |
673 |/ Obsfate: rewritten as fdf9bde5129a | 673 |/ Obsfate: rewritten as fdf9bde5129a; rewritten as 019fadeab383 |
674 | rewritten as 019fadeab383 | |
675 | | 674 | |
676 o ea207398892e | 675 o ea207398892e |
677 | 676 |
678 | 677 |
679 $ hg up 'desc(A1)' | 678 $ hg up 'desc(A1)' |
712 | semi-colon: 471f378eab4c | 711 | semi-colon: 471f378eab4c |
713 | x 471f378eab4c | 712 | x 471f378eab4c |
714 |/ Successors: [fdf9bde5129a], [65b757b745b9] | 713 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
715 | semi-colon: [fdf9bde5129a]; [65b757b745b9] | 714 | semi-colon: [fdf9bde5129a]; [65b757b745b9] |
716 | Fate: rewritten as fdf9bde5129a | 715 | Fate: rewritten as fdf9bde5129a |
717 | rewritten as 65b757b745b9 | 716 | Fate: rewritten as 65b757b745b9 |
718 | | 717 | |
719 o ea207398892e | 718 o ea207398892e |
720 | 719 |
721 $ hg fatelog --hidden | 720 $ hg fatelog --hidden |
722 o 019fadeab383 | 721 o 019fadeab383 |
725 |/ Obsfate: rewritten as 019fadeab383 | 724 |/ Obsfate: rewritten as 019fadeab383 |
726 | | 725 | |
727 | @ fdf9bde5129a | 726 | @ fdf9bde5129a |
728 |/ | 727 |/ |
729 | x 471f378eab4c | 728 | x 471f378eab4c |
730 |/ Obsfate: rewritten as fdf9bde5129a | 729 |/ Obsfate: rewritten as fdf9bde5129a; rewritten as 65b757b745b9 |
731 | rewritten as 65b757b745b9 | |
732 | | 730 | |
733 o ea207398892e | 731 o ea207398892e |
734 | 732 |
735 | 733 |
736 $ hg fatelogjson --hidden | 734 $ hg fatelogjson --hidden |