[PATCH 5 of 5] patchbomb: use mimetextpatch from mailutil (#841)
Christian Ebert
blacktrash at gmx.net
Tue Feb 19 13:16:56 CST 2008
# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1203448370 -3600
# Node ID 3a9ff2758bb36c5faff713cbf1007ba6e5cd08d0
# Parent f33748dec3fa32e327982711be64a439d7b695e8
patchbomb: use mimetextpatch from mailutil (#841)
Fixes issue #841, 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
import mailutil
from mercurial import cmdutil, commands, hg, mail, ui, patch, util
@@ -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