# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1374971474 18000
# Node ID 9e8298a324accd509cd8df1915cd98dfbdcdb512
# Parent  f84036df71ad4abe0e1200aaeec159bd1506472a
import: cut commit messages at --- unconditionally (issue2148)

We used to do this based on X-mailer: mentioning git, but git doesn't
put X-mailer in its git-format-patch output.

diff -r f84036df71ad -r 9e8298a324ac mercurial/patch.py
--- a/mercurial/patch.py	Sat Jul 27 21:16:12 2013 +0200
+++ b/mercurial/patch.py	Sat Jul 27 19:31:14 2013 -0500
@@ -176,7 +176,6 @@
             # Not an email, restore parsed headers if any
             subject = '\n'.join(': '.join(h) for h in msg.items()) + '\n'
 
-        gitsendmail = 'git-send-email' in msg.get('X-Mailer', '')
         # should try to parse msg['Date']
         date = None
         nodeid = None
@@ -233,7 +232,7 @@
                             parents.append(line[9:].lstrip())
                         elif not line.startswith("# "):
                             hgpatchheader = False
-                    elif line == '---' and gitsendmail:
+                    elif line == '---':
                         ignoretext = True
                     if not hgpatchheader and not ignoretext:
                         cfp.write(line)
diff -r f84036df71ad -r 9e8298a324ac tests/test-import.t
--- a/tests/test-import.t	Sat Jul 27 21:16:12 2013 +0200
+++ b/tests/test-import.t	Sat Jul 27 19:31:14 2013 -0500
@@ -345,7 +345,6 @@
   email patch
   
   next line
-  ---
   $ rm -r b