[PATCH 1 of 2 STABLE] histedit: end folding message with an LF
Patrick Mezard
patrick at mezard.eu
Wed Jul 25 09:36:19 CDT 2012
# HG changeset patch
# User Patrick Mezard <patrick at mezard.eu>
# Date 1343207391 -7200
# Branch stable
# Node ID c2f13180001f7c46eeb01968e2e957a0fb7bffea
# Parent ffc49100151b68c0bcd061b900d9993e9e1a0d7d
histedit: end folding message with an LF
This is convenient when running tests dumping the editor content, it
avoids the following output line to be mixed with histedit message.
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -310,7 +310,7 @@
newmessage = '\n***\n'.join(
[ctx.description()] +
[repo[r].description() for r in internalchanges] +
- [oldctx.description()])
+ [oldctx.description()]) + '\n'
# If the changesets are from the same author, keep it.
if ctx.user() == oldctx.user():
username = ctx.user()
diff --git a/tests/test-histedit-fold-non-commute.t b/tests/test-histedit-fold-non-commute.t
--- a/tests/test-histedit-fold-non-commute.t
+++ b/tests/test-histedit-fold-non-commute.t
@@ -91,6 +91,7 @@
does not commute with e
+
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
file e already exists
1 out of 1 hunks FAILED -- saving rejects to file e.rej
More information about the Mercurial-devel
mailing list