template-phases: extend default style instead of duplicating it
The phases style started as a copy of the default style at 5c5152af0d15, but
we didn't have to copy it because the templater supports %include syntax.
This makes sure that the phases style have the same output as the default
except for the additional "phase:" row.
--- a/mercurial/templates/map-cmdline.phases Sat Apr 18 15:39:26 2015 +0200
+++ b/mercurial/templates/map-cmdline.phases Sat Apr 25 21:42:07 2015 +0900
@@ -1,73 +1,3 @@
-# Base templates. Due to name clashes with existing keywords, we have
-# to replace some keywords with 'lkeyword', for 'labelled keyword'
+%include map-cmdline.default
changeset = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{summary}\n'
-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'
-
-# File templates
-lfiles = '{if(files,
- label("ui.note log.files",
- "files: {files}\n"))}'
-
-lfile_mods = '{if(file_mods,
- label("ui.debug log.files",
- "files: {file_mods}\n"))}'
-
-lfile_adds = '{if(file_adds,
- label("ui.debug log.files",
- "files+: {file_adds}\n"))}'
-
-lfile_dels = '{if(file_dels,
- label("ui.debug log.files",
- "files-: {file_dels}\n"))}'
-
-lfile_copies_switch = '{if(file_copies_switch,
- label("ui.note log.copies",
- "copies: {file_copies_switch
- % ' {name} ({source})'}\n"))}'
-
-# General templates
-cset = '{label("log.changeset changeset.{phase}",
- "changeset: {rev}:{node|short}")}\n'
-
-lphase = '{label("log.phase",
- "phase: {phase}")}\n'
-
-fullcset = '{label("log.changeset changeset.{phase}",
- "changeset: {rev}:{node}")}\n'
-
-parent = '{label("log.parent changeset.{phase}",
- "parent: {rev}:{node|formatnode}")}\n'
-
-lnode = '{label("log.node",
- "{rev}:{node|short}")}\n'
-
-manifest = '{label("ui.debug log.manifest",
- "manifest: {rev}:{node}")}\n'
-
-branch = '{label("log.branch",
- "branch: {branch}")}\n'
-
-tag = '{label("log.tag",
- "tag: {tag}")}\n'
-
-bookmark = '{label("log.bookmark",
- "bookmark: {bookmark}")}\n'
-
-user = '{label("log.user",
- "user: {author}")}\n'
-
-summary = '{if(desc|strip, "{label('log.summary',
- 'summary: {desc|firstline}')}\n")}'
-
-ldate = '{label("log.date",
- "date: {date|date}")}\n'
-
-extra = '{label("ui.debug log.extra",
- "extra: {key}={value|stringescape}")}\n'
-
-description = '{if(desc|strip, "{label('ui.note log.description',
- 'description:')}
- {label('ui.note log.description',
- '{desc|strip}')}\n\n")}'