Mercurial > hg > crecord

changeset 84:a3518e68d5e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- strip lines beginning with 'HG:' from commit message when the (m)odify commit message command has been used. Fixes issue #22.
author Mark Edgington <edgimar@gmail.com>
date Thu, 21 Jul 2011 17:13:00 +0200
parents 4af0c20daad6
children 4748bd485ddf
files crecord/chunk_selector.py
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/crecord/chunk_selector.py
+++ b/crecord/chunk_selector.py
@@ -922,6 +922,7 @@
         "Create a temporary commit message editing window on the screen."
         if self.commentText == "":
             self.commentText = textwrap.dedent("""
+            
             HG: Enter/resume commit message.  Lines beginning with 'HG:' are removed.
             HG: You can save this message, and edit it again later before committing.
             HG: After exiting the editor, you will return to the crecord patch view.
@@ -1061,4 +1062,10 @@
                 self.commitMessageWindow()
 
         if self.commentText != "":
-            opts['message'] = self.commentText
+            # strip out all lines beginning with 'HG:'
+            self.commentText = re.sub("(?m)^HG:.*(\n|$)", "", self.commentText)
+            # remove lines with whitespace (for test below)
+            whitespaceRemoved = re.sub("(?m)^\s.*(\n|$)", "", self.commentText)
+            # if there's anything left...
+            if whitespaceRemoved != "":
+                opts['message'] = self.commentText