Show More
@@ -1152,7 +1152,9 b' class changeset_templater(changeset_prin' | |||||
1152 | # behaviour cannot be changed so leave it here for now. |
|
1152 | # behaviour cannot be changed so leave it here for now. | |
1153 | def showparents(**args): |
|
1153 | def showparents(**args): | |
1154 | ctx = args['ctx'] |
|
1154 | ctx = args['ctx'] | |
1155 |
parents = [[('rev', p.rev()), |
|
1155 | parents = [[('rev', p.rev()), | |
|
1156 | ('node', p.hex()), | |||
|
1157 | ('phase', p.phasestr())] | |||
1156 | for p in self._meaningful_parentrevs(ctx)] |
|
1158 | for p in self._meaningful_parentrevs(ctx)] | |
1157 | return showlist('parent', parents, **args) |
|
1159 | return showlist('parent', parents, **args) | |
1158 |
|
1160 |
@@ -877,6 +877,34 b' Include works:' | |||||
877 | 1 |
|
877 | 1 | |
878 | 0 |
|
878 | 0 | |
879 |
|
879 | |||
|
880 | Check that {phase} works correctly on parents: | |||
|
881 | ||||
|
882 | $ cat << EOF > parentphase | |||
|
883 | > changeset_debug = '{rev} ({phase}):{parents}\n' | |||
|
884 | > parent = ' {rev} ({phase})' | |||
|
885 | > EOF | |||
|
886 | $ hg phase -r 5 --public | |||
|
887 | $ hg phase -r 7 --secret --force | |||
|
888 | $ hg log --debug -G --style ./parentphase | |||
|
889 | @ 8 (secret): 7 (secret) -1 (public) | |||
|
890 | | | |||
|
891 | o 7 (secret): -1 (public) -1 (public) | |||
|
892 | ||||
|
893 | o 6 (draft): 5 (public) 4 (draft) | |||
|
894 | |\ | |||
|
895 | | o 5 (public): 3 (public) -1 (public) | |||
|
896 | | | | |||
|
897 | o | 4 (draft): 3 (public) -1 (public) | |||
|
898 | |/ | |||
|
899 | o 3 (public): 2 (public) -1 (public) | |||
|
900 | | | |||
|
901 | o 2 (public): 1 (public) -1 (public) | |||
|
902 | | | |||
|
903 | o 1 (public): 0 (public) -1 (public) | |||
|
904 | | | |||
|
905 | o 0 (public): -1 (public) -1 (public) | |||
|
906 | ||||
|
907 | ||||
880 | Missing non-standard names give no error (backward compatibility): |
|
908 | Missing non-standard names give no error (backward compatibility): | |
881 |
|
909 | |||
882 | $ echo "changeset = '{c}'" > t |
|
910 | $ echo "changeset = '{c}'" > t |
General Comments 0
You need to be logged in to leave comments.
Login now