annotate mercurial/templates/map-cmdline.phases @ 30135:3eae81c0a09d

checkcopies: rename 'ca' to 'base' This variable was named after the common ancestor. It is actually the merge base that might differ from the common ancestor in the graft case. We rename the variable before a larger refactoring to clarify the situation.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sat, 08 Oct 2016 18:38:42 +0200
parents 9570587b6986
children f4aeb952ab77
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
24907
9570587b6986 template-phases: extend default style instead of duplicating it
Yuya Nishihara <yuya@tcha.org>
parents: 24853
diff changeset
1 %include map-cmdline.default
22767
9579034d9eb2 log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19126
diff changeset
2 changeset = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{summary}\n'
22768
66bf251ee672 log: show phase in hg log -v with the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22767
diff changeset
3 changeset_verbose = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n'