templates: fix "log -q" output of phases style

It had the same problem as be4dab229c78, name conflicts of {node} keyword.
This commit is contained in:
Yuya Nishihara 2015-03-28 20:22:03 +09:00
parent e1c0e69712
commit 4a691471f2
2 changed files with 5 additions and 2 deletions

View File

@ -1,7 +1,7 @@
# Base templates. Due to name clashes with existing keywords, we have
# to replace some keywords with 'lkeyword', for 'labelled keyword'
changeset = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{summary}\n'
changeset_quiet = '{node}'
changeset_quiet = '{lnode}'
changeset_verbose = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n'
changeset_debug = '{fullcset}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{lfile_mods}{lfile_adds}{lfile_dels}{lfile_copies_switch}{extras}{description}\n'
@ -40,7 +40,7 @@ fullcset = '{label("log.changeset changeset.{phase}",
parent = '{label("log.parent changeset.{phase}",
"parent: {rev}:{node|formatnode}")}\n'
node = '{label("log.node",
lnode = '{label("log.node",
"{rev}:{node|short}")}\n'
manifest = '{label("ui.debug log.manifest",

View File

@ -150,6 +150,9 @@ log on directory
summary: e
$ hg log -f -l1 --style phases -q
4:7e4639b4691b
-f, but no args
$ hg log -f