histedit: end folding message with an LF stable
authorPatrick Mezard <patrick@mezard.eu>
Wed, 25 Jul 2012 11:09:51 +0200
branchstable
changeset 17241 c2f13180001f
parent 17240 ffc49100151b
child 17242 336121088ef1
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.
hgext/histedit.py
tests/test-histedit-fold-non-commute.t
--- a/hgext/histedit.py	Tue Jul 24 12:36:40 2012 -0500
+++ b/hgext/histedit.py	Wed Jul 25 11:09:51 2012 +0200
@@ -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()
--- a/tests/test-histedit-fold-non-commute.t	Tue Jul 24 12:36:40 2012 -0500
+++ b/tests/test-histedit-fold-non-commute.t	Wed Jul 25 11:09:51 2012 +0200
@@ -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