[Bug 3672] New: qimport gets confused with mail headers inside commit message

[bugzilla-daemon at bz.selenic.com]

http://bz.selenic.com/show_bug.cgi?id=3672

          Priority: normal
            Bug ID: 3672
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: qimport gets confused with mail headers inside commit
                    message
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: idankk86 at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.4-rc
         Component: Mercurial
           Product: Mercurial

For example, adding a 'from:' to the commit message confuses mq's patch parser:

diff --git a/tests/test-mq-qimport.t b/tests/test-mq-qimport.t
--- a/tests/test-mq-qimport.t
+++ b/tests/test-mq-qimport.t
@@ -59,6 +59,7 @@
   > First line of commit message.
   >
   > More text in commit message.
+  > from: username in commit message
   > --- confuse the diff detection
   >
   > diff --git a/x b/x


idan at idan-Ubuntu ~/dev/hg/tests $ ./run-tests.py -l test-mq-qimport.t

--- /home/idan/dev/hg/tests/test-mq-qimport.t
+++ /home/idan/dev/hg/tests/test-mq-qimport.t.err
@@ -78,15 +78,17 @@
 hg tip -v

   $ hg tip -v
-  changeset:   0:1a706973a7d8
+  changeset:   0:c7131795457c
   tag:         email
   tag:         qbase
   tag:         qtip
   tag:         tip
-  user:        Username in patch <test at example.net>
+  user:        username in commit message
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       x
   description:
+  [PATCH] Message in email
+
   First line of commit message.

   More text in commit message.

ERROR: /home/idan/dev/hg/tests/test-mq-qimport.t output changed
!
Failed test-mq-qimport.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.

plain import seems to get this right.

-- 
You are receiving this mail because:
You are on the CC list for the bug.