[PATCH 6 of 6] patchbomb: use mimetextpatch from mailutil (#814)

Christian Ebert blacktrash at gmx.net
Sat Mar 8 10:01:54 CST 2008


# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1204991702 -3600
# Node ID 1203762825975bb5fa472c5cf5c74b1e6c7d2525
# Parent  6dc138f7bb0debcd50ebd156ac5880f2facc3cda
patchbomb: use mimetextpatch from mailutil (#814)

Fixes issue #814, but only for utf.

diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py
--- a/hgext/patchbomb.py
+++ b/hgext/patchbomb.py
@@ -65,7 +65,7 @@
 # That should be all.  Now your patchbomb is on its way out.
 
 import os, errno, socket, tempfile
-import email.MIMEMultipart, email.MIMEText, email.MIMEBase
+import email.MIMEMultipart, email.MIMEBase
 import email.Utils, email.Encoders
 from mercurial import cmdutil, commands, hg, mail, patch, util
 from mercurial.i18n import _
@@ -183,7 +183,7 @@
             msg = email.MIMEMultipart.MIMEMultipart()
             if body:
                 msg.attach(mconv.mimeencode(body))
-            p = email.MIMEText.MIMEText('\n'.join(patch), 'x-patch')
+            p = mconv.mimetextpatch('\n'.join(patch), 'x-patch')
             binnode = bin(node)
             # if node is mq patch, it will have patch file name as tag
             patchname = [t for t in repo.nodetags(binnode)
@@ -201,8 +201,8 @@
             p['Content-Disposition'] = disposition + '; filename=' + patchname
             msg.attach(p)
         else:
-            body += '\n'.join(patch)
-            msg = email.MIMEText.MIMEText(body)
+            body = '\n'.join(patch)
+            msg = mconv.mimetextpatch(body)
 
         subj = desc[0].strip().rstrip('. ')
         if total == 1:


More information about the Mercurial-devel mailing list