##// END OF EJS Templates
patchbomb: fix From_ in the message's envelope...
Cédric Duval -
r9046:15471266 default
parent child Browse files
Show More
@@ -70,7 +70,7 b' that the patchbomb extension can automat'
70 directly from the commandline. See the [email] and [smtp] sections in
70 directly from the commandline. See the [email] and [smtp] sections in
71 hgrc(5) for details.'''
71 hgrc(5) for details.'''
72
72
73 import os, errno, socket, tempfile, cStringIO
73 import os, errno, socket, tempfile, cStringIO, time
74 import email.MIMEMultipart, email.MIMEBase
74 import email.MIMEMultipart, email.MIMEBase
75 import email.Utils, email.Encoders, email.Generator
75 import email.Utils, email.Encoders, email.Generator
76 from mercurial import cmdutil, commands, hg, mail, patch, util
76 from mercurial import cmdutil, commands, hg, mail, patch, util
@@ -446,7 +446,7 b' def patchbomb(ui, repo, *revs, **opts):'
446 ui.status(_('Writing '), subj, ' ...\n')
446 ui.status(_('Writing '), subj, ' ...\n')
447 fp = open(opts.get('mbox'), 'In-Reply-To' in m and 'ab+' or 'wb+')
447 fp = open(opts.get('mbox'), 'In-Reply-To' in m and 'ab+' or 'wb+')
448 generator = email.Generator.Generator(fp, mangle_from_=True)
448 generator = email.Generator.Generator(fp, mangle_from_=True)
449 date = util.datestr(start_time, '%a %b %d %H:%M:%S %Y')
449 date = time.ctime(start_time[0])
450 fp.write('From %s %s\n' % (sender_addr, date))
450 fp.write('From %s %s\n' % (sender_addr, date))
451 generator.flatten(m, 0)
451 generator.flatten(m, 0)
452 fp.write('\n\n')
452 fp.write('\n\n')
@@ -163,7 +163,7 b' This patch series consists of 1 patches.'
163
163
164
164
165 Writing [PATCH] charset=utf-8; content-transfer-encoding: base64 ...
165 Writing [PATCH] charset=utf-8; content-transfer-encoding: base64 ...
166 From quux Thu Jan 01 00:04:01 1970
166 From quux Thu Jan 1 00:04:01 1970
167 Content-Type: text/plain; charset="utf-8"
167 Content-Type: text/plain; charset="utf-8"
168 MIME-Version: 1.0
168 MIME-Version: 1.0
169 Content-Transfer-Encoding: base64
169 Content-Transfer-Encoding: base64
@@ -198,7 +198,7 b' This patch series consists of 1 patches.'
198
198
199
199
200 Writing [PATCH] charset=utf-8; content-transfer-encoding: quoted-printable ...
200 Writing [PATCH] charset=utf-8; content-transfer-encoding: quoted-printable ...
201 From quux Thu Jan 01 00:04:01 1970
201 From quux Thu Jan 1 00:04:01 1970
202 Content-Type: text/plain; charset="us-ascii"
202 Content-Type: text/plain; charset="us-ascii"
203 MIME-Version: 1.0
203 MIME-Version: 1.0
204 Content-Transfer-Encoding: quoted-printable
204 Content-Transfer-Encoding: quoted-printable
@@ -249,7 +249,7 b' This patch series consists of 1 patches.'
249
249
250 Writing [PATCH] charset=us-ascii; content-transfer-encoding: 8bit ...
250 Writing [PATCH] charset=us-ascii; content-transfer-encoding: 8bit ...
251 % md5sum of 8-bit output
251 % md5sum of 8-bit output
252 e61684fc0bcccba4204714be37951893 mboxfix
252 8ce4c019c17ca51a293c055382d76d67 mboxfix
253 % test diffstat for single patch
253 % test diffstat for single patch
254 This patch series consists of 1 patches.
254 This patch series consists of 1 patches.
255
255
General Comments 0
You need to be logged in to leave comments. Login now