Mercurial > hg

changeset 10730:4d6bd7b8b6d8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: allow lines starting with '--- ' in patch messages
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 18 Mar 2010 19:26:56 +0100
parents 7a5931c5f2dc
children 71cf11f03b3d 5484f6e17984
files hgext/mq.py tests/test-mq-qimport
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/mq.py	Thu Mar 18 18:22:34 2010 +0100
+++ b/hgext/mq.py	Thu Mar 18 19:26:56 2010 +0100
@@ -96,13 +96,11 @@
 
         for line in file(pf):
             line = line.rstrip()
-            if line.startswith('diff --git'):
+            if (line.startswith('diff --git')
+                or (diffstart and line.startswith('+++ '))):
                 diffstart = 2
                 break
-            if diffstart:
-                if line.startswith('+++ '):
-                    diffstart = 2
-                break
+            diffstart = 0 # reset
             if line.startswith("--- "):
                 diffstart = 1
                 continue
--- a/tests/test-mq-qimport	Thu Mar 18 18:22:34 2010 +0100
+++ b/tests/test-mq-qimport	Thu Mar 18 19:26:56 2010 +0100
@@ -43,6 +43,7 @@
 First line of commit message.
 
 More text in commit message.
+--- confuse the diff detection
 
 diff --git a/x b/x
 new file mode 100644