Mercurial > hg-stable
changeset 45871:8357e0e81bb7
split: disable color while rendering template for use in commit message
Differential Revision: https://phab.mercurial-scm.org/D9322
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 13 Nov 2020 09:41:49 -0800 |
parents | c10683da6889 |
children | ec6ba70be853 |
files | hgext/split.py tests/test-split.t |
diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/split.py Thu Nov 12 17:06:45 2020 -0800 +++ b/hgext/split.py Fri Nov 13 09:41:49 2020 -0800 @@ -142,9 +142,14 @@ header = _( b'HG: Splitting %s. So far it has been split into:\n' ) % short(ctx.node()) - for c in committed: - summary = cmdutil.format_changeset_summary(ui, c, b'split') - header += _(b'HG: - %s\n') % summary + # We don't want color codes in the commit message template, so + # disable the label() template function while we render it. + with ui.configoverride( + {(b'templatealias', b'label(l,x)'): b"x"}, b'split' + ): + for c in committed: + summary = cmdutil.format_changeset_summary(ui, c, b'split') + header += _(b'HG: - %s\n') % summary header += _( b'HG: Write commit message for the next split changeset.\n' )
--- a/tests/test-split.t Thu Nov 12 17:06:45 2020 -0800 +++ b/tests/test-split.t Fri Nov 13 09:41:49 2020 -0800 @@ -1031,7 +1031,7 @@ (enter ? for help) [Ynesfdaq?]] [ ui.promptecho|a] EDITOR: HG: Splitting 6432c65c3078. So far it has been split into: - EDITOR: HG: - [rev|2] split2, modifying file2 + EDITOR: HG: - 2 split2, modifying file2 EDITOR: HG: Write commit message for the next split changeset. EDITOR: split1, modifying file1 EDITOR: