[PATCH 6 of 6] patchbomb: mime-encode clean utf-8 patches (issue814)

Christian Ebert blacktrash at gmx.net
Sat Jul 12 14:32:53 CDT 2008


# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1215891079 -3600
# Node ID 04ae47ccd0fa9ba1c2b00e088cf3e749cefccb56
# Parent  6448dca3a747274dd2fa4465fa4369c73d6a19cf
patchbomb: mime-encode clean utf-8 patches (issue814)

Fixes issue814, but only for utf.

diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py
--- a/hgext/patchbomb.py
+++ b/hgext/patchbomb.py
@@ -62,7 +62,7 @@
 That should be all. Now your patchbomb is on its way out.'''
 
 import os, errno, socket, tempfile, cStringIO
-import email.MIMEMultipart, email.MIMEText, email.MIMEBase
+import email.MIMEMultipart, email.MIMEBase
 import email.Utils, email.Encoders, email.Generator
 from mercurial import cmdutil, commands, hg, mail, patch, util
 from mercurial.i18n import _
@@ -179,7 +179,7 @@
             msg = email.MIMEMultipart.MIMEMultipart()
             if body:
                 msg.attach(mail.mimeencode(ui, body, _charsets))
-            p = email.MIMEText.MIMEText('\n'.join(patch), 'x-patch')
+            p = mail.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)
@@ -198,7 +198,7 @@
             msg.attach(p)
         else:
             body += '\n'.join(patch)
-            msg = email.MIMEText.MIMEText(body)
+            msg = mail.mimetextpatch(body)
 
         subj = desc[0].strip().rstrip('. ')
         if total == 1:


More information about the Mercurial-devel mailing list