mercurial-scm/hg: hgext/patchbomb.py annotate

annotate hgext/patchbomb.py @ 16307:17a9a1f5cee2

patchbomb: add --body flag to send patches as inline message body text There is currently no way to make patchbomb include patches both as attachments and as inline text. This would be quite convenient when sending patches to people who use web email clients (e.g. gmail) which often mangle the patches, making them hard to apply. The default behavior of the email command is unchanged. However it is now possible to use the --body flag _in addition_ to the -i or -a flags, in which case the patchbomb emails will contain the patch as inline body text and as an attachment. A new test has been added to test-patchbomb.t ("test attach for single patch"), based on the existing test called "test attach for single patch" test.

author	Angel Ezquerra <angel.ezquerra@gmail.com>
date	Wed, 21 Mar 2012 06:45:07 +0100
parents	3f79b110c4f0
children	525fdb738975

rev	line source
8252 9674d64b6416 patchbomb: add copyright and license header Martin Geisler <mg@lazybytes.net> parents: 8208 diff changeset	1 # patchbomb.py - sending Mercurial changesets as patch emails
9674d64b6416 patchbomb: add copyright and license header Martin Geisler <mg@lazybytes.net> parents: 8208 diff changeset	2 #
9674d64b6416 patchbomb: add copyright and license header Martin Geisler <mg@lazybytes.net> parents: 8208 diff changeset	3 # Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
9674d64b6416 patchbomb: add copyright and license header Martin Geisler <mg@lazybytes.net> parents: 8208 diff changeset	4 #
9674d64b6416 patchbomb: add copyright and license header Martin Geisler <mg@lazybytes.net> parents: 8208 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10022 diff changeset	6 # GNU General Public License version 2 or any later version.
8252 9674d64b6416 patchbomb: add copyright and license header Martin Geisler <mg@lazybytes.net> parents: 8208 diff changeset	7
8935 f4f0e902b750 extensions: change descriptions for hook-providing extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8934 diff changeset	8 '''command to send changesets as (a series of) patch emails
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	9
7997 8eb9f495e150 patchbomb: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	10 The series is started off with a "[PATCH 0 of N]" introduction, which
8eb9f495e150 patchbomb: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	11 describes the series as a whole.
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	12
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	13 Each patch email has a Subject line of "[PATCH M of N] ...", using the
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	14 first line of the changeset description as the subject text. The
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	15 message contains two or three body parts:
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	16
9300 ad95ea1c975a patchbomb: use a list instead of indented paragraphs Martin Geisler <mg@lazybytes.net> parents: 9289 diff changeset	17 - The changeset description.
ad95ea1c975a patchbomb: use a list instead of indented paragraphs Martin Geisler <mg@lazybytes.net> parents: 9289 diff changeset	18 - [Optional] The result of running diffstat on the patch.
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10734 diff changeset	19 - The patch itself, as generated by :hg:`export`.
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	20
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	21 Each message refers to the first in the series using the In-Reply-To
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	22 and References headers, so they will show up as a sequence in threaded
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	23 mail and news readers, and in mail archives.
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	24
13838 c5709dfa5c1e patchbomb, help/hgweb: do not refer to config files as hgrc files Martin Geisler <mg@aragost.com> parents: 13400 diff changeset	25 To configure other defaults, add a section like this to your
c5709dfa5c1e patchbomb, help/hgweb: do not refer to config files as hgrc files Martin Geisler <mg@aragost.com> parents: 13400 diff changeset	26 configuration file::
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	27
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	28 [email]
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	29 from = My Name <my@email>
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	30 to = recipient1, recipient2, ...
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	31 cc = cc1, cc2, ...
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	32 bcc = bcc1, bcc2, ...
11150 f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	33 reply-to = address1, address2, ...
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	34
10284 b08ffd27dfc8 patchbomb: document [patchbomb] config section for addresses Christian Ebert <blacktrash@gmx.net> parents: 10263 diff changeset	35 Use ``[patchbomb]`` as configuration section name if you need to
b08ffd27dfc8 patchbomb: document [patchbomb] config section for addresses Christian Ebert <blacktrash@gmx.net> parents: 10263 diff changeset	36 override global ``[email]`` address settings.
b08ffd27dfc8 patchbomb: document [patchbomb] config section for addresses Christian Ebert <blacktrash@gmx.net> parents: 10263 diff changeset	37
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10734 diff changeset	38 Then you can use the :hg:`email` command to mail a series of
49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10734 diff changeset	39 changesets as a patchbomb.
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	40
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	41 You can also either configure the method option in the email section
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	42 to be a sendmail compatible mailer or fill out the [smtp] section so
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	43 that the patchbomb extension can automatically send patchbombs
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	44 directly from the commandline. See the [email] and [smtp] sections in
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	45 hgrc(5) for details.
9071 141e3ef20d84 patchbomb: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 9047 diff changeset	46 '''
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	47
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 15559 diff changeset	48 import os, errno, socket, tempfile, cStringIO
7192 f31ba106fc19 patchbomb: mime-encode clean utf-8 patches (issue814) Christian Ebert <blacktrash@gmx.net> parents: 7115 diff changeset	49 import email.MIMEMultipart, email.MIMEBase
6447 9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	50 import email.Utils, email.Encoders, email.Generator
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 14073 diff changeset	51 from mercurial import cmdutil, commands, hg, mail, patch, util, discovery
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14309 diff changeset	52 from mercurial import scmutil
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3887 diff changeset	53 from mercurial.i18n import _
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 5973 diff changeset	54 from mercurial.node import bin
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	55
14309 37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	56 cmdtable = {}
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	57 command = cmdutil.command(cmdtable)
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	58
9648 6064de41b7e4 patchbomb: accept default if it is empty string Alexander Solovyov <piranha@piranha.org.ua> parents: 9647 diff changeset	59 def prompt(ui, prompt, default=None, rest=':'):
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	60 if default:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	61 prompt += ' [%s]' % default
15166 9ec9dd8d1b24 patchbomb: drop loop in prompt Matt Mackall <mpm@selenic.com> parents: 15165 diff changeset	62 return ui.prompt(prompt + rest, default)
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	63
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	64 def introwanted(opts, number):
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	65 '''is an introductory message apparently wanted?'''
10734 7a0502a6f9a1 patchbomb: --desc implies --intro C?dric Duval <cedricduval@free.fr> parents: 10611 diff changeset	66 return number > 1 or opts.get('intro') or opts.get('desc')
7a0502a6f9a1 patchbomb: --desc implies --intro C?dric Duval <cedricduval@free.fr> parents: 10611 diff changeset	67
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	68 def makepatch(ui, repo, patchlines, opts, _charsets, idx, total, numbered,
12199 17d604e522b4 patchbomb: rename argument to avoid shadowing patch module Martin Geisler <mg@lazybytes.net> parents: 12197 diff changeset	69 patchname=None):
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	70
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	71 desc = []
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	72 node = None
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	73 body = ''
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	74
12199 17d604e522b4 patchbomb: rename argument to avoid shadowing patch module Martin Geisler <mg@lazybytes.net> parents: 12197 diff changeset	75 for line in patchlines:
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	76 if line.startswith('#'):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	77 if line.startswith('# Node ID'):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	78 node = line.split()[-1]
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	79 continue
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	80 if line.startswith('diff -r') or line.startswith('diff --git'):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	81 break
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	82 desc.append(line)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	83
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	84 if not patchname and not node:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	85 raise ValueError
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	86
16307 17a9a1f5cee2 patchbomb: add --body flag to send patches as inline message body text Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16233 diff changeset	87 if opts.get('attach') and not opts.get('body'):
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	88 body = ('\n'.join(desc[1:]).strip() or
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	89 'Patch subject is complete summary.')
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	90 body += '\n\n\n'
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	91
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	92 if opts.get('plain'):
12199 17d604e522b4 patchbomb: rename argument to avoid shadowing patch module Martin Geisler <mg@lazybytes.net> parents: 12197 diff changeset	93 while patchlines and patchlines[0].startswith('# '):
17d604e522b4 patchbomb: rename argument to avoid shadowing patch module Martin Geisler <mg@lazybytes.net> parents: 12197 diff changeset	94 patchlines.pop(0)
17d604e522b4 patchbomb: rename argument to avoid shadowing patch module Martin Geisler <mg@lazybytes.net> parents: 12197 diff changeset	95 if patchlines:
17d604e522b4 patchbomb: rename argument to avoid shadowing patch module Martin Geisler <mg@lazybytes.net> parents: 12197 diff changeset	96 patchlines.pop(0)
17d604e522b4 patchbomb: rename argument to avoid shadowing patch module Martin Geisler <mg@lazybytes.net> parents: 12197 diff changeset	97 while patchlines and not patchlines[0].strip():
17d604e522b4 patchbomb: rename argument to avoid shadowing patch module Martin Geisler <mg@lazybytes.net> parents: 12197 diff changeset	98 patchlines.pop(0)
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	99
14397 0368ad7963be patchbomb: pass --git argument to diffstat Idan Kamara <idankk86@gmail.com> parents: 14319 diff changeset	100 ds = patch.diffstat(patchlines, git=opts.get('git'))
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	101 if opts.get('diffstat'):
12200 aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	102 body += ds + '\n\n'
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	103
16307 17a9a1f5cee2 patchbomb: add --body flag to send patches as inline message body text Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16233 diff changeset	104 addattachment = opts.get('attach') or opts.get('inline')
17a9a1f5cee2 patchbomb: add --body flag to send patches as inline message body text Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16233 diff changeset	105 if not addattachment or opts.get('body'):
17a9a1f5cee2 patchbomb: add --body flag to send patches as inline message body text Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16233 diff changeset	106 body += '\n'.join(patchlines)
17a9a1f5cee2 patchbomb: add --body flag to send patches as inline message body text Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16233 diff changeset	107
17a9a1f5cee2 patchbomb: add --body flag to send patches as inline message body text Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16233 diff changeset	108 if addattachment:
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	109 msg = email.MIMEMultipart.MIMEMultipart()
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	110 if body:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	111 msg.attach(mail.mimeencode(ui, body, _charsets, opts.get('test')))
12199 17d604e522b4 patchbomb: rename argument to avoid shadowing patch module Martin Geisler <mg@lazybytes.net> parents: 12197 diff changeset	112 p = mail.mimetextpatch('\n'.join(patchlines), 'x-patch', opts.get('test'))
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	113 binnode = bin(node)
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8520 diff changeset	114 # if node is mq patch, it will have the patch file's name as a tag
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	115 if not patchname:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	116 patchtags = [t for t in repo.nodetags(binnode)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	117 if t.endswith('.patch') or t.endswith('.diff')]
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	118 if patchtags:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	119 patchname = patchtags[0]
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	120 elif total > 1:
14290 86e70956da4f cmdutil: make_filename -> makefilename Matt Mackall <mpm@selenic.com> parents: 14076 diff changeset	121 patchname = cmdutil.makefilename(repo, '%b-%n.patch',
7359 b0fa5dbd9cdd patchbomb: fix patch name generation in patch series Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7354 diff changeset	122 binnode, seqno=idx, total=total)
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	123 else:
14290 86e70956da4f cmdutil: make_filename -> makefilename Matt Mackall <mpm@selenic.com> parents: 14076 diff changeset	124 patchname = cmdutil.makefilename(repo, '%b.patch', binnode)
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	125 disposition = 'inline'
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	126 if opts.get('attach'):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	127 disposition = 'attachment'
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	128 p['Content-Disposition'] = disposition + '; filename=' + patchname
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	129 msg.attach(p)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	130 else:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	131 msg = mail.mimetextpatch(body, display=opts.get('test'))
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	132
9346 bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	133 flag = ' '.join(opts.get('flag'))
bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	134 if flag:
bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	135 flag = ' ' + flag
bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	136
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	137 subj = desc[0].strip().rstrip('. ')
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	138 if not numbered:
9346 bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	139 subj = '[PATCH%s] %s' % (flag, opts.get('subject') or subj)
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	140 else:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	141 tlen = len(str(total))
9346 bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	142 subj = '[PATCH %0*d of %d%s] %s' % (tlen, idx, total, flag, subj)
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	143 msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get('test'))
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	144 msg['X-Mercurial-Node'] = node
12200 aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	145 return msg, subj, ds
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	146
14309 37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	147 emailopts = [
16307 17a9a1f5cee2 patchbomb: add --body flag to send patches as inline message body text Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16233 diff changeset	148 ('', 'body', None, _('send patches as inline message text (default)')),
14309 37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	149 ('a', 'attach', None, _('send patches as attachments')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	150 ('i', 'inline', None, _('send patches as inline attachments')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	151 ('', 'bcc', [], _('email addresses of blind carbon copy recipients')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	152 ('c', 'cc', [], _('email addresses of copy recipients')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	153 ('', 'confirm', None, _('ask for confirmation before sending')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	154 ('d', 'diffstat', None, _('add diffstat output to messages')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	155 ('', 'date', '', _('use the given date as the sending date')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	156 ('', 'desc', '', _('use the given file as the series description')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	157 ('f', 'from', '', _('email address of sender')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	158 ('n', 'test', None, _('print messages that would be sent')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	159 ('m', 'mbox', '', _('write messages to mbox file instead of sending them')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	160 ('', 'reply-to', [], _('email addresses replies should be sent to')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	161 ('s', 'subject', '', _('subject of first message (intro or single patch)')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	162 ('', 'in-reply-to', '', _('message identifier to reply to')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	163 ('', 'flag', [], _('flags to add in subject prefixes')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	164 ('t', 'to', [], _('email addresses of recipients'))]
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	165
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	166 @command('email',
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	167 [('g', 'git', None, _('use git extended diff format')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	168 ('', 'plain', None, _('omit hg patch header')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	169 ('o', 'outgoing', None,
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	170 _('send changes not found in the target repository')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	171 ('b', 'bundle', None, _('send changes not in target as a binary bundle')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	172 ('', 'bundlename', 'bundle',
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	173 _('name of the bundle attachment file'), _('NAME')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	174 ('r', 'rev', [], _('a revision to send'), _('REV')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	175 ('', 'force', None, _('run even when remote repository is unrelated '
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	176 '(with -b/--bundle)')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	177 ('', 'base', [], _('a base changeset to specify instead of a destination '
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	178 '(with -b/--bundle)'), _('REV')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	179 ('', 'intro', None, _('send an introduction email for a single patch')),
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	180 ] + emailopts + commands.remoteopts,
37e80214badf patchbomb: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14290 diff changeset	181 _('hg email [OPTION]... [DEST]...'))
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	182 def patchbomb(ui, repo, revs, *opts):
4283 8625504f507c Slight refining to help text in patchbomb.py John Goerzen <jgoerzen@complete.org> parents: 4280 diff changeset	183 '''send changesets by email
1204 b0f6053df539 patchbomb: continue if we can't import readline. Bryan O'Sullivan <bos@serpentine.com> parents: 1154 diff changeset	184
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11183 diff changeset	185 By default, diffs are sent in the format generated by
687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11183 diff changeset	186 :hg:`export`, one per message. The series starts with a "[PATCH 0
687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11183 diff changeset	187 of N]" introduction, which describes the series as a whole.
1672 07f931af5f40 add documentation for email command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1670 diff changeset	188
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	189 Each patch email has a Subject line of "[PATCH M of N] ...", using
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	190 the first line of the changeset description as the subject text.
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	191 The message contains two or three parts. First, the changeset
12749 338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	192 description.
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	193
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	194 With the -d/--diffstat option, if the diffstat program is
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	195 installed, the result of running diffstat on the patch is inserted.
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	196
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	197 Finally, the patch itself, as generated by :hg:`export`.
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	198
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	199 With the -d/--diffstat or -c/--confirm options, you will be presented
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	200 with a final summary of all messages and asked for confirmation before
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	201 the messages are sent.
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	202
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	203 By default the patch is included as text in the email body for
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	204 easy reviewing. Using the -a/--attach option will instead create
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	205 an attachment for the patch. With -i/--inline an inline attachment
16307 17a9a1f5cee2 patchbomb: add --body flag to send patches as inline message body text Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16233 diff changeset	206 will be created. You can include a patch both as text in the email
17a9a1f5cee2 patchbomb: add --body flag to send patches as inline message body text Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16233 diff changeset	207 body and as a regular or an inline attachment by combining the
17a9a1f5cee2 patchbomb: add --body flag to send patches as inline message body text Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16233 diff changeset	208 -a/--attach or -i/--inline with the --body option.
8472 223363bb6d66 patchbomb: describe --attach and --inline options in help Martin Geisler <mg@lazybytes.net> parents: 8471 diff changeset	209
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	210 With -o/--outgoing, emails will be generated for patches not found
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	211 in the destination repository (or only those which are ancestors
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	212 of the specified revisions if any are provided)
4280 a9336520a4ee Improve documentation for patchbomb and email John Goerzen <jgoerzen@complete.org> parents: 4279 diff changeset	213
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	214 With -b/--bundle, changesets are selected as for --outgoing, but a
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	215 single email containing a binary Mercurial bundle as an attachment
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	216 will be sent.
4280 a9336520a4ee Improve documentation for patchbomb and email John Goerzen <jgoerzen@complete.org> parents: 4279 diff changeset	217
12749 338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	218 With -m/--mbox, instead of previewing each patchbomb message in a
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	219 pager or sending the messages directly, it will create a UNIX
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	220 mailbox file with the patch emails. This mailbox file can be
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	221 previewed with any mail user agent which supports UNIX mbox
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	222 files.
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	223
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	224 With -n/--test, all steps will run, but mail will not be sent.
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	225 You will be prompted for an email recipient address, a subject and
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	226 an introductory message describing the patches of your patchbomb.
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	227 Then when all is done, patchbomb messages are displayed. If the
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	228 PAGER environment variable is set, your pager will be fired up once
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	229 for each patchbomb message, so you can verify everything is alright.
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	230
13198 e71b2aa74ce3 patchbomb: save introductory message in .hg/last-email.txt Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12839 diff changeset	231 In case email sending fails, you will find a backup of your series
e71b2aa74ce3 patchbomb: save introductory message in .hg/last-email.txt Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12839 diff changeset	232 introductory message in ``.hg/last-email.txt``.
e71b2aa74ce3 patchbomb: save introductory message in .hg/last-email.txt Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12839 diff changeset	233
9289 45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	234 Examples::
4280 a9336520a4ee Improve documentation for patchbomb and email John Goerzen <jgoerzen@complete.org> parents: 4279 diff changeset	235
9289 45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	236 hg email -r 3000 # send patch 3000 only
45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	237 hg email -r 3000 -r 3001 # send patches 3000 and 3001
45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	238 hg email -r 3000:3005 # send patches 3000 through 3005
45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	239 hg email 3000 # send patch 3000 (deprecated)
4280 a9336520a4ee Improve documentation for patchbomb and email John Goerzen <jgoerzen@complete.org> parents: 4279 diff changeset	240
9289 45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	241 hg email -o # send all patches not in default
45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	242 hg email -o DEST # send all patches not in DEST
45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	243 hg email -o -r 3000 # send all ancestors of 3000 not in default
45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	244 hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST
4280 a9336520a4ee Improve documentation for patchbomb and email John Goerzen <jgoerzen@complete.org> parents: 4279 diff changeset	245
9289 45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	246 hg email -b # send bundle of all patches not in default
45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	247 hg email -b DEST # send bundle of all patches not in DEST
45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	248 hg email -b -r 3000 # bundle of all ancestors of 3000 not in default
45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	249 hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST
4280 a9336520a4ee Improve documentation for patchbomb and email John Goerzen <jgoerzen@complete.org> parents: 4279 diff changeset	250
12749 338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	251 hg email -o -m mbox && # generate an mbox file...
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	252 mutt -R -f mbox # ... and view it with mutt
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	253 hg email -o -m mbox && # generate an mbox file ...
12839 d85e30889f26 patchbomb: fix stray backslash in docstring Martin Geisler <mg@lazybytes.net> parents: 12794 diff changeset	254 formail -s sendmail \\ # ... and use formail to send from the mbox
12749 338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	255 -bm -t < mbox # ... using sendmail
338b4b615d33 patchbomb: move command option help from the extension (patchbomb) to the command (email) timeless <timeless@gmail.com> parents: 12265 diff changeset	256
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	257 Before using this command, you will need to enable email in your
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	258 hgrc. See the [email] section in hgrc(5) for details.
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	259 '''
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	260
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	261 _charsets = mail._charsets(ui)
c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	262
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	263 bundle = opts.get('bundle')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	264 date = opts.get('date')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	265 mbox = opts.get('mbox')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	266 outgoing = opts.get('outgoing')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	267 rev = opts.get('rev')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	268 # internal option used by pbranches
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	269 patches = opts.get('patches')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	270
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	271 def getoutgoing(dest, revs):
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	272 '''Return the revisions present locally but not in dest'''
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	273 dest = ui.expandpath(dest or 'default-push', dest or 'default')
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10285 diff changeset	274 dest, branches = hg.parseurl(dest)
d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10285 diff changeset	275 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
14556 517e1d88bf7e hg: change various repository() users to use peer() where appropriate Matt Mackall <mpm@selenic.com> parents: 14397 diff changeset	276 other = hg.peer(repo, opts, dest)
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 14073 diff changeset	277 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
14073 72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13838 diff changeset	278 common, _anyinc, _heads = discovery.findcommonincoming(repo, other)
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13838 diff changeset	279 nodes = revs and map(repo.lookup, revs) or revs
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13838 diff changeset	280 o = repo.changelog.findmissing(common, heads=nodes)
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	281 if not o:
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	282 ui.status(_("no changes found\n"))
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	283 return []
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	284 return [str(repo.changelog.rev(r)) for r in o]
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	285
7615 ab39d1813e51 patch: export shouldn't close files received as a parameter Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7600 diff changeset	286 def getpatches(revs):
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14309 diff changeset	287 for r in scmutil.revrange(repo, revs):
7615 ab39d1813e51 patch: export shouldn't close files received as a parameter Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7600 diff changeset	288 output = cStringIO.StringIO()
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10365 diff changeset	289 cmdutil.export(repo, [r], fp=output,
7874 d812029cda85 cleanup: drop variables for unused return values Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7807 diff changeset	290 opts=patch.diffopts(ui, opts))
7615 ab39d1813e51 patch: export shouldn't close files received as a parameter Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7600 diff changeset	291 yield output.getvalue().split('\n')
ab39d1813e51 patch: export shouldn't close files received as a parameter Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7600 diff changeset	292
4279 126d1967a3f8 Add common bundle/outgoing options to hg email John Goerzen <jgoerzen@complete.org> parents: 4278 diff changeset	293 def getbundle(dest):
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	294 tmpdir = tempfile.mkdtemp(prefix='hg-email-bundle-')
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	295 tmpfn = os.path.join(tmpdir, 'bundle')
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	296 try:
4279 126d1967a3f8 Add common bundle/outgoing options to hg email John Goerzen <jgoerzen@complete.org> parents: 4278 diff changeset	297 commands.bundle(ui, repo, tmpfn, dest, **opts)
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13198 diff changeset	298 fp = open(tmpfn, 'rb')
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13198 diff changeset	299 data = fp.read()
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13198 diff changeset	300 fp.close()
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13198 diff changeset	301 return data
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	302 finally:
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	303 try:
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	304 os.unlink(tmpfn)
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	305 except:
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	306 pass
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	307 os.rmdir(tmpdir)
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	308
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	309 if not (opts.get('test') or mbox):
5472 23889160905a Catch smtp exceptions Christian Ebert <blacktrash@gmx.net> parents: 4887 diff changeset	310 # really sending
4489 a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4486 diff changeset	311 mail.validateconfig(ui)
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4486 diff changeset	312
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	313 if not (revs or rev or outgoing or bundle or patches):
4493 ead2fa544cbf patchbomb: Fail early if no revs given to email Bryan O'Sullivan <bos@serpentine.com> parents: 4492 diff changeset	314 raise util.Abort(_('specify at least one changeset with -r or -o'))
ead2fa544cbf patchbomb: Fail early if no revs given to email Bryan O'Sullivan <bos@serpentine.com> parents: 4492 diff changeset	315
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	316 if outgoing and bundle:
5746 d3ef7e86bc3b patchbomb: break lines > 80 chars (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5677 diff changeset	317 raise util.Abort(_("--outgoing mode always on with --bundle;"
d3ef7e86bc3b patchbomb: break lines > 80 chars (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5677 diff changeset	318 " do not re-specify --outgoing"))
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	319
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	320 if outgoing or bundle:
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	321 if len(revs) > 1:
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	322 raise util.Abort(_("too many destinations"))
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	323 dest = revs and revs[0] or None
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	324 revs = []
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	325
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	326 if rev:
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	327 if revs:
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	328 raise util.Abort(_('use only one form to specify the revision'))
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	329 revs = rev
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	330
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	331 if outgoing:
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	332 revs = getoutgoing(dest, rev)
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	333 if bundle:
4279 126d1967a3f8 Add common bundle/outgoing options to hg email John Goerzen <jgoerzen@complete.org> parents: 4278 diff changeset	334 opts['revs'] = revs
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	335
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	336 # start
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	337 if date:
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	338 start_time = util.parsedate(date)
4566 087b3ae4f08a patchbomb: add --date option Bryan O'Sullivan <bos@serpentine.com> parents: 4565 diff changeset	339 else:
087b3ae4f08a patchbomb: add --date option Bryan O'Sullivan <bos@serpentine.com> parents: 4565 diff changeset	340 start_time = util.makedate()
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	341
876 14cfaaec2e8e Get patchbomb script to not use MIME attachments. Bryan O'Sullivan <bos@serpentine.com> parents: 875 diff changeset	342 def genmsgid(id):
4027 2601ac9c54f0 patchbomb: fix timezone offset in message date header Christian Ebert <blacktrash@gmx.net> parents: 3473 diff changeset	343 return '<%s.%s@%s>' % (id[:20], int(start_time[0]), socket.getfqdn())
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	344
5753 ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	345 def getdescription(body, sender):
5818 77775ae8d5d9 patchbomb: consistently use opts.get Christian Ebert <blacktrash@gmx.net> parents: 5817 diff changeset	346 if opts.get('desc'):
77775ae8d5d9 patchbomb: consistently use opts.get Christian Ebert <blacktrash@gmx.net> parents: 5817 diff changeset	347 body = open(opts.get('desc')).read()
5753 ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	348 else:
ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	349 ui.write(_('\nWrite the introductory message for the '
ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	350 'patch series.\n\n'))
ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	351 body = ui.edit(body, sender)
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	352 # Save series description in case sendmail fails
13198 e71b2aa74ce3 patchbomb: save introductory message in .hg/last-email.txt Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12839 diff changeset	353 msgfile = repo.opener('last-email.txt', 'wb')
e71b2aa74ce3 patchbomb: save introductory message in .hg/last-email.txt Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12839 diff changeset	354 msgfile.write(body)
e71b2aa74ce3 patchbomb: save introductory message in .hg/last-email.txt Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12839 diff changeset	355 msgfile.close()
5753 ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	356 return body
ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	357
7353 982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	358 def getpatchmsgs(patches, patchnames=None):
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	359 msgs = []
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	360
5746 d3ef7e86bc3b patchbomb: break lines > 80 chars (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5677 diff changeset	361 ui.write(_('This patch series consists of %d patches.\n\n')
d3ef7e86bc3b patchbomb: break lines > 80 chars (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5677 diff changeset	362 % len(patches))
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	363
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	364 # build the intro message, or skip it if the user declines
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	365 if introwanted(opts, len(patches)):
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	366 msg = makeintro(patches)
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	367 if msg:
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	368 msgs.append(msg)
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	369
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	370 # are we going to send more than one message?
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	371 numbered = len(msgs) + len(patches) > 1
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	372
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	373 # now generate the actual patch messages
7353 982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	374 name = None
7616 b9bd6f789633 use enumerate instead of zip Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7615 diff changeset	375 for i, p in enumerate(patches):
7353 982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	376 if patchnames:
982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	377 name = patchnames[i]
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	378 msg = makepatch(ui, repo, p, opts, _charsets, i + 1,
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	379 len(patches), numbered, name)
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	380 msgs.append(msg)
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	381
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	382 return msgs
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	383
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	384 def makeintro(patches):
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	385 tlen = len(str(len(patches)))
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	386
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	387 flag = opts.get('flag') or ''
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	388 if flag:
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	389 flag = ' ' + ' '.join(flag)
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	390 prefix = '[PATCH %0*d of %d%s]' % (tlen, 0, len(patches), flag)
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	391
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	392 subj = (opts.get('subject') or
16233 3f79b110c4f0 patchbomb: add (optional) note to 0 of 0 prompt Matt Mackall <mpm@selenic.com> parents: 15560 diff changeset	393 prompt(ui, '(optional) Subject: ', rest=prefix, default=''))
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	394 if not subj:
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	395 return None # skip intro if the user doesn't bother
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	396
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	397 subj = prefix + ' ' + subj
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	398
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	399 body = ''
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	400 if opts.get('diffstat'):
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	401 # generate a cumulative diffstat of the whole patch series
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	402 diffstat = patch.diffstat(sum(patches, []))
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	403 body = '\n' + diffstat
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	404 else:
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	405 diffstat = None
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	406
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	407 body = getdescription(body, sender)
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	408 msg = mail.mimeencode(ui, body, _charsets, opts.get('test'))
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	409 msg['Subject'] = mail.headencode(ui, subj, _charsets,
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	410 opts.get('test'))
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	411 return (msg, subj, diffstat)
2704 99e7cf6bd2f7 make introductory message of patch series text/plain Christian Ebert <blacktrash@gmx.net> parents: 2443 diff changeset	412
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	413 def getbundlemsgs(bundle):
5818 77775ae8d5d9 patchbomb: consistently use opts.get Christian Ebert <blacktrash@gmx.net> parents: 5817 diff changeset	414 subj = (opts.get('subject')
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	415 or prompt(ui, 'Subject:', 'A bundle for your repository'))
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	416
5753 ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	417 body = getdescription('', sender)
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	418 msg = email.MIMEMultipart.MIMEMultipart()
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	419 if body:
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	420 msg.attach(mail.mimeencode(ui, body, _charsets, opts.get('test')))
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	421 datapart = email.MIMEBase.MIMEBase('application', 'x-mercurial-bundle')
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	422 datapart.set_payload(bundle)
7889 5ac1a72e5b74 patchbomb: option to set the name of bundle attachment (issue1452) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7874 diff changeset	423 bundlename = '%s.hg' % opts.get('bundlename', 'bundle')
4284 a04141f51056 Add a filename for the bundle John Goerzen <jgoerzen@complete.org> parents: 4283 diff changeset	424 datapart.add_header('Content-Disposition', 'attachment',
7889 5ac1a72e5b74 patchbomb: option to set the name of bundle attachment (issue1452) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7874 diff changeset	425 filename=bundlename)
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	426 email.Encoders.encode_base64(datapart)
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	427 msg.attach(datapart)
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	428 msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get('test'))
12200 aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	429 return [(msg, subj, None)]
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	430
5818 77775ae8d5d9 patchbomb: consistently use opts.get Christian Ebert <blacktrash@gmx.net> parents: 5817 diff changeset	431 sender = (opts.get('from') or ui.config('email', 'from') or
2198 564034552f7f rename [patchbomb] section to [email] section in hgrc. old name still ok. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2165 diff changeset	432 ui.config('patchbomb', 'from') or
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	433 prompt(ui, 'From', ui.username()))
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	434
7353 982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	435 if patches:
982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	436 msgs = getpatchmsgs(patches, opts.get('patchnames'))
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	437 elif bundle:
4279 126d1967a3f8 Add common bundle/outgoing options to hg email John Goerzen <jgoerzen@complete.org> parents: 4278 diff changeset	438 msgs = getbundlemsgs(getbundle(dest))
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	439 else:
7615 ab39d1813e51 patch: export shouldn't close files received as a parameter Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7600 diff changeset	440 msgs = getpatchmsgs(list(getpatches(revs)))
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	441
12200 aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	442 showaddrs = []
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	443
15162 d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	444 def getaddrs(header, ask=False, default=None):
d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	445 configkey = header.lower()
d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	446 opt = header.replace('-', '_').lower()
d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	447 addrs = opts.get(opt)
11150 f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	448 if addrs:
15162 d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	449 showaddrs.append('%s: %s' % (header, ', '.join(addrs)))
12264 b8146231c3de patchbomb: consistent code style in getaddrs() Christian Ebert <blacktrash@gmx.net> parents: 12201 diff changeset	450 return mail.addrlistencode(ui, addrs, _charsets, opts.get('test'))
9947 4600e6222efb patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Marti Raudsepp <marti@juffo.org> parents: 9818 diff changeset	451
15162 d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	452 # not on the command line: fallback to config and then maybe ask
d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	453 addr = (ui.config('email', configkey) or
d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	454 ui.config('patchbomb', configkey) or
d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	455 '')
d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	456 if not addr and ask:
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	457 addr = prompt(ui, header, default=default)
15162 d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	458 if addr:
d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	459 showaddrs.append('%s: %s' % (header, addr))
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	460 return mail.addrlistencode(ui, [addr], _charsets, opts.get('test'))
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	461 else:
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	462 return default
9947 4600e6222efb patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Marti Raudsepp <marti@juffo.org> parents: 9818 diff changeset	463
15162 d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	464 to = getaddrs('To', ask=True)
15164 7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	465 if not to:
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	466 # we can get here in non-interactive mode
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	467 raise util.Abort(_('no recipient addresses provided'))
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	468 cc = getaddrs('Cc', ask=True, default='') or []
7bddec632821 patchbomb: make it easy for the user to decline sending an intro message. Greg Ward <greg@gerg.ca> parents: 15162 diff changeset	469 bcc = getaddrs('Bcc') or []
15162 d67a15b2e608 patchbomb: simplify some contorted logic and odd variable names. Greg Ward <greg@gerg.ca> parents: 14556 diff changeset	470 replyto = getaddrs('Reply-To')
2679 f1de91be1d87 optionally send blind carbon copies Christian Ebert <blacktrash@gmx.net> parents: 2443 diff changeset	471
12201 5bfa45651cf6 patchbomb: add --confirm option to show series details and ask for confirmation Christian Ebert <blacktrash@gmx.net> parents: 12200 diff changeset	472 if opts.get('diffstat') or opts.get('confirm'):
12200 aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	473 ui.write(_('\nFinal summary:\n\n'))
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	474 ui.write('From: %s\n' % sender)
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	475 for addr in showaddrs:
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	476 ui.write('%s\n' % addr)
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	477 for m, subj, ds in msgs:
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	478 ui.write('Subject: %s\n' % subj)
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	479 if ds:
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	480 ui.write(ds)
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	481 ui.write('\n')
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	482 if ui.promptchoice(_('are you sure you want to send (yn)?'),
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	483 (_('&Yes'), _('&No'))):
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	484 raise util.Abort(_('patchbomb canceled'))
aebb39d45500 patchbomb: let diffstat prompt only once with complete summary Christian Ebert <blacktrash@gmx.net> parents: 12199 diff changeset	485
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	486 ui.write('\n')
d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	487
8025 1280934dd2dd patchbomb: Support initial in-reply-to header Henrik Stuart <henrik.stuart at edlund.dk> parents: 7997 diff changeset	488 parent = opts.get('in_reply_to') or None
8826 2aff285b902f patchbomb: do not assume the presence of angle brackets around msg-id C?dric Duval <cedricduval@free.fr> parents: 8761 diff changeset	489 # angle brackets may be omitted, they're not semantically part of the msg-id
2aff285b902f patchbomb: do not assume the presence of angle brackets around msg-id C?dric Duval <cedricduval@free.fr> parents: 8761 diff changeset	490 if parent is not None:
2aff285b902f patchbomb: do not assume the presence of angle brackets around msg-id C?dric Duval <cedricduval@free.fr> parents: 8761 diff changeset	491 if not parent.startswith('<'):
2aff285b902f patchbomb: do not assume the presence of angle brackets around msg-id C?dric Duval <cedricduval@free.fr> parents: 8761 diff changeset	492 parent = '<' + parent
2aff285b902f patchbomb: do not assume the presence of angle brackets around msg-id C?dric Duval <cedricduval@free.fr> parents: 8761 diff changeset	493 if not parent.endswith('>'):
2aff285b902f patchbomb: do not assume the presence of angle brackets around msg-id C?dric Duval <cedricduval@free.fr> parents: 8761 diff changeset	494 parent += '>'
2aff285b902f patchbomb: do not assume the presence of angle brackets around msg-id C?dric Duval <cedricduval@free.fr> parents: 8761 diff changeset	495
8514 252232621165 patchbomb: with --in-reply-to, still thread message under first in series C?dric Duval <cedricduval@free.fr> parents: 8512 diff changeset	496 first = True
2443 bd9c39e8f38b patchbomb does not handle email time stamp plattform independent Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 2292 diff changeset	497
1827 26dd4ae77b7b get patchbomb extension to use demandload. speeds up hg startup by 50%. Vadim Gelfer <vadim.gelger@gmail.com> parents: 1702 diff changeset	498 sender_addr = email.Utils.parseaddr(sender)[1]
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	499 sender = mail.addressencode(ui, sender, _charsets, opts.get('test'))
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5948 diff changeset	500 sendmail = None
12265 1ed2dc9d4368 patchbomb: show progress when sending emails or writing mbox Yuya Nishihara <yuya@tcha.org> parents: 12264 diff changeset	501 for i, (m, subj, ds) in enumerate(msgs):
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	502 try:
876 14cfaaec2e8e Get patchbomb script to not use MIME attachments. Bryan O'Sullivan <bos@serpentine.com> parents: 875 diff changeset	503 m['Message-Id'] = genmsgid(m['X-Mercurial-Node'])
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	504 except TypeError:
876 14cfaaec2e8e Get patchbomb script to not use MIME attachments. Bryan O'Sullivan <bos@serpentine.com> parents: 875 diff changeset	505 m['Message-Id'] = genmsgid('patchbomb')
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	506 if parent:
d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	507 m['In-Reply-To'] = parent
7413 0b6428da1f22 email: add References field in the header Benoit Allard <benoit@aeteurope.nl> parents: 7360 diff changeset	508 m['References'] = parent
8514 252232621165 patchbomb: with --in-reply-to, still thread message under first in series C?dric Duval <cedricduval@free.fr> parents: 8512 diff changeset	509 if first:
876 14cfaaec2e8e Get patchbomb script to not use MIME attachments. Bryan O'Sullivan <bos@serpentine.com> parents: 875 diff changeset	510 parent = m['Message-Id']
8514 252232621165 patchbomb: with --in-reply-to, still thread message under first in series C?dric Duval <cedricduval@free.fr> parents: 8512 diff changeset	511 first = False
252232621165 patchbomb: with --in-reply-to, still thread message under first in series C?dric Duval <cedricduval@free.fr> parents: 8512 diff changeset	512
8160 094e0d982c8a patchbomb: add user agent header to mails Henrik Stuart <hg@hstuart.dk> parents: 8076 diff changeset	513 m['User-Agent'] = 'Mercurial-patchbomb/%s' % util.version()
9047 8263d98ffb1c patchbomb: use local time for the Date: header C?dric Duval <cedricduval@free.fr> parents: 9046 diff changeset	514 m['Date'] = email.Utils.formatdate(start_time[0], localtime=True)
2443 bd9c39e8f38b patchbomb does not handle email time stamp plattform independent Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 2292 diff changeset	515
4027 2601ac9c54f0 patchbomb: fix timezone offset in message date header Christian Ebert <blacktrash@gmx.net> parents: 3473 diff changeset	516 start_time = (start_time[0] + 1, start_time[1])
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	517 m['From'] = sender
d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	518 m['To'] = ', '.join(to)
5785 38cd1ce8650d patchbomb: add linebreaks after colons (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5758 diff changeset	519 if cc:
38cd1ce8650d patchbomb: add linebreaks after colons (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5758 diff changeset	520 m['Cc'] = ', '.join(cc)
38cd1ce8650d patchbomb: add linebreaks after colons (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5758 diff changeset	521 if bcc:
38cd1ce8650d patchbomb: add linebreaks after colons (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5758 diff changeset	522 m['Bcc'] = ', '.join(bcc)
11150 f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	523 if replyto:
f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	524 m['Reply-To'] = ', '.join(replyto)
5818 77775ae8d5d9 patchbomb: consistently use opts.get Christian Ebert <blacktrash@gmx.net> parents: 5817 diff changeset	525 if opts.get('test'):
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	526 ui.status(_('Displaying '), subj, ' ...\n')
4596 8e37342cb05d patchbomb: flush ui before delegating to pager. Patrick Mezard <pmezard@gmail.com> parents: 4142 diff changeset	527 ui.flush()
11183 b25464e9b448 patchbomb: respect HGPLAIN when piping --test output to PAGER Yuya Nishihara <yuya@tcha.org> parents: 11150 diff changeset	528 if 'PAGER' in os.environ and not ui.plain():
6548 962eb403165b replace usage of os.popen() with util.popen() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6478 diff changeset	529 fp = util.popen(os.environ['PAGER'], 'w')
4599 88fc92b0b821 patchbomb: page patchbomb messages only if PAGER is defined. Patrick Mezard <pmezard@gmail.com> parents: 4597 diff changeset	530 else:
88fc92b0b821 patchbomb: page patchbomb messages only if PAGER is defined. Patrick Mezard <pmezard@gmail.com> parents: 4597 diff changeset	531 fp = ui
6447 9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	532 generator = email.Generator.Generator(fp, mangle_from_=False)
1871 258e3a7955b8 patchbomb: ignore exception if pager quits. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1846 diff changeset	533 try:
6447 9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	534 generator.flatten(m, 0)
1871 258e3a7955b8 patchbomb: ignore exception if pager quits. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1846 diff changeset	535 fp.write('\n')
258e3a7955b8 patchbomb: ignore exception if pager quits. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1846 diff changeset	536 except IOError, inst:
258e3a7955b8 patchbomb: ignore exception if pager quits. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1846 diff changeset	537 if inst.errno != errno.EPIPE:
258e3a7955b8 patchbomb: ignore exception if pager quits. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1846 diff changeset	538 raise
4599 88fc92b0b821 patchbomb: page patchbomb messages only if PAGER is defined. Patrick Mezard <pmezard@gmail.com> parents: 4597 diff changeset	539 if fp is not ui:
88fc92b0b821 patchbomb: page patchbomb messages only if PAGER is defined. Patrick Mezard <pmezard@gmail.com> parents: 4597 diff changeset	540 fp.close()
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 15559 diff changeset	541 else:
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 15559 diff changeset	542 if not sendmail:
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 15559 diff changeset	543 sendmail = mail.connect(ui, mbox=mbox)
15559 1830d0cc4bc1 patchbomb: minor refactoring of mbox functionality, preparing for move Mads Kiilerich <mads@kiilerich.com> parents: 15166 diff changeset	544 ui.status(_('Sending '), subj, ' ...\n')
1830d0cc4bc1 patchbomb: minor refactoring of mbox functionality, preparing for move Mads Kiilerich <mads@kiilerich.com> parents: 15166 diff changeset	545 ui.progress(_('sending'), i, item=subj, total=len(msgs))
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 15559 diff changeset	546 if not mbox:
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 15559 diff changeset	547 # Exim does not remove the Bcc field
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 15559 diff changeset	548 del m['Bcc']
6447 9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	549 fp = cStringIO.StringIO()
9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	550 generator = email.Generator.Generator(fp, mangle_from_=False)
9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	551 generator.flatten(m, 0)
15559 1830d0cc4bc1 patchbomb: minor refactoring of mbox functionality, preparing for move Mads Kiilerich <mads@kiilerich.com> parents: 15166 diff changeset	552 sendmail(sender_addr, to + bcc + cc, fp.getvalue())
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	553
12265 1ed2dc9d4368 patchbomb: show progress when sending emails or writing mbox Yuya Nishihara <yuya@tcha.org> parents: 12264 diff changeset	554 ui.progress(_('writing'), None)
1ed2dc9d4368 patchbomb: show progress when sending emails or writing mbox Yuya Nishihara <yuya@tcha.org> parents: 12264 diff changeset	555 ui.progress(_('sending'), None)

Mercurial > public > mercurial-scm > hg

annotate hgext/patchbomb.py @ 16307:17a9a1f5cee2