This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9322

split: disable color while rendering template for use in commit message
ClosedPublic

Authored by martinvonz on Nov 16 2020, 1:23 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8357e0e81bb7: split: disable color while rendering template for use in commit message

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Nov 16 2020, 1:23 PM
martinvonz added a commit: rHG8357e0e81bb7: split: disable color while rendering template for use in commit message.Nov 18 2020, 6:06 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8357e0e81bb7: split: disable color while rendering template for use in commit message (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/split.py (11 lines)
Mtests/test-split.t (2 lines)

Diff 23506

hgext/split.py

return any((st.modified, st.added, st.removed, st.deleted)) return any((st.modified, st.added, st.removed, st.deleted))
# Main split loop # Main split loop
while incomplete(repo): while incomplete(repo):
if committed: if committed:
header = _( header = _(
b'HG: Splitting %s. So far it has been split into:\n' b'HG: Splitting %s. So far it has been split into:\n'
) % short(ctx.node()) ) % short(ctx.node())
# 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: for c in committed:
summary = cmdutil.format_changeset_summary(ui, c, b'split') summary = cmdutil.format_changeset_summary(ui, c, b'split')
header += _(b'HG: - %s\n') % summary header += _(b'HG: - %s\n') % summary
header += _( header += _(
b'HG: Write commit message for the next split changeset.\n' b'HG: Write commit message for the next split changeset.\n'
) )
else: else:
header = _( header = _(
b'HG: Splitting %s. Write commit message for the ' b'HG: Splitting %s. Write commit message for the '
b'first split changeset.\n' b'first split changeset.\n'
) % short(ctx.node()) ) % short(ctx.node())

tests/test-split.t

EDITOR: HG: changed file1 EDITOR: HG: changed file1
[ ui.status|created new head] [ ui.status|created new head]
[diff.diffline|diff --git a/file2 b/file2] [diff.diffline|diff --git a/file2 b/file2]
1 hunks, 1 lines changed 1 hunks, 1 lines changed
[ ui.prompt|examine changes to 'file2'? [ ui.prompt|examine changes to 'file2'?
(enter ? for help) [Ynesfdaq?]] [ ui.promptecho|a] (enter ? for help) [Ynesfdaq?]] [ ui.promptecho|a]
EDITOR: HG: Splitting 6432c65c3078. So far it has been split into: 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: HG: Write commit message for the next split changeset.
EDITOR: split1, modifying file1 EDITOR: split1, modifying file1
EDITOR: EDITOR:
EDITOR: EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
EDITOR: HG: Leave message empty to abort commit. EDITOR: HG: Leave message empty to abort commit.
EDITOR: HG: -- EDITOR: HG: --
EDITOR: HG: user: test EDITOR: HG: user: test
EDITOR: HG: branch 'default' EDITOR: HG: branch 'default'
EDITOR: HG: changed file2 EDITOR: HG: changed file2
[ ui.warning|transaction abort!] [ ui.warning|transaction abort!]
[ ui.warning|rollback completed] [ ui.warning|rollback completed]
[ ui.error|abort: empty commit message] [ ui.error|abort: empty commit message]
[10] [10]