Mercurial > public > mercurial-scm > hg
diff mercurial/logcmdutil.py @ 45765:ed84a4d48910
config: add a new [command-templates] section for templates defined by hg
The existing `[templates]` section lets the user define their own keys
and then refer to them on the command line with `-T`. There are many
cases where hg wants to use a user-defined template with a given name,
such as `ui.logtemplate` and `ui.mergemarkertemplate`. This patch
starts moving such configs in a common section by moving
`ui.logtemplate` to `command-templates.log` (with an alias from the
old name, of course).
Differential Revision: https://phab.mercurial-scm.org/D9245
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 23 Oct 2020 10:56:18 -0700 |
| parents | c7413ffe0402 |
| children | 1f7c077e0640 |
line wrap: on
line diff
--- a/mercurial/logcmdutil.py Mon Oct 26 10:08:22 2020 -0700 +++ b/mercurial/logcmdutil.py Fri Oct 23 10:56:18 2020 -0700 @@ -623,7 +623,7 @@ # ui settings if not tmpl and not style: # template are stronger than style - tmpl = ui.config(b'ui', b'logtemplate') + tmpl = ui.config(b'command-templates', b'log') if tmpl: return formatter.literal_templatespec(templater.unquotestring(tmpl)) else: @@ -656,7 +656,7 @@ Display format will be the first non-empty hit of: 1. option 'template' 2. option 'style' - 3. [ui] setting 'logtemplate' + 3. [command-templates] setting 'log' 4. [ui] setting 'style' If all of these values are either the unset or the empty string, regular display via changesetprinter() is done.