patchbomb.py
561 lines
| 20.9 KiB
| text/x-python
|
PythonLexer
/ hgext / patchbomb.py
Martin Geisler
|
r8252 | # patchbomb.py - sending Mercurial changesets as patch emails | ||
# | ||||
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others | ||||
# | ||||
# This software may be used and distributed according to the terms of the | ||||
Matt Mackall
|
r10263 | # GNU General Public License version 2 or any later version. | ||
Martin Geisler
|
r8252 | |||
Dirkjan Ochtman
|
r8935 | '''command to send changesets as (a series of) patch emails | ||
Dirkjan Ochtman
|
r6666 | |||
Martin Geisler
|
r7997 | The series is started off with a "[PATCH 0 of N]" introduction, which | ||
describes the series as a whole. | ||||
Dirkjan Ochtman
|
r6666 | |||
Martin Geisler
|
r9269 | Each patch email has a Subject line of "[PATCH M of N] ...", using the | ||
first line of the changeset description as the subject text. The | ||||
message contains two or three body parts: | ||||
Dirkjan Ochtman
|
r6666 | |||
Martin Geisler
|
r9300 | - The changeset description. | ||
- [Optional] The result of running diffstat on the patch. | ||||
Martin Geisler
|
r10973 | - The patch itself, as generated by :hg:`export`. | ||
Dirkjan Ochtman
|
r6666 | |||
Martin Geisler
|
r9269 | Each message refers to the first in the series using the In-Reply-To | ||
and References headers, so they will show up as a sequence in threaded | ||||
mail and news readers, and in mail archives. | ||||
Dirkjan Ochtman
|
r6666 | |||
Martin Geisler
|
r13838 | To configure other defaults, add a section like this to your | ||
configuration file:: | ||||
Dirkjan Ochtman
|
r6666 | |||
[email] | ||||
from = My Name <my@email> | ||||
to = recipient1, recipient2, ... | ||||
cc = cc1, cc2, ... | ||||
bcc = bcc1, bcc2, ... | ||||
Cédric Duval
|
r11150 | reply-to = address1, address2, ... | ||
Dirkjan Ochtman
|
r6666 | |||
Christian Ebert
|
r10284 | Use ``[patchbomb]`` as configuration section name if you need to | ||
override global ``[email]`` address settings. | ||||
Martin Geisler
|
r10973 | Then you can use the :hg:`email` command to mail a series of | ||
changesets as a patchbomb. | ||||
Dirkjan Ochtman
|
r6666 | |||
Martin Geisler
|
r9269 | You can also either configure the method option in the email section | ||
to be a sendmail compatible mailer or fill out the [smtp] section so | ||||
that the patchbomb extension can automatically send patchbombs | ||||
directly from the commandline. See the [email] and [smtp] sections in | ||||
hgrc(5) for details. | ||||
Martin Geisler
|
r9071 | ''' | ||
Vadim Gelfer
|
r1669 | |||
Mads Kiilerich
|
r15560 | import os, errno, socket, tempfile, cStringIO | ||
Christian Ebert
|
r7192 | import email.MIMEMultipart, email.MIMEBase | ||
Benoit Boissinot
|
r6447 | import email.Utils, email.Encoders, email.Generator | ||
Patrick Mezard
|
r17178 | from mercurial import cmdutil, commands, hg, mail, patch, util | ||
Matt Mackall
|
r14319 | from mercurial import scmutil | ||
Matt Mackall
|
r3891 | from mercurial.i18n import _ | ||
Joel Rosdahl
|
r6211 | from mercurial.node import bin | ||
Vadim Gelfer
|
r1669 | |||
Adrian Buehlmann
|
r14309 | cmdtable = {} | ||
command = cmdutil.command(cmdtable) | ||||
Augie Fackler
|
r16743 | testedwith = 'internal' | ||
Adrian Buehlmann
|
r14309 | |||
Alexander Solovyov
|
r9648 | def prompt(ui, prompt, default=None, rest=':'): | ||
Dirkjan Ochtman
|
r7354 | if default: | ||
prompt += ' [%s]' % default | ||||
Matt Mackall
|
r15166 | return ui.prompt(prompt + rest, default) | ||
Dirkjan Ochtman
|
r7354 | |||
Greg Ward
|
r15164 | def introwanted(opts, number): | ||
'''is an introductory message apparently wanted?''' | ||||
Cédric Duval
|
r10734 | return number > 1 or opts.get('intro') or opts.get('desc') | ||
Greg Ward
|
r15164 | def makepatch(ui, repo, patchlines, opts, _charsets, idx, total, numbered, | ||
Martin Geisler
|
r12199 | patchname=None): | ||
Dirkjan Ochtman
|
r7354 | |||
desc = [] | ||||
node = None | ||||
body = '' | ||||
Martin Geisler
|
r12199 | for line in patchlines: | ||
Dirkjan Ochtman
|
r7354 | if line.startswith('#'): | ||
if line.startswith('# Node ID'): | ||||
node = line.split()[-1] | ||||
continue | ||||
if line.startswith('diff -r') or line.startswith('diff --git'): | ||||
break | ||||
desc.append(line) | ||||
if not patchname and not node: | ||||
raise ValueError | ||||
Angel Ezquerra
|
r16307 | if opts.get('attach') and not opts.get('body'): | ||
Dirkjan Ochtman
|
r7354 | body = ('\n'.join(desc[1:]).strip() or | ||
'Patch subject is complete summary.') | ||||
body += '\n\n\n' | ||||
if opts.get('plain'): | ||||
Martin Geisler
|
r12199 | while patchlines and patchlines[0].startswith('# '): | ||
patchlines.pop(0) | ||||
if patchlines: | ||||
patchlines.pop(0) | ||||
while patchlines and not patchlines[0].strip(): | ||||
patchlines.pop(0) | ||||
Dirkjan Ochtman
|
r7354 | |||
Idan Kamara
|
r14397 | ds = patch.diffstat(patchlines, git=opts.get('git')) | ||
Dirkjan Ochtman
|
r7354 | if opts.get('diffstat'): | ||
Christian Ebert
|
r12200 | body += ds + '\n\n' | ||
Dirkjan Ochtman
|
r7354 | |||
Angel Ezquerra
|
r16307 | addattachment = opts.get('attach') or opts.get('inline') | ||
if not addattachment or opts.get('body'): | ||||
body += '\n'.join(patchlines) | ||||
if addattachment: | ||||
Dirkjan Ochtman
|
r7354 | msg = email.MIMEMultipart.MIMEMultipart() | ||
if body: | ||||
msg.attach(mail.mimeencode(ui, body, _charsets, opts.get('test'))) | ||||
Brodie Rao
|
r16683 | p = mail.mimetextpatch('\n'.join(patchlines), 'x-patch', | ||
opts.get('test')) | ||||
Dirkjan Ochtman
|
r7354 | binnode = bin(node) | ||
timeless
|
r8761 | # if node is mq patch, it will have the patch file's name as a tag | ||
Dirkjan Ochtman
|
r7354 | if not patchname: | ||
patchtags = [t for t in repo.nodetags(binnode) | ||||
if t.endswith('.patch') or t.endswith('.diff')] | ||||
if patchtags: | ||||
patchname = patchtags[0] | ||||
elif total > 1: | ||||
Matt Mackall
|
r14290 | patchname = cmdutil.makefilename(repo, '%b-%n.patch', | ||
Brodie Rao
|
r16683 | binnode, seqno=idx, | ||
total=total) | ||||
Dirkjan Ochtman
|
r7354 | else: | ||
Matt Mackall
|
r14290 | patchname = cmdutil.makefilename(repo, '%b.patch', binnode) | ||
Dirkjan Ochtman
|
r7354 | disposition = 'inline' | ||
if opts.get('attach'): | ||||
disposition = 'attachment' | ||||
p['Content-Disposition'] = disposition + '; filename=' + patchname | ||||
msg.attach(p) | ||||
else: | ||||
msg = mail.mimetextpatch(body, display=opts.get('test')) | ||||
Nicolas Dumazet
|
r9346 | flag = ' '.join(opts.get('flag')) | ||
if flag: | ||||
flag = ' ' + flag | ||||
Dirkjan Ochtman
|
r7354 | subj = desc[0].strip().rstrip('. ') | ||
Greg Ward
|
r15164 | if not numbered: | ||
Nicolas Dumazet
|
r9346 | subj = '[PATCH%s] %s' % (flag, opts.get('subject') or subj) | ||
Dirkjan Ochtman
|
r7354 | else: | ||
tlen = len(str(total)) | ||||
Nicolas Dumazet
|
r9346 | subj = '[PATCH %0*d of %d%s] %s' % (tlen, idx, total, flag, subj) | ||
Dirkjan Ochtman
|
r7354 | msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get('test')) | ||
msg['X-Mercurial-Node'] = node | ||||
Christian Ebert
|
r12200 | return msg, subj, ds | ||
Dirkjan Ochtman
|
r7354 | |||
Adrian Buehlmann
|
r14309 | emailopts = [ | ||
Angel Ezquerra
|
r16307 | ('', 'body', None, _('send patches as inline message text (default)')), | ||
Adrian Buehlmann
|
r14309 | ('a', 'attach', None, _('send patches as attachments')), | ||
('i', 'inline', None, _('send patches as inline attachments')), | ||||
('', 'bcc', [], _('email addresses of blind carbon copy recipients')), | ||||
('c', 'cc', [], _('email addresses of copy recipients')), | ||||
('', 'confirm', None, _('ask for confirmation before sending')), | ||||
('d', 'diffstat', None, _('add diffstat output to messages')), | ||||
('', 'date', '', _('use the given date as the sending date')), | ||||
('', 'desc', '', _('use the given file as the series description')), | ||||
('f', 'from', '', _('email address of sender')), | ||||
('n', 'test', None, _('print messages that would be sent')), | ||||
('m', 'mbox', '', _('write messages to mbox file instead of sending them')), | ||||
('', 'reply-to', [], _('email addresses replies should be sent to')), | ||||
('s', 'subject', '', _('subject of first message (intro or single patch)')), | ||||
('', 'in-reply-to', '', _('message identifier to reply to')), | ||||
('', 'flag', [], _('flags to add in subject prefixes')), | ||||
('t', 'to', [], _('email addresses of recipients'))] | ||||
@command('email', | ||||
[('g', 'git', None, _('use git extended diff format')), | ||||
('', 'plain', None, _('omit hg patch header')), | ||||
('o', 'outgoing', None, | ||||
_('send changes not found in the target repository')), | ||||
('b', 'bundle', None, _('send changes not in target as a binary bundle')), | ||||
('', 'bundlename', 'bundle', | ||||
_('name of the bundle attachment file'), _('NAME')), | ||||
('r', 'rev', [], _('a revision to send'), _('REV')), | ||||
('', 'force', None, _('run even when remote repository is unrelated ' | ||||
'(with -b/--bundle)')), | ||||
('', 'base', [], _('a base changeset to specify instead of a destination ' | ||||
'(with -b/--bundle)'), _('REV')), | ||||
('', 'intro', None, _('send an introduction email for a single patch')), | ||||
] + emailopts + commands.remoteopts, | ||||
_('hg email [OPTION]... [DEST]...')) | ||||
Vadim Gelfer
|
r1669 | def patchbomb(ui, repo, *revs, **opts): | ||
John Goerzen
|
r4283 | '''send changesets by email | ||
Vadim Gelfer
|
r1669 | |||
Martin Geisler
|
r11193 | By default, diffs are sent in the format generated by | ||
:hg:`export`, one per message. The series starts with a "[PATCH 0 | ||||
of N]" introduction, which describes the series as a whole. | ||||
Vadim Gelfer
|
r1672 | |||
Martin Geisler
|
r9269 | Each patch email has a Subject line of "[PATCH M of N] ...", using | ||
the first line of the changeset description as the subject text. | ||||
The message contains two or three parts. First, the changeset | ||||
timeless
|
r12749 | description. | ||
With the -d/--diffstat option, if the diffstat program is | ||||
installed, the result of running diffstat on the patch is inserted. | ||||
Finally, the patch itself, as generated by :hg:`export`. | ||||
Julian Cowley
|
r17880 | With the -d/--diffstat or --confirm options, you will be presented | ||
timeless
|
r12749 | with a final summary of all messages and asked for confirmation before | ||
the messages are sent. | ||||
Brendan Cully
|
r4262 | |||
Martin Geisler
|
r9269 | By default the patch is included as text in the email body for | ||
easy reviewing. Using the -a/--attach option will instead create | ||||
an attachment for the patch. With -i/--inline an inline attachment | ||||
Angel Ezquerra
|
r16307 | will be created. You can include a patch both as text in the email | ||
body and as a regular or an inline attachment by combining the | ||||
-a/--attach or -i/--inline with the --body option. | ||||
Martin Geisler
|
r8472 | |||
Martin Geisler
|
r9269 | With -o/--outgoing, emails will be generated for patches not found | ||
in the destination repository (or only those which are ancestors | ||||
of the specified revisions if any are provided) | ||||
John Goerzen
|
r4280 | |||
Martin Geisler
|
r9269 | With -b/--bundle, changesets are selected as for --outgoing, but a | ||
single email containing a binary Mercurial bundle as an attachment | ||||
will be sent. | ||||
John Goerzen
|
r4280 | |||
timeless
|
r12749 | With -m/--mbox, instead of previewing each patchbomb message in a | ||
pager or sending the messages directly, it will create a UNIX | ||||
mailbox file with the patch emails. This mailbox file can be | ||||
previewed with any mail user agent which supports UNIX mbox | ||||
files. | ||||
With -n/--test, all steps will run, but mail will not be sent. | ||||
You will be prompted for an email recipient address, a subject and | ||||
an introductory message describing the patches of your patchbomb. | ||||
Then when all is done, patchbomb messages are displayed. If the | ||||
PAGER environment variable is set, your pager will be fired up once | ||||
for each patchbomb message, so you can verify everything is alright. | ||||
Nicolas Dumazet
|
r13198 | In case email sending fails, you will find a backup of your series | ||
introductory message in ``.hg/last-email.txt``. | ||||
Christian Ebert
|
r9289 | Examples:: | ||
John Goerzen
|
r4280 | |||
Christian Ebert
|
r9289 | hg email -r 3000 # send patch 3000 only | ||
hg email -r 3000 -r 3001 # send patches 3000 and 3001 | ||||
hg email -r 3000:3005 # send patches 3000 through 3005 | ||||
hg email 3000 # send patch 3000 (deprecated) | ||||
John Goerzen
|
r4280 | |||
Christian Ebert
|
r9289 | hg email -o # send all patches not in default | ||
hg email -o DEST # send all patches not in DEST | ||||
hg email -o -r 3000 # send all ancestors of 3000 not in default | ||||
hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST | ||||
John Goerzen
|
r4280 | |||
Christian Ebert
|
r9289 | hg email -b # send bundle of all patches not in default | ||
hg email -b DEST # send bundle of all patches not in DEST | ||||
hg email -b -r 3000 # bundle of all ancestors of 3000 not in default | ||||
hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST | ||||
John Goerzen
|
r4280 | |||
timeless
|
r12749 | hg email -o -m mbox && # generate an mbox file... | ||
mutt -R -f mbox # ... and view it with mutt | ||||
hg email -o -m mbox && # generate an mbox file ... | ||||
Martin Geisler
|
r12839 | formail -s sendmail \\ # ... and use formail to send from the mbox | ||
timeless
|
r12749 | -bm -t < mbox # ... using sendmail | ||
Martin Geisler
|
r9269 | Before using this command, you will need to enable email in your | ||
hgrc. See the [email] section in hgrc(5) for details. | ||||
Brendan Cully
|
r4262 | ''' | ||
Christian Ebert
|
r7115 | _charsets = mail._charsets(ui) | ||
Christian Ebert
|
r11413 | bundle = opts.get('bundle') | ||
date = opts.get('date') | ||||
mbox = opts.get('mbox') | ||||
outgoing = opts.get('outgoing') | ||||
rev = opts.get('rev') | ||||
# internal option used by pbranches | ||||
patches = opts.get('patches') | ||||
def getoutgoing(dest, revs): | ||||
Brendan Cully
|
r4262 | '''Return the revisions present locally but not in dest''' | ||
Patrick Mezard
|
r17178 | url = ui.expandpath(dest or 'default-push', dest or 'default') | ||
url = hg.parseurl(url)[0] | ||||
ui.status(_('comparing with %s\n') % util.hidepassword(url)) | ||||
revs = [r for r in scmutil.revrange(repo, revs) if r >= 0] | ||||
if not revs: | ||||
revs = [len(repo) - 1] | ||||
revs = repo.revs('outgoing(%s) and ::%ld', dest or '', revs) | ||||
if not revs: | ||||
Brendan Cully
|
r4262 | ui.status(_("no changes found\n")) | ||
return [] | ||||
Patrick Mezard
|
r17178 | return [str(r) for r in revs] | ||
Brendan Cully
|
r4262 | |||
Benoit Boissinot
|
r7615 | def getpatches(revs): | ||
Matt Mackall
|
r14319 | for r in scmutil.revrange(repo, revs): | ||
Benoit Boissinot
|
r7615 | output = cStringIO.StringIO() | ||
Benoit Boissinot
|
r10611 | cmdutil.export(repo, [r], fp=output, | ||
Peter Arrenbrecht
|
r7874 | opts=patch.diffopts(ui, opts)) | ||
Benoit Boissinot
|
r7615 | yield output.getvalue().split('\n') | ||
John Goerzen
|
r4279 | def getbundle(dest): | ||
John Goerzen
|
r4278 | tmpdir = tempfile.mkdtemp(prefix='hg-email-bundle-') | ||
tmpfn = os.path.join(tmpdir, 'bundle') | ||||
try: | ||||
John Goerzen
|
r4279 | commands.bundle(ui, repo, tmpfn, dest, **opts) | ||
Dan Villiom Podlaski Christiansen
|
r13400 | fp = open(tmpfn, 'rb') | ||
data = fp.read() | ||||
fp.close() | ||||
return data | ||||
John Goerzen
|
r4278 | finally: | ||
try: | ||||
os.unlink(tmpfn) | ||||
Brodie Rao
|
r16688 | except OSError: | ||
John Goerzen
|
r4278 | pass | ||
os.rmdir(tmpdir) | ||||
Christian Ebert
|
r11413 | if not (opts.get('test') or mbox): | ||
Christian Ebert
|
r5472 | # really sending | ||
Bryan O'Sullivan
|
r4489 | mail.validateconfig(ui) | ||
Christian Ebert
|
r11413 | if not (revs or rev or outgoing or bundle or patches): | ||
Bryan O'Sullivan
|
r4493 | raise util.Abort(_('specify at least one changeset with -r or -o')) | ||
Christian Ebert
|
r11413 | if outgoing and bundle: | ||
Christian Ebert
|
r5746 | raise util.Abort(_("--outgoing mode always on with --bundle;" | ||
" do not re-specify --outgoing")) | ||||
John Goerzen
|
r4278 | |||
Christian Ebert
|
r11413 | if outgoing or bundle: | ||
Brendan Cully
|
r4262 | if len(revs) > 1: | ||
raise util.Abort(_("too many destinations")) | ||||
dest = revs and revs[0] or None | ||||
revs = [] | ||||
Christian Ebert
|
r11413 | if rev: | ||
Brendan Cully
|
r4262 | if revs: | ||
raise util.Abort(_('use only one form to specify the revision')) | ||||
Christian Ebert
|
r11413 | revs = rev | ||
Brendan Cully
|
r4262 | |||
Christian Ebert
|
r11413 | if outgoing: | ||
revs = getoutgoing(dest, rev) | ||||
if bundle: | ||||
John Goerzen
|
r4279 | opts['revs'] = revs | ||
Brendan Cully
|
r4262 | |||
# start | ||||
Christian Ebert
|
r11413 | if date: | ||
start_time = util.parsedate(date) | ||||
Bryan O'Sullivan
|
r4566 | else: | ||
start_time = util.makedate() | ||||
Vadim Gelfer
|
r1669 | |||
def genmsgid(id): | ||||
Christian Ebert
|
r4027 | return '<%s.%s@%s>' % (id[:20], int(start_time[0]), socket.getfqdn()) | ||
Vadim Gelfer
|
r1669 | |||
Patrick Mezard
|
r5753 | def getdescription(body, sender): | ||
Christian Ebert
|
r5818 | if opts.get('desc'): | ||
body = open(opts.get('desc')).read() | ||||
Patrick Mezard
|
r5753 | else: | ||
ui.write(_('\nWrite the introductory message for the ' | ||||
'patch series.\n\n')) | ||||
body = ui.edit(body, sender) | ||||
Greg Ward
|
r15164 | # Save series description in case sendmail fails | ||
Nicolas Dumazet
|
r13198 | msgfile = repo.opener('last-email.txt', 'wb') | ||
msgfile.write(body) | ||||
msgfile.close() | ||||
Patrick Mezard
|
r5753 | return body | ||
Peter Arrenbrecht
|
r7353 | def getpatchmsgs(patches, patchnames=None): | ||
John Goerzen
|
r4278 | msgs = [] | ||
Vadim Gelfer
|
r1669 | |||
Martin Geisler
|
r16931 | ui.write(_('this patch series consists of %d patches.\n\n') | ||
Christian Ebert
|
r5746 | % len(patches)) | ||
John Goerzen
|
r4278 | |||
Greg Ward
|
r15164 | # build the intro message, or skip it if the user declines | ||
if introwanted(opts, len(patches)): | ||||
msg = makeintro(patches) | ||||
if msg: | ||||
msgs.append(msg) | ||||
# are we going to send more than one message? | ||||
numbered = len(msgs) + len(patches) > 1 | ||||
# now generate the actual patch messages | ||||
Peter Arrenbrecht
|
r7353 | name = None | ||
Benoit Boissinot
|
r7616 | for i, p in enumerate(patches): | ||
Peter Arrenbrecht
|
r7353 | if patchnames: | ||
name = patchnames[i] | ||||
Dirkjan Ochtman
|
r7354 | msg = makepatch(ui, repo, p, opts, _charsets, i + 1, | ||
Greg Ward
|
r15164 | len(patches), numbered, name) | ||
Dirkjan Ochtman
|
r7354 | msgs.append(msg) | ||
John Goerzen
|
r4278 | |||
Greg Ward
|
r15164 | return msgs | ||
def makeintro(patches): | ||||
tlen = len(str(len(patches))) | ||||
Vadim Gelfer
|
r1669 | |||
Greg Ward
|
r15164 | flag = opts.get('flag') or '' | ||
if flag: | ||||
flag = ' ' + ' '.join(flag) | ||||
prefix = '[PATCH %0*d of %d%s]' % (tlen, 0, len(patches), flag) | ||||
subj = (opts.get('subject') or | ||||
Matt Mackall
|
r16233 | prompt(ui, '(optional) Subject: ', rest=prefix, default='')) | ||
Greg Ward
|
r15164 | if not subj: | ||
return None # skip intro if the user doesn't bother | ||||
Vadim Gelfer
|
r1669 | |||
Greg Ward
|
r15164 | subj = prefix + ' ' + subj | ||
John Goerzen
|
r4278 | |||
Greg Ward
|
r15164 | body = '' | ||
if opts.get('diffstat'): | ||||
# generate a cumulative diffstat of the whole patch series | ||||
diffstat = patch.diffstat(sum(patches, [])) | ||||
body = '\n' + diffstat | ||||
else: | ||||
diffstat = None | ||||
Vadim Gelfer
|
r1669 | |||
Greg Ward
|
r15164 | body = getdescription(body, sender) | ||
msg = mail.mimeencode(ui, body, _charsets, opts.get('test')) | ||||
msg['Subject'] = mail.headencode(ui, subj, _charsets, | ||||
opts.get('test')) | ||||
return (msg, subj, diffstat) | ||||
Christian Ebert
|
r2704 | |||
John Goerzen
|
r4278 | def getbundlemsgs(bundle): | ||
Christian Ebert
|
r5818 | subj = (opts.get('subject') | ||
Dirkjan Ochtman
|
r7354 | or prompt(ui, 'Subject:', 'A bundle for your repository')) | ||
Vadim Gelfer
|
r1669 | |||
Patrick Mezard
|
r5753 | body = getdescription('', sender) | ||
John Goerzen
|
r4278 | msg = email.MIMEMultipart.MIMEMultipart() | ||
if body: | ||||
Christian Ebert
|
r7115 | msg.attach(mail.mimeencode(ui, body, _charsets, opts.get('test'))) | ||
John Goerzen
|
r4278 | datapart = email.MIMEBase.MIMEBase('application', 'x-mercurial-bundle') | ||
datapart.set_payload(bundle) | ||||
John Mulligan
|
r7889 | bundlename = '%s.hg' % opts.get('bundlename', 'bundle') | ||
John Goerzen
|
r4284 | datapart.add_header('Content-Disposition', 'attachment', | ||
John Mulligan
|
r7889 | filename=bundlename) | ||
John Goerzen
|
r4278 | email.Encoders.encode_base64(datapart) | ||
msg.attach(datapart) | ||||
Christian Ebert
|
r7115 | msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get('test')) | ||
Christian Ebert
|
r12200 | return [(msg, subj, None)] | ||
Vadim Gelfer
|
r1669 | |||
Christian Ebert
|
r5818 | sender = (opts.get('from') or ui.config('email', 'from') or | ||
Vadim Gelfer
|
r2198 | ui.config('patchbomb', 'from') or | ||
Dirkjan Ochtman
|
r7354 | prompt(ui, 'From', ui.username())) | ||
Vadim Gelfer
|
r1669 | |||
Peter Arrenbrecht
|
r7353 | if patches: | ||
msgs = getpatchmsgs(patches, opts.get('patchnames')) | ||||
Christian Ebert
|
r11413 | elif bundle: | ||
John Goerzen
|
r4279 | msgs = getbundlemsgs(getbundle(dest)) | ||
John Goerzen
|
r4278 | else: | ||
Benoit Boissinot
|
r7615 | msgs = getpatchmsgs(list(getpatches(revs))) | ||
Vadim Gelfer
|
r1669 | |||
Christian Ebert
|
r12200 | showaddrs = [] | ||
Greg Ward
|
r15162 | def getaddrs(header, ask=False, default=None): | ||
configkey = header.lower() | ||||
opt = header.replace('-', '_').lower() | ||||
addrs = opts.get(opt) | ||||
Cédric Duval
|
r11150 | if addrs: | ||
Greg Ward
|
r15162 | showaddrs.append('%s: %s' % (header, ', '.join(addrs))) | ||
Christian Ebert
|
r12264 | return mail.addrlistencode(ui, addrs, _charsets, opts.get('test')) | ||
Marti Raudsepp
|
r9947 | |||
Greg Ward
|
r15162 | # not on the command line: fallback to config and then maybe ask | ||
addr = (ui.config('email', configkey) or | ||||
ui.config('patchbomb', configkey) or | ||||
'') | ||||
if not addr and ask: | ||||
Greg Ward
|
r15164 | addr = prompt(ui, header, default=default) | ||
Greg Ward
|
r15162 | if addr: | ||
showaddrs.append('%s: %s' % (header, addr)) | ||||
Greg Ward
|
r15164 | return mail.addrlistencode(ui, [addr], _charsets, opts.get('test')) | ||
else: | ||||
return default | ||||
Marti Raudsepp
|
r9947 | |||
Greg Ward
|
r15162 | to = getaddrs('To', ask=True) | ||
Greg Ward
|
r15164 | if not to: | ||
# we can get here in non-interactive mode | ||||
raise util.Abort(_('no recipient addresses provided')) | ||||
cc = getaddrs('Cc', ask=True, default='') or [] | ||||
bcc = getaddrs('Bcc') or [] | ||||
Greg Ward
|
r15162 | replyto = getaddrs('Reply-To') | ||
Christian Ebert
|
r2679 | |||
Christian Ebert
|
r12201 | if opts.get('diffstat') or opts.get('confirm'): | ||
Christian Ebert
|
r12200 | ui.write(_('\nFinal summary:\n\n')) | ||
Matt Mackall
|
r17956 | ui.write(('From: %s\n' % sender)) | ||
Christian Ebert
|
r12200 | for addr in showaddrs: | ||
ui.write('%s\n' % addr) | ||||
for m, subj, ds in msgs: | ||||
Matt Mackall
|
r17956 | ui.write(('Subject: %s\n' % subj)) | ||
Christian Ebert
|
r12200 | if ds: | ||
ui.write(ds) | ||||
ui.write('\n') | ||||
Matt Mackall
|
r19226 | if ui.promptchoice(_('are you sure you want to send (yn)?' | ||
'$$ &Yes $$ &No')): | ||||
Christian Ebert
|
r12200 | raise util.Abort(_('patchbomb canceled')) | ||
Vadim Gelfer
|
r1669 | ui.write('\n') | ||
Henrik Stuart <henrik.stuart at edlund.dk>
|
r8025 | parent = opts.get('in_reply_to') or None | ||
Cédric Duval
|
r8826 | # angle brackets may be omitted, they're not semantically part of the msg-id | ||
if parent is not None: | ||||
if not parent.startswith('<'): | ||||
parent = '<' + parent | ||||
if not parent.endswith('>'): | ||||
parent += '>' | ||||
Vadim Gelfer
|
r1827 | sender_addr = email.Utils.parseaddr(sender)[1] | ||
Christian Ebert
|
r7115 | sender = mail.addressencode(ui, sender, _charsets, opts.get('test')) | ||
Matt Mackall
|
r5973 | sendmail = None | ||
Yuya Nishihara
|
r12265 | for i, (m, subj, ds) in enumerate(msgs): | ||
Vadim Gelfer
|
r1669 | try: | ||
m['Message-Id'] = genmsgid(m['X-Mercurial-Node']) | ||||
except TypeError: | ||||
m['Message-Id'] = genmsgid('patchbomb') | ||||
if parent: | ||||
m['In-Reply-To'] = parent | ||||
Benoit Allard
|
r7413 | m['References'] = parent | ||
Thomas Arendsen Hein
|
r17859 | if not parent or 'X-Mercurial-Node' not in m: | ||
Vadim Gelfer
|
r1669 | parent = m['Message-Id'] | ||
Cédric Duval
|
r8514 | |||
Henrik Stuart
|
r8160 | m['User-Agent'] = 'Mercurial-patchbomb/%s' % util.version() | ||
Cédric Duval
|
r9047 | m['Date'] = email.Utils.formatdate(start_time[0], localtime=True) | ||
Volker Kleinfeld
|
r2443 | |||
Christian Ebert
|
r4027 | start_time = (start_time[0] + 1, start_time[1]) | ||
Vadim Gelfer
|
r1669 | m['From'] = sender | ||
m['To'] = ', '.join(to) | ||||
Christian Ebert
|
r5785 | if cc: | ||
m['Cc'] = ', '.join(cc) | ||||
if bcc: | ||||
m['Bcc'] = ', '.join(bcc) | ||||
Cédric Duval
|
r11150 | if replyto: | ||
m['Reply-To'] = ', '.join(replyto) | ||||
Christian Ebert
|
r5818 | if opts.get('test'): | ||
Martin Geisler
|
r16931 | ui.status(_('displaying '), subj, ' ...\n') | ||
Patrick Mezard
|
r4596 | ui.flush() | ||
Yuya Nishihara
|
r11183 | if 'PAGER' in os.environ and not ui.plain(): | ||
Dirkjan Ochtman
|
r6548 | fp = util.popen(os.environ['PAGER'], 'w') | ||
Patrick Mezard
|
r4599 | else: | ||
fp = ui | ||||
Benoit Boissinot
|
r6447 | generator = email.Generator.Generator(fp, mangle_from_=False) | ||
Vadim Gelfer
|
r1871 | try: | ||
Benoit Boissinot
|
r6447 | generator.flatten(m, 0) | ||
Vadim Gelfer
|
r1871 | fp.write('\n') | ||
except IOError, inst: | ||||
if inst.errno != errno.EPIPE: | ||||
raise | ||||
Patrick Mezard
|
r4599 | if fp is not ui: | ||
fp.close() | ||||
Mads Kiilerich
|
r15560 | else: | ||
if not sendmail: | ||||
FUJIWARA Katsunori
|
r18888 | verifycert = ui.config('smtp', 'verifycert') | ||
if opts.get('insecure'): | ||||
ui.setconfig('smtp', 'verifycert', 'loose') | ||||
try: | ||||
sendmail = mail.connect(ui, mbox=mbox) | ||||
finally: | ||||
ui.setconfig('smtp', 'verifycert', verifycert) | ||||
Martin Geisler
|
r16931 | ui.status(_('sending '), subj, ' ...\n') | ||
Mads Kiilerich
|
r15559 | ui.progress(_('sending'), i, item=subj, total=len(msgs)) | ||
Mads Kiilerich
|
r15560 | if not mbox: | ||
# Exim does not remove the Bcc field | ||||
del m['Bcc'] | ||||
Benoit Boissinot
|
r6447 | fp = cStringIO.StringIO() | ||
generator = email.Generator.Generator(fp, mangle_from_=False) | ||||
generator.flatten(m, 0) | ||||
Mads Kiilerich
|
r15559 | sendmail(sender_addr, to + bcc + cc, fp.getvalue()) | ||
Vadim Gelfer
|
r1669 | |||
Yuya Nishihara
|
r12265 | ui.progress(_('writing'), None) | ||
ui.progress(_('sending'), None) | ||||