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

annotate hgext/patchbomb.py @ 12196:e42bc7f66e25

patchbomb: use ui.promptchoice for diffstat to allow localization of choices The extra check for ui.interacive from patchbomb's prompt function is not needed here. Format boolean prompt as in filemerge.py.

author	Christian Ebert <blacktrash@gmx.net>
date	Wed, 08 Sep 2010 08:31:07 +0200
parents	6449be7b8a3b
children	540693065d40

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
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	25 With the -d/--diffstat option, you will be prompted for each changeset
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	26 with a diffstat summary and the changeset summary, so you can be sure
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	27 you are sending the right changes.
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	28
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	29 To configure other defaults, add a section like this to your hgrc
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	30 file::
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	31
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	32 [email]
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	33 from = My Name <my@email>
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	34 to = recipient1, recipient2, ...
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	35 cc = cc1, cc2, ...
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	36 bcc = bcc1, bcc2, ...
11150 f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	37 reply-to = address1, address2, ...
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	38
10284 b08ffd27dfc8 patchbomb: document [patchbomb] config section for addresses Christian Ebert <blacktrash@gmx.net> parents: 10263 diff changeset	39 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	40 override global ``[email]`` address settings.
b08ffd27dfc8 patchbomb: document [patchbomb] config section for addresses Christian Ebert <blacktrash@gmx.net> parents: 10263 diff changeset	41
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10734 diff changeset	42 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	43 changesets as a patchbomb.
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	44
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	45 To avoid sending patches prematurely, it is a good idea to first run
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10734 diff changeset	46 the :hg:`email` command with the "-n" option (test only). You will be
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	47 prompted for an email recipient address, a subject and an introductory
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	48 message describing the patches of your patchbomb. Then when all is
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	49 done, patchbomb messages are displayed. If the PAGER environment
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	50 variable is set, your pager will be fired up once for each patchbomb
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	51 message, so you can verify everything is alright.
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	52
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	53 The -m/--mbox option is also very useful. Instead of previewing each
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	54 patchbomb message in a pager or sending the messages directly, it will
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	55 create a UNIX mailbox file with the patch emails. This mailbox file
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	56 can be previewed with any mail user agent which supports UNIX mbox
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	57 files, e.g. with mutt::
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	58
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	59 % mutt -R -f mbox
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	60
9286 a8fdcec4ab34 doc: fix quotes mismatches affecting rst C?dric Duval <cedricduval@free.fr> parents: 9269 diff changeset	61 When you are previewing the patchbomb messages, you can use ``formail``
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	62 (a utility that is commonly installed as part of the procmail
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	63 package), to send each message out::
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	64
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	65 % formail -s sendmail -bm -t < mbox
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6548 diff changeset	66
7694 2ceeb1423544 added information to patchbomb help pointing users to hgrc(5) to configure the [smtp] section in order to send patchbombs Bill Barry <after.fallout@gmail.com> parents: 7685 diff changeset	67 That should be all. Now your patchbomb is on its way out.
2ceeb1423544 added information to patchbomb help pointing users to hgrc(5) to configure the [smtp] section in order to send patchbombs Bill Barry <after.fallout@gmail.com> parents: 7685 diff changeset	68
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	69 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	70 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	71 that the patchbomb extension can automatically send patchbombs
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	72 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	73 hgrc(5) for details.
9071 141e3ef20d84 patchbomb: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 9047 diff changeset	74 '''
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	75
9046 1547126630e9 patchbomb: fix From_ in the message's envelope C?dric Duval <cedricduval@free.fr> parents: 8935 diff changeset	76 import os, errno, socket, tempfile, cStringIO, time
7192 f31ba106fc19 patchbomb: mime-encode clean utf-8 patches (issue814) Christian Ebert <blacktrash@gmx.net> parents: 7115 diff changeset	77 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	78 import email.Utils, email.Encoders, email.Generator
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11273 diff changeset	79 from mercurial import cmdutil, commands, hg, mail, patch, util, discovery
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3887 diff changeset	80 from mercurial.i18n import _
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 5973 diff changeset	81 from mercurial.node import bin
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	82
9648 6064de41b7e4 patchbomb: accept default if it is empty string Alexander Solovyov <piranha@piranha.org.ua> parents: 9647 diff changeset	83 def prompt(ui, prompt, default=None, rest=':'):
8208 32a2a1e244f1 ui: make interactive a method Matt Mackall <mpm@selenic.com> parents: 8188 diff changeset	84 if not ui.interactive():
9648 6064de41b7e4 patchbomb: accept default if it is empty string Alexander Solovyov <piranha@piranha.org.ua> parents: 9647 diff changeset	85 if default is not None:
9612 d051db8e9e44 fix patchbomb prompt when sending series of patches Alexander Solovyov <piranha@piranha.org.ua> parents: 9346 diff changeset	86 return default
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	87 raise util.Abort(_("%s Please enter a valid value" % (prompt + rest)))
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	88 if default:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	89 prompt += ' [%s]' % default
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	90 prompt += rest
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	91 while True:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	92 r = ui.prompt(prompt, default=default)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	93 if r:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	94 return r
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	95 if default is not None:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	96 return default
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	97 ui.warn(_('Please enter a valid value.\n'))
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	98
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	99 def cdiffstat(ui, summary, patchlines):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	100 s = patch.diffstat(patchlines)
7547 4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7413 diff changeset	101 if summary:
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7413 diff changeset	102 ui.write(summary, '\n')
4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7413 diff changeset	103 ui.write(s, '\n')
12196 e42bc7f66e25 patchbomb: use ui.promptchoice for diffstat to allow localization of choices Christian Ebert <blacktrash@gmx.net> parents: 12064 diff changeset	104 if ui.promptchoice(_('does the diffstat above look okay (yn)?'),
e42bc7f66e25 patchbomb: use ui.promptchoice for diffstat to allow localization of choices Christian Ebert <blacktrash@gmx.net> parents: 12064 diff changeset	105 (_('&Yes'), _('&No'))):
7547 4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7413 diff changeset	106 raise util.Abort(_('diffstat rejected'))
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	107 return s
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	108
10734 7a0502a6f9a1 patchbomb: --desc implies --intro C?dric Duval <cedricduval@free.fr> parents: 10611 diff changeset	109 def introneeded(opts, number):
7a0502a6f9a1 patchbomb: --desc implies --intro C?dric Duval <cedricduval@free.fr> parents: 10611 diff changeset	110 '''is an introductory message required?'''
7a0502a6f9a1 patchbomb: --desc implies --intro C?dric Duval <cedricduval@free.fr> parents: 10611 diff changeset	111 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	112
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	113 def makepatch(ui, repo, patch, opts, _charsets, idx, total, patchname=None):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	114
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	115 desc = []
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	116 node = None
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	117 body = ''
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	118
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	119 for line in patch:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	120 if line.startswith('#'):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	121 if line.startswith('# Node ID'):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	122 node = line.split()[-1]
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	123 continue
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	124 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	125 break
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	126 desc.append(line)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	127
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	128 if not patchname and not node:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	129 raise ValueError
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	130
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	131 if opts.get('attach'):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	132 body = ('\n'.join(desc[1:]).strip() or
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	133 'Patch subject is complete summary.')
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	134 body += '\n\n\n'
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	135
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	136 if opts.get('plain'):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	137 while patch and patch[0].startswith('# '):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	138 patch.pop(0)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	139 if patch:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	140 patch.pop(0)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	141 while patch and not patch[0].strip():
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	142 patch.pop(0)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	143
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	144 if opts.get('diffstat'):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	145 body += cdiffstat(ui, '\n'.join(desc), patch) + '\n\n'
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	146
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	147 if opts.get('attach') or opts.get('inline'):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	148 msg = email.MIMEMultipart.MIMEMultipart()
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	149 if body:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	150 msg.attach(mail.mimeencode(ui, body, _charsets, opts.get('test')))
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	151 p = mail.mimetextpatch('\n'.join(patch), 'x-patch', opts.get('test'))
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	152 binnode = bin(node)
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8520 diff changeset	153 # 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	154 if not patchname:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	155 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	156 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	157 if patchtags:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	158 patchname = patchtags[0]
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	159 elif total > 1:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	160 patchname = cmdutil.make_filename(repo, '%b-%n.patch',
7359 b0fa5dbd9cdd patchbomb: fix patch name generation in patch series Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7354 diff changeset	161 binnode, seqno=idx, total=total)
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	162 else:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	163 patchname = cmdutil.make_filename(repo, '%b.patch', binnode)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	164 disposition = 'inline'
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	165 if opts.get('attach'):
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	166 disposition = 'attachment'
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	167 p['Content-Disposition'] = disposition + '; filename=' + patchname
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	168 msg.attach(p)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	169 else:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	170 body += '\n'.join(patch)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	171 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	172
9346 bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	173 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	174 if flag:
bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	175 flag = ' ' + flag
bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	176
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	177 subj = desc[0].strip().rstrip('. ')
10734 7a0502a6f9a1 patchbomb: --desc implies --intro C?dric Duval <cedricduval@free.fr> parents: 10611 diff changeset	178 if not introneeded(opts, total):
9346 bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	179 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	180 else:
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	181 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	182 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	183 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	184 msg['X-Mercurial-Node'] = node
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	185 return msg, subj
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	186
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	187 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	188 '''send changesets by email
1204 b0f6053df539 patchbomb: continue if we can't import readline. Bryan O'Sullivan <bos@serpentine.com> parents: 1154 diff changeset	189
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11183 diff changeset	190 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	191 :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	192 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	193
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	194 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	195 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	196 The message contains two or three parts. First, the changeset
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	197 description. Next, (optionally) if the diffstat program is
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	198 installed and -d/--diffstat is used, the result of running
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	199 diffstat on the patch. Finally, the patch itself, as generated by
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10734 diff changeset	200 :hg:`export`.
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	201
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	202 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	203 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	204 an attachment for the patch. With -i/--inline an inline attachment
1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	205 will be created.
8472 223363bb6d66 patchbomb: describe --attach and --inline options in help Martin Geisler <mg@lazybytes.net> parents: 8471 diff changeset	206
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	207 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	208 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	209 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	210
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	211 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	212 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	213 will be sent.
4280 a9336520a4ee Improve documentation for patchbomb and email John Goerzen <jgoerzen@complete.org> parents: 4279 diff changeset	214
9289 45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	215 Examples::
4280 a9336520a4ee Improve documentation for patchbomb and email John Goerzen <jgoerzen@complete.org> parents: 4279 diff changeset	216
9289 45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	217 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	218 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	219 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	220 hg email 3000 # send patch 3000 (deprecated)
4280 a9336520a4ee Improve documentation for patchbomb and email John Goerzen <jgoerzen@complete.org> parents: 4279 diff changeset	221
9289 45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	222 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	223 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	224 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	225 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	226
9289 45aaf27f95b8 patchbomb: reST syntax for literal blocks in help text Christian Ebert <blacktrash@gmx.net> parents: 9286 diff changeset	227 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	228 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	229 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	230 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	231
9269 1d6499adf211 patchbomb: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9214 diff changeset	232 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	233 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	234 '''
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	235
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	236 _charsets = mail._charsets(ui)
c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	237
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	238 bundle = opts.get('bundle')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	239 date = opts.get('date')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	240 mbox = opts.get('mbox')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	241 outgoing = opts.get('outgoing')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	242 rev = opts.get('rev')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	243 # internal option used by pbranches
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	244 patches = opts.get('patches')
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	245
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	246 def getoutgoing(dest, revs):
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	247 '''Return the revisions present locally but not in dest'''
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	248 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	249 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	250 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
10022 585f51f8b5f0 patchbomb: fix bug introduced in 4ddfad7ebd98 and add test Sune Foldager <cryo@cyanite.org> parents: 10018 diff changeset	251 if revs:
585f51f8b5f0 patchbomb: fix bug introduced in 4ddfad7ebd98 and add test Sune Foldager <cryo@cyanite.org> parents: 10018 diff changeset	252 revs = [repo.lookup(rev) for rev in revs]
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11193 diff changeset	253 other = hg.repository(hg.remoteui(repo, opts), dest)
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	254 ui.status(_('comparing with %s\n') % dest)
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11273 diff changeset	255 o = discovery.findoutgoing(repo, other)
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	256 if not o:
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	257 ui.status(_("no changes found\n"))
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	258 return []
10022 585f51f8b5f0 patchbomb: fix bug introduced in 4ddfad7ebd98 and add test Sune Foldager <cryo@cyanite.org> parents: 10018 diff changeset	259 o = repo.changelog.nodesbetween(o, revs)[0]
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	260 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	261
7615 ab39d1813e51 patch: export shouldn't close files received as a parameter Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7600 diff changeset	262 def getpatches(revs):
ab39d1813e51 patch: export shouldn't close files received as a parameter Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7600 diff changeset	263 for r in cmdutil.revrange(repo, revs):
ab39d1813e51 patch: export shouldn't close files received as a parameter Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7600 diff changeset	264 output = cStringIO.StringIO()
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10365 diff changeset	265 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	266 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	267 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	268
4279 126d1967a3f8 Add common bundle/outgoing options to hg email John Goerzen <jgoerzen@complete.org> parents: 4278 diff changeset	269 def getbundle(dest):
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	270 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	271 tmpfn = os.path.join(tmpdir, 'bundle')
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	272 try:
4279 126d1967a3f8 Add common bundle/outgoing options to hg email John Goerzen <jgoerzen@complete.org> parents: 4278 diff changeset	273 commands.bundle(ui, repo, tmpfn, dest, **opts)
5752 84a6e463b948 patchbomb: read bundle file in binary mode Patrick Mezard <pmezard@gmail.com> parents: 5643 diff changeset	274 return open(tmpfn, 'rb').read()
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	275 finally:
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	276 try:
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	277 os.unlink(tmpfn)
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	278 except:
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	279 pass
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	280 os.rmdir(tmpdir)
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	281
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	282 if not (opts.get('test') or mbox):
5472 23889160905a Catch smtp exceptions Christian Ebert <blacktrash@gmx.net> parents: 4887 diff changeset	283 # really sending
4489 a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4486 diff changeset	284 mail.validateconfig(ui)
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4486 diff changeset	285
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	286 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	287 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	288
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	289 if outgoing and bundle:
5746 d3ef7e86bc3b patchbomb: break lines > 80 chars (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5677 diff changeset	290 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	291 " do not re-specify --outgoing"))
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	292
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	293 if outgoing or bundle:
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	294 if len(revs) > 1:
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	295 raise util.Abort(_("too many destinations"))
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	296 dest = revs and revs[0] or None
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	297 revs = []
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	298
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	299 if rev:
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	300 if revs:
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	301 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	302 revs = rev
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	303
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	304 if outgoing:
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	305 revs = getoutgoing(dest, rev)
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	306 if bundle:
4279 126d1967a3f8 Add common bundle/outgoing options to hg email John Goerzen <jgoerzen@complete.org> parents: 4278 diff changeset	307 opts['revs'] = revs
4262 f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	308
f51317e24114 Add --outgoing option to patchbomb Brendan Cully <brendan@kublai.com> parents: 4144 diff changeset	309 # start
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	310 if date:
4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	311 start_time = util.parsedate(date)
4566 087b3ae4f08a patchbomb: add --date option Bryan O'Sullivan <bos@serpentine.com> parents: 4565 diff changeset	312 else:
087b3ae4f08a patchbomb: add --date option Bryan O'Sullivan <bos@serpentine.com> parents: 4565 diff changeset	313 start_time = util.makedate()
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	314
876 14cfaaec2e8e Get patchbomb script to not use MIME attachments. Bryan O'Sullivan <bos@serpentine.com> parents: 875 diff changeset	315 def genmsgid(id):
4027 2601ac9c54f0 patchbomb: fix timezone offset in message date header Christian Ebert <blacktrash@gmx.net> parents: 3473 diff changeset	316 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	317
5753 ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	318 def getdescription(body, sender):
5818 77775ae8d5d9 patchbomb: consistently use opts.get Christian Ebert <blacktrash@gmx.net> parents: 5817 diff changeset	319 if opts.get('desc'):
77775ae8d5d9 patchbomb: consistently use opts.get Christian Ebert <blacktrash@gmx.net> parents: 5817 diff changeset	320 body = open(opts.get('desc')).read()
5753 ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	321 else:
ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	322 ui.write(_('\nWrite the introductory message for the '
ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	323 'patch series.\n\n'))
ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	324 body = ui.edit(body, sender)
ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	325 return body
ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	326
7353 982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	327 def getpatchmsgs(patches, patchnames=None):
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	328 jumbo = []
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	329 msgs = []
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	330
5746 d3ef7e86bc3b patchbomb: break lines > 80 chars (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5677 diff changeset	331 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	332 % len(patches))
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	333
7353 982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	334 name = None
7616 b9bd6f789633 use enumerate instead of zip Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7615 diff changeset	335 for i, p in enumerate(patches):
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	336 jumbo.extend(p)
7353 982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	337 if patchnames:
982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	338 name = patchnames[i]
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	339 msg = makepatch(ui, repo, p, opts, _charsets, i + 1,
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	340 len(patches), name)
cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	341 msgs.append(msg)
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	342
10734 7a0502a6f9a1 patchbomb: --desc implies --intro C?dric Duval <cedricduval@free.fr> parents: 10611 diff changeset	343 if introneeded(opts, len(patches)):
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	344 tlen = len(str(len(patches)))
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	345
9346 bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	346 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	347 if flag:
9647 f69fd20d788d patchbomb: fix double-spaces in prompts Martin Geisler <mg@lazybytes.net> parents: 9612 diff changeset	348 subj = '[PATCH %0*d of %d %s]' % (tlen, 0, len(patches), flag)
9346 bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	349 else:
9647 f69fd20d788d patchbomb: fix double-spaces in prompts Martin Geisler <mg@lazybytes.net> parents: 9612 diff changeset	350 subj = '[PATCH %0*d of %d]' % (tlen, 0, len(patches))
f69fd20d788d patchbomb: fix double-spaces in prompts Martin Geisler <mg@lazybytes.net> parents: 9612 diff changeset	351 subj += ' ' + (opts.get('subject') or
f69fd20d788d patchbomb: fix double-spaces in prompts Martin Geisler <mg@lazybytes.net> parents: 9612 diff changeset	352 prompt(ui, 'Subject: ', rest=subj))
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	353
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	354 body = ''
5818 77775ae8d5d9 patchbomb: consistently use opts.get Christian Ebert <blacktrash@gmx.net> parents: 5817 diff changeset	355 if opts.get('diffstat'):
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	356 d = cdiffstat(ui, _('Final summary:\n'), jumbo)
5785 38cd1ce8650d patchbomb: add linebreaks after colons (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5758 diff changeset	357 if d:
38cd1ce8650d patchbomb: add linebreaks after colons (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5758 diff changeset	358 body = '\n' + d
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	359
5753 ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	360 body = getdescription(body, sender)
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	361 msg = mail.mimeencode(ui, body, _charsets, opts.get('test'))
c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	362 msg['Subject'] = mail.headencode(ui, subj, _charsets,
c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	363 opts.get('test'))
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	364
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	365 msgs.insert(0, (msg, subj))
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	366 return msgs
2704 99e7cf6bd2f7 make introductory message of patch series text/plain Christian Ebert <blacktrash@gmx.net> parents: 2443 diff changeset	367
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	368 def getbundlemsgs(bundle):
5818 77775ae8d5d9 patchbomb: consistently use opts.get Christian Ebert <blacktrash@gmx.net> parents: 5817 diff changeset	369 subj = (opts.get('subject')
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	370 or prompt(ui, 'Subject:', 'A bundle for your repository'))
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	371
5753 ea1016b32e94 patchbomb: make --bundle respect --desc Patrick Mezard <pmezard@gmail.com> parents: 5752 diff changeset	372 body = getdescription('', sender)
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	373 msg = email.MIMEMultipart.MIMEMultipart()
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	374 if body:
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	375 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	376 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	377 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	378 bundlename = '%s.hg' % opts.get('bundlename', 'bundle')
4284 a04141f51056 Add a filename for the bundle John Goerzen <jgoerzen@complete.org> parents: 4283 diff changeset	379 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	380 filename=bundlename)
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	381 email.Encoders.encode_base64(datapart)
cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	382 msg.attach(datapart)
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	383 msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get('test'))
c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	384 return [(msg, subj)]
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	385
5818 77775ae8d5d9 patchbomb: consistently use opts.get Christian Ebert <blacktrash@gmx.net> parents: 5817 diff changeset	386 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	387 ui.config('patchbomb', 'from') or
7354 cad454f295b0 patchbomb: extract a bunch of nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7353 diff changeset	388 prompt(ui, 'From', ui.username()))
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	389
7353 982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	390 if patches:
982b55ec80be patchbomb: make `hg email` reusable for other patch sources Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7352 diff changeset	391 msgs = getpatchmsgs(patches, opts.get('patchnames'))
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	392 elif bundle:
4279 126d1967a3f8 Add common bundle/outgoing options to hg email John Goerzen <jgoerzen@complete.org> parents: 4278 diff changeset	393 msgs = getbundlemsgs(getbundle(dest))
4278 cfe886c14ddf Add ability to send bundles to patchbomb extension John Goerzen <jgoerzen@complete.org> parents: 4262 diff changeset	394 else:
7615 ab39d1813e51 patch: export shouldn't close files received as a parameter Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7600 diff changeset	395 msgs = getpatchmsgs(list(getpatches(revs)))
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	396
9947 4600e6222efb patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Marti Raudsepp <marti@juffo.org> parents: 9818 diff changeset	397 def getaddrs(opt, prpt=None, default=None):
11150 f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	398 addrs = opts.get(opt.replace('-', '_'))
f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	399 if addrs:
f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	400 return mail.addrlistencode(ui, addrs, _charsets,
9947 4600e6222efb patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Marti Raudsepp <marti@juffo.org> parents: 9818 diff changeset	401 opts.get('test'))
4600e6222efb patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Marti Raudsepp <marti@juffo.org> parents: 9818 diff changeset	402
12064 6449be7b8a3b patchbomb: remove unneeded line continuation Christian Ebert <blacktrash@gmx.net> parents: 11413 diff changeset	403 addrs = ui.config('email', opt) or ui.config('patchbomb', opt) or ''
9947 4600e6222efb patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Marti Raudsepp <marti@juffo.org> parents: 9818 diff changeset	404 if not addrs and prpt:
4600e6222efb patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Marti Raudsepp <marti@juffo.org> parents: 9818 diff changeset	405 addrs = prompt(ui, prpt, default)
4600e6222efb patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Marti Raudsepp <marti@juffo.org> parents: 9818 diff changeset	406
4600e6222efb patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Marti Raudsepp <marti@juffo.org> parents: 9818 diff changeset	407 return mail.addrlistencode(ui, [addrs], _charsets, opts.get('test'))
4485 82bc6aef8b43 patchbomb: Don't prompt for headers until sure we have revs to export. Bryan O'Sullivan <bos@serpentine.com> parents: 4284 diff changeset	408
1154 c3cb9f39a91f patchbomb: fix up confusion between strings and lists of strings. bos@serpentine.internal.keyresearch.com parents: 1136 diff changeset	409 to = getaddrs('to', 'To')
c3cb9f39a91f patchbomb: fix up confusion between strings and lists of strings. bos@serpentine.internal.keyresearch.com parents: 1136 diff changeset	410 cc = getaddrs('cc', 'Cc', '')
9947 4600e6222efb patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Marti Raudsepp <marti@juffo.org> parents: 9818 diff changeset	411 bcc = getaddrs('bcc')
11150 f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	412 replyto = getaddrs('reply-to')
2679 f1de91be1d87 optionally send blind carbon copies Christian Ebert <blacktrash@gmx.net> parents: 2443 diff changeset	413
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	414 ui.write('\n')
d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	415
8025 1280934dd2dd patchbomb: Support initial in-reply-to header Henrik Stuart <henrik.stuart at edlund.dk> parents: 7997 diff changeset	416 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	417 # 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	418 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	419 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	420 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	421 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	422 parent += '>'
2aff285b902f patchbomb: do not assume the presence of angle brackets around msg-id C?dric Duval <cedricduval@free.fr> parents: 8761 diff changeset	423
8514 252232621165 patchbomb: with --in-reply-to, still thread message under first in series C?dric Duval <cedricduval@free.fr> parents: 8512 diff changeset	424 first = True
2443 bd9c39e8f38b patchbomb does not handle email time stamp plattform independent Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 2292 diff changeset	425
1827 26dd4ae77b7b get patchbomb extension to use demandload. speeds up hg startup by 50%. Vadim Gelfer <vadim.gelger@gmail.com> parents: 1702 diff changeset	426 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	427 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	428 sendmail = None
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	429 for m, subj in msgs:
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	430 try:
876 14cfaaec2e8e Get patchbomb script to not use MIME attachments. Bryan O'Sullivan <bos@serpentine.com> parents: 875 diff changeset	431 m['Message-Id'] = genmsgid(m['X-Mercurial-Node'])
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	432 except TypeError:
876 14cfaaec2e8e Get patchbomb script to not use MIME attachments. Bryan O'Sullivan <bos@serpentine.com> parents: 875 diff changeset	433 m['Message-Id'] = genmsgid('patchbomb')
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	434 if parent:
d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	435 m['In-Reply-To'] = parent
7413 0b6428da1f22 email: add References field in the header Benoit Allard <benoit@aeteurope.nl> parents: 7360 diff changeset	436 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	437 if first:
876 14cfaaec2e8e Get patchbomb script to not use MIME attachments. Bryan O'Sullivan <bos@serpentine.com> parents: 875 diff changeset	438 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	439 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	440
8160 094e0d982c8a patchbomb: add user agent header to mails Henrik Stuart <hg@hstuart.dk> parents: 8076 diff changeset	441 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	442 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	443
4027 2601ac9c54f0 patchbomb: fix timezone offset in message date header Christian Ebert <blacktrash@gmx.net> parents: 3473 diff changeset	444 start_time = (start_time[0] + 1, start_time[1])
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	445 m['From'] = sender
d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	446 m['To'] = ', '.join(to)
5785 38cd1ce8650d patchbomb: add linebreaks after colons (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5758 diff changeset	447 if cc:
38cd1ce8650d patchbomb: add linebreaks after colons (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5758 diff changeset	448 m['Cc'] = ', '.join(cc)
38cd1ce8650d patchbomb: add linebreaks after colons (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5758 diff changeset	449 if bcc:
38cd1ce8650d patchbomb: add linebreaks after colons (coding style) Christian Ebert <blacktrash@gmx.net> parents: 5758 diff changeset	450 m['Bcc'] = ', '.join(bcc)
11150 f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	451 if replyto:
f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	452 m['Reply-To'] = ', '.join(replyto)
5818 77775ae8d5d9 patchbomb: consistently use opts.get Christian Ebert <blacktrash@gmx.net> parents: 5817 diff changeset	453 if opts.get('test'):
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	454 ui.status(_('Displaying '), subj, ' ...\n')
4596 8e37342cb05d patchbomb: flush ui before delegating to pager. Patrick Mezard <pmezard@gmail.com> parents: 4142 diff changeset	455 ui.flush()
11183 b25464e9b448 patchbomb: respect HGPLAIN when piping --test output to PAGER Yuya Nishihara <yuya@tcha.org> parents: 11150 diff changeset	456 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	457 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	458 else:
88fc92b0b821 patchbomb: page patchbomb messages only if PAGER is defined. Patrick Mezard <pmezard@gmail.com> parents: 4597 diff changeset	459 fp = ui
6447 9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	460 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	461 try:
6447 9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	462 generator.flatten(m, 0)
1871 258e3a7955b8 patchbomb: ignore exception if pager quits. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1846 diff changeset	463 fp.write('\n')
258e3a7955b8 patchbomb: ignore exception if pager quits. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1846 diff changeset	464 except IOError, inst:
258e3a7955b8 patchbomb: ignore exception if pager quits. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1846 diff changeset	465 if inst.errno != errno.EPIPE:
258e3a7955b8 patchbomb: ignore exception if pager quits. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1846 diff changeset	466 raise
4599 88fc92b0b821 patchbomb: page patchbomb messages only if PAGER is defined. Patrick Mezard <pmezard@gmail.com> parents: 4597 diff changeset	467 if fp is not ui:
88fc92b0b821 patchbomb: page patchbomb messages only if PAGER is defined. Patrick Mezard <pmezard@gmail.com> parents: 4597 diff changeset	468 fp.close()
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	469 elif mbox:
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	470 ui.status(_('Writing '), subj, ' ...\n')
11413 4c1fe996838c patchbomb: reduce number of opts.get calls Christian Ebert <blacktrash@gmx.net> parents: 11321 diff changeset	471 fp = open(mbox, 'In-Reply-To' in m and 'ab+' or 'wb+')
6447 9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	472 generator = email.Generator.Generator(fp, mangle_from_=True)
9818 72d670c43f6e patchbomb: normalize date format in generated mboxes Patrick Mezard <pmezard@gmail.com> parents: 9648 diff changeset	473 # Should be time.asctime(), but Windows prints 2-characters day
72d670c43f6e patchbomb: normalize date format in generated mboxes Patrick Mezard <pmezard@gmail.com> parents: 9648 diff changeset	474 # of month instead of one. Make them print the same thing.
72d670c43f6e patchbomb: normalize date format in generated mboxes Patrick Mezard <pmezard@gmail.com> parents: 9648 diff changeset	475 date = time.strftime('%a %b %d %H:%M:%S %Y',
72d670c43f6e patchbomb: normalize date format in generated mboxes Patrick Mezard <pmezard@gmail.com> parents: 9648 diff changeset	476 time.localtime(start_time[0]))
1702 e291d9a30bef add --mbox output to patchbomb Johannes Stezenbach <js@linuxtv.org> parents: 1691 diff changeset	477 fp.write('From %s %s\n' % (sender_addr, date))
6447 9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	478 generator.flatten(m, 0)
1702 e291d9a30bef add --mbox output to patchbomb Johannes Stezenbach <js@linuxtv.org> parents: 1691 diff changeset	479 fp.write('\n\n')
e291d9a30bef add --mbox output to patchbomb Johannes Stezenbach <js@linuxtv.org> parents: 1691 diff changeset	480 fp.close()
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	481 else:
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5948 diff changeset	482 if not sendmail:
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5948 diff changeset	483 sendmail = mail.connect(ui)
7115 c5c2d43b01da patchbomb: mime-encode headers and parts not containing patches Christian Ebert <blacktrash@gmx.net> parents: 7095 diff changeset	484 ui.status(_('Sending '), subj, ' ...\n')
2790 58a679745b38 mailbomb: add a comment and remove the bcc in a more pythonic way Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2732 diff changeset	485 # Exim does not remove the Bcc field
58a679745b38 mailbomb: add a comment and remove the bcc in a more pythonic way Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2732 diff changeset	486 del m['Bcc']
6447 9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	487 fp = cStringIO.StringIO()
9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	488 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	489 generator.flatten(m, 0)
9d2ce19bdacd patchbomb: Fix mangling of lines beginning with From Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6229 diff changeset	490 sendmail(sender, to + bcc + cc, fp.getvalue())
875 d3f836bf6cc1 Add patchbomb script. Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	491
7352 6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	492 emailopts = [
6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	493 ('a', 'attach', None, _('send patches as attachments')),
5819 89ea99c7bdfd patchbomb: attachment options changed Dennis Schoen <ds@1d10t.de> parents: 5818 diff changeset	494 ('i', 'inline', None, _('send patches as inline attachments')),
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7694 diff changeset	495 ('', 'bcc', [], _('email addresses of blind carbon copy recipients')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	496 ('c', 'cc', [], _('email addresses of copy recipients')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	497 ('d', 'diffstat', None, _('add diffstat output to messages')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	498 ('', 'date', '', _('use the given date as the sending date')),
4887 2f09df302f30 patchbomb: add --desc, to specify a file containing a series description Bryan O'Sullivan <bos@serpentine.com> parents: 4730 diff changeset	499 ('', 'desc', '', _('use the given file as the series description')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	500 ('f', 'from', '', _('email address of sender')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	501 ('n', 'test', None, _('print messages that would be sent')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	502 ('m', 'mbox', '',
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	503 _('write messages to mbox file instead of sending them')),
11150 f66ca4431eb9 patchbomb: Reply-To support C?dric Duval <cedricduval@free.fr> parents: 10973 diff changeset	504 ('', 'reply-to', [], _('email addresses replies should be sent to')),
7352 6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	505 ('s', 'subject', '',
6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	506 _('subject of first message (intro or single patch)')),
8025 1280934dd2dd patchbomb: Support initial in-reply-to header Henrik Stuart <henrik.stuart at edlund.dk> parents: 7997 diff changeset	507 ('', 'in-reply-to', '',
8331 03cfc6ea93df patchbomb: fix quotes in help string Martin Geisler <mg@lazybytes.net> parents: 8252 diff changeset	508 _('message identifier to reply to')),
9346 bb3f8f692bc6 patchbomb: add --flag to put flags in subject prefixes Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9300 diff changeset	509 ('', 'flag', [], _('flags to add in subject prefixes')),
7352 6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	510 ('t', 'to', [], _('email addresses of recipients')),
6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	511 ]
6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	512
6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	513
6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	514 cmdtable = {
6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	515 "email":
6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	516 (patchbomb,
6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	517 [('g', 'git', None, _('use git extended diff format')),
6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	518 ('', 'plain', None, _('omit hg patch header')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	519 ('o', 'outgoing', None,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	520 _('send changes not found in the target repository')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	521 ('b', 'bundle', None,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	522 _('send changes not in target as a binary bundle')),
7889 5ac1a72e5b74 patchbomb: option to set the name of bundle attachment (issue1452) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7874 diff changeset	523 ('', 'bundlename', 'bundle',
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11301 diff changeset	524 _('name of the bundle attachment file'), _('NAME')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11301 diff changeset	525 ('r', 'rev', [],
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11301 diff changeset	526 _('a revision to send'), _('REV')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	527 ('', 'force', None,
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8025 diff changeset	528 _('run even when remote repository is unrelated '
5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8025 diff changeset	529 '(with -b/--bundle)')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	530 ('', 'base', [],
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8025 diff changeset	531 _('a base changeset to specify instead of a destination '
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11301 diff changeset	532 '(with -b/--bundle)'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11301 diff changeset	533 _('REV')),
7360 42f1b8cb9a60 patchbomb: add option to send intro email for a single patch (issue1120) Chris Winter <elwintro@gmail.com> parents: 7359 diff changeset	534 ('', 'intro', None,
42f1b8cb9a60 patchbomb: add option to send intro email for a single patch (issue1120) Chris Winter <elwintro@gmail.com> parents: 7359 diff changeset	535 _('send an introduction email for a single patch')),
7352 6c336e7dc145 patchbomb: make options to email command reusable Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7322 diff changeset	536 ] + emailopts + commands.remoteopts,
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	537 _('hg email [OPTION]... [DEST]...'))
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	538 }

Mercurial > public > mercurial-scm > hg

annotate hgext/patchbomb.py @ 12196:e42bc7f66e25