##// END OF EJS Templates
merge with i18n
merge with i18n

File last commit:

r21282:697fba94 default
r21699:269c80ee merge 3.0.1 stable
Show More
patchbomb.py
569 lines | 21.2 KiB | text/x-python | PythonLexer
Martin Geisler
patchbomb: add copyright and license header
r8252 # patchbomb.py - sending Mercurial changesets as patch emails
#
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Martin Geisler
patchbomb: add copyright and license header
r8252
Dirkjan Ochtman
extensions: change descriptions for hook-providing extensions...
r8935 '''command to send changesets as (a series of) patch emails
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Martin Geisler
patchbomb: word-wrap help texts at 70 characters
r7997 The series is started off with a "[PATCH 0 of N]" introduction, which
describes the series as a whole.
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 Each patch email has a Subject line of "[PATCH M of N] ...", using the
first line of the changeset description as the subject text. The
message contains two or three body parts:
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Martin Geisler
patchbomb: use a list instead of indented paragraphs
r9300 - The changeset description.
- [Optional] The result of running diffstat on the patch.
Martin Geisler
Use hg role in help strings
r10973 - The patch itself, as generated by :hg:`export`.
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 Each message refers to the first in the series using the In-Reply-To
and References headers, so they will show up as a sequence in threaded
mail and news readers, and in mail archives.
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Martin Geisler
patchbomb, help/hgweb: do not refer to config files as hgrc files
r13838 To configure other defaults, add a section like this to your
configuration file::
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
[email]
from = My Name <my@email>
to = recipient1, recipient2, ...
cc = cc1, cc2, ...
bcc = bcc1, bcc2, ...
Cédric Duval
patchbomb: Reply-To support...
r11150 reply-to = address1, address2, ...
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Christian Ebert
patchbomb: document [patchbomb] config section for addresses
r10284 Use ``[patchbomb]`` as configuration section name if you need to
override global ``[email]`` address settings.
Martin Geisler
Use hg role in help strings
r10973 Then you can use the :hg:`email` command to mail a series of
changesets as a patchbomb.
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 You can also either configure the method option in the email section
to be a sendmail compatible mailer or fill out the [smtp] section so
that the patchbomb extension can automatically send patchbombs
directly from the commandline. See the [email] and [smtp] sections in
hgrc(5) for details.
Martin Geisler
patchbomb: wrapped docstrings at 78 characters
r9071 '''
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 import os, errno, socket, tempfile, cStringIO
Augie Fackler
patchbomb: correct import of email module
r19791 import email
Augie Fackler
python2.4: fix imports of sub-packages of the email package...
r19810 # On python2.4 you have to import these by name or they fail to
# load. This was not a problem on Python 2.7.
import email.Generator
import email.MIMEMultipart
Patrick Mezard
patchbomb: rewrite getoutgoing() with revsets...
r17178 from mercurial import cmdutil, commands, hg, mail, patch, util
Matt Mackall
scmutil: move revsingle/pair/range from cmdutil...
r14319 from mercurial import scmutil
Matt Mackall
Simplify i18n imports
r3891 from mercurial.i18n import _
Joel Rosdahl
Expand import * to allow Pyflakes to find problems
r6211 from mercurial.node import bin
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Adrian Buehlmann
patchbomb: use cmdutil.command decorator
r14309 cmdtable = {}
command = cmdutil.command(cmdtable)
Augie Fackler
hgext: mark all first-party extensions as such
r16743 testedwith = 'internal'
Adrian Buehlmann
patchbomb: use cmdutil.command decorator
r14309
Alexander Solovyov
patchbomb: accept default if it is empty string...
r9648 def prompt(ui, prompt, default=None, rest=':'):
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 if default:
prompt += ' [%s]' % default
Matt Mackall
patchbomb: drop loop in prompt...
r15166 return ui.prompt(prompt + rest, default)
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 def introwanted(opts, number):
'''is an introductory message apparently wanted?'''
Cédric Duval
patchbomb: --desc implies --intro...
r10734 return number > 1 or opts.get('intro') or opts.get('desc')
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 def makepatch(ui, repo, patchlines, opts, _charsets, idx, total, numbered,
Martin Geisler
patchbomb: rename argument to avoid shadowing patch module
r12199 patchname=None):
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354
desc = []
node = None
body = ''
Martin Geisler
patchbomb: rename argument to avoid shadowing patch module
r12199 for line in patchlines:
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 if line.startswith('#'):
if line.startswith('# Node ID'):
node = line.split()[-1]
continue
if line.startswith('diff -r') or line.startswith('diff --git'):
break
desc.append(line)
if not patchname and not node:
raise ValueError
Angel Ezquerra
patchbomb: add --body flag to send patches as inline message body text...
r16307 if opts.get('attach') and not opts.get('body'):
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 body = ('\n'.join(desc[1:]).strip() or
'Patch subject is complete summary.')
body += '\n\n\n'
if opts.get('plain'):
Martin Geisler
patchbomb: rename argument to avoid shadowing patch module
r12199 while patchlines and patchlines[0].startswith('# '):
patchlines.pop(0)
if patchlines:
patchlines.pop(0)
while patchlines and not patchlines[0].strip():
patchlines.pop(0)
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354
Idan Kamara
patchbomb: pass --git argument to diffstat
r14397 ds = patch.diffstat(patchlines, git=opts.get('git'))
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 if opts.get('diffstat'):
Christian Ebert
patchbomb: let diffstat prompt only once with complete summary...
r12200 body += ds + '\n\n'
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354
Angel Ezquerra
patchbomb: add --body flag to send patches as inline message body text...
r16307 addattachment = opts.get('attach') or opts.get('inline')
if not addattachment or opts.get('body'):
body += '\n'.join(patchlines)
if addattachment:
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 msg = email.MIMEMultipart.MIMEMultipart()
if body:
msg.attach(mail.mimeencode(ui, body, _charsets, opts.get('test')))
Brodie Rao
cleanup: eradicate long lines
r16683 p = mail.mimetextpatch('\n'.join(patchlines), 'x-patch',
opts.get('test'))
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 binnode = bin(node)
timeless
Generally replace "file name" with "filename" in help and comments.
r8761 # if node is mq patch, it will have the patch file's name as a tag
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 if not patchname:
patchtags = [t for t in repo.nodetags(binnode)
if t.endswith('.patch') or t.endswith('.diff')]
if patchtags:
patchname = patchtags[0]
elif total > 1:
Matt Mackall
cmdutil: make_filename -> makefilename
r14290 patchname = cmdutil.makefilename(repo, '%b-%n.patch',
Brodie Rao
cleanup: eradicate long lines
r16683 binnode, seqno=idx,
total=total)
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 else:
Matt Mackall
cmdutil: make_filename -> makefilename
r14290 patchname = cmdutil.makefilename(repo, '%b.patch', binnode)
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 disposition = 'inline'
if opts.get('attach'):
disposition = 'attachment'
p['Content-Disposition'] = disposition + '; filename=' + patchname
msg.attach(p)
else:
msg = mail.mimetextpatch(body, display=opts.get('test'))
Nicolas Dumazet
patchbomb: add --flag to put flags in subject prefixes...
r9346 flag = ' '.join(opts.get('flag'))
if flag:
flag = ' ' + flag
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 subj = desc[0].strip().rstrip('. ')
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 if not numbered:
Nicolas Dumazet
patchbomb: add --flag to put flags in subject prefixes...
r9346 subj = '[PATCH%s] %s' % (flag, opts.get('subject') or subj)
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 else:
tlen = len(str(total))
Nicolas Dumazet
patchbomb: add --flag to put flags in subject prefixes...
r9346 subj = '[PATCH %0*d of %d%s] %s' % (tlen, idx, total, flag, subj)
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get('test'))
msg['X-Mercurial-Node'] = node
Christian Ebert
patchbomb: let diffstat prompt only once with complete summary...
r12200 return msg, subj, ds
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354
Adrian Buehlmann
patchbomb: use cmdutil.command decorator
r14309 emailopts = [
Angel Ezquerra
patchbomb: add --body flag to send patches as inline message body text...
r16307 ('', 'body', None, _('send patches as inline message text (default)')),
Adrian Buehlmann
patchbomb: use cmdutil.command decorator
r14309 ('a', 'attach', None, _('send patches as attachments')),
('i', 'inline', None, _('send patches as inline attachments')),
('', 'bcc', [], _('email addresses of blind carbon copy recipients')),
('c', 'cc', [], _('email addresses of copy recipients')),
('', 'confirm', None, _('ask for confirmation before sending')),
('d', 'diffstat', None, _('add diffstat output to messages')),
('', 'date', '', _('use the given date as the sending date')),
('', 'desc', '', _('use the given file as the series description')),
('f', 'from', '', _('email address of sender')),
('n', 'test', None, _('print messages that would be sent')),
('m', 'mbox', '', _('write messages to mbox file instead of sending them')),
('', 'reply-to', [], _('email addresses replies should be sent to')),
('s', 'subject', '', _('subject of first message (intro or single patch)')),
('', 'in-reply-to', '', _('message identifier to reply to')),
('', 'flag', [], _('flags to add in subject prefixes')),
('t', 'to', [], _('email addresses of recipients'))]
@command('email',
[('g', 'git', None, _('use git extended diff format')),
('', 'plain', None, _('omit hg patch header')),
('o', 'outgoing', None,
_('send changes not found in the target repository')),
('b', 'bundle', None, _('send changes not in target as a binary bundle')),
('', 'bundlename', 'bundle',
_('name of the bundle attachment file'), _('NAME')),
('r', 'rev', [], _('a revision to send'), _('REV')),
('', 'force', None, _('run even when remote repository is unrelated '
'(with -b/--bundle)')),
('', 'base', [], _('a base changeset to specify instead of a destination '
'(with -b/--bundle)'), _('REV')),
('', 'intro', None, _('send an introduction email for a single patch')),
] + emailopts + commands.remoteopts,
_('hg email [OPTION]... [DEST]...'))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 def patchbomb(ui, repo, *revs, **opts):
John Goerzen
Slight refining to help text in patchbomb.py
r4283 '''send changesets by email
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Martin Geisler
Use our custom hg reStructuredText role some more...
r11193 By default, diffs are sent in the format generated by
:hg:`export`, one per message. The series starts with a "[PATCH 0
of N]" introduction, which describes the series as a whole.
Vadim Gelfer
add documentation for email command.
r1672
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 Each patch email has a Subject line of "[PATCH M of N] ...", using
the first line of the changeset description as the subject text.
The message contains two or three parts. First, the changeset
timeless
patchbomb: move command option help from the extension (patchbomb) to the command (email)
r12749 description.
With the -d/--diffstat option, if the diffstat program is
installed, the result of running diffstat on the patch is inserted.
Finally, the patch itself, as generated by :hg:`export`.
Julian Cowley
patchbomb: -c is not an alias for the --confirm option...
r17880 With the -d/--diffstat or --confirm options, you will be presented
timeless
patchbomb: move command option help from the extension (patchbomb) to the command (email)
r12749 with a final summary of all messages and asked for confirmation before
the messages are sent.
Brendan Cully
Add --outgoing option to patchbomb
r4262
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 By default the patch is included as text in the email body for
easy reviewing. Using the -a/--attach option will instead create
an attachment for the patch. With -i/--inline an inline attachment
Angel Ezquerra
patchbomb: add --body flag to send patches as inline message body text...
r16307 will be created. You can include a patch both as text in the email
body and as a regular or an inline attachment by combining the
-a/--attach or -i/--inline with the --body option.
Martin Geisler
patchbomb: describe --attach and --inline options in help
r8472
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 With -o/--outgoing, emails will be generated for patches not found
in the destination repository (or only those which are ancestors
of the specified revisions if any are provided)
John Goerzen
Improve documentation for patchbomb and email
r4280
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 With -b/--bundle, changesets are selected as for --outgoing, but a
single email containing a binary Mercurial bundle as an attachment
will be sent.
John Goerzen
Improve documentation for patchbomb and email
r4280
timeless
patchbomb: move command option help from the extension (patchbomb) to the command (email)
r12749 With -m/--mbox, instead of previewing each patchbomb message in a
pager or sending the messages directly, it will create a UNIX
mailbox file with the patch emails. This mailbox file can be
previewed with any mail user agent which supports UNIX mbox
files.
With -n/--test, all steps will run, but mail will not be sent.
You will be prompted for an email recipient address, a subject and
an introductory message describing the patches of your patchbomb.
Then when all is done, patchbomb messages are displayed. If the
PAGER environment variable is set, your pager will be fired up once
for each patchbomb message, so you can verify everything is alright.
Nicolas Dumazet
patchbomb: save introductory message in .hg/last-email.txt
r13198 In case email sending fails, you will find a backup of your series
introductory message in ``.hg/last-email.txt``.
Christian Ebert
patchbomb: reST syntax for literal blocks in help text
r9289 Examples::
John Goerzen
Improve documentation for patchbomb and email
r4280
Christian Ebert
patchbomb: reST syntax for literal blocks in help text
r9289 hg email -r 3000 # send patch 3000 only
hg email -r 3000 -r 3001 # send patches 3000 and 3001
hg email -r 3000:3005 # send patches 3000 through 3005
hg email 3000 # send patch 3000 (deprecated)
John Goerzen
Improve documentation for patchbomb and email
r4280
Christian Ebert
patchbomb: reST syntax for literal blocks in help text
r9289 hg email -o # send all patches not in default
hg email -o DEST # send all patches not in DEST
hg email -o -r 3000 # send all ancestors of 3000 not in default
hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST
John Goerzen
Improve documentation for patchbomb and email
r4280
Christian Ebert
patchbomb: reST syntax for literal blocks in help text
r9289 hg email -b # send bundle of all patches not in default
hg email -b DEST # send bundle of all patches not in DEST
hg email -b -r 3000 # bundle of all ancestors of 3000 not in default
hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST
John Goerzen
Improve documentation for patchbomb and email
r4280
timeless
patchbomb: move command option help from the extension (patchbomb) to the command (email)
r12749 hg email -o -m mbox && # generate an mbox file...
mutt -R -f mbox # ... and view it with mutt
hg email -o -m mbox && # generate an mbox file ...
Martin Geisler
patchbomb: fix stray backslash in docstring...
r12839 formail -s sendmail \\ # ... and use formail to send from the mbox
timeless
patchbomb: move command option help from the extension (patchbomb) to the command (email)
r12749 -bm -t < mbox # ... using sendmail
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 Before using this command, you will need to enable email in your
hgrc. See the [email] section in hgrc(5) for details.
Brendan Cully
Add --outgoing option to patchbomb
r4262 '''
Christian Ebert
patchbomb: mime-encode headers and parts not containing patches...
r7115 _charsets = mail._charsets(ui)
Christian Ebert
patchbomb: reduce number of opts.get calls...
r11413 bundle = opts.get('bundle')
date = opts.get('date')
mbox = opts.get('mbox')
outgoing = opts.get('outgoing')
rev = opts.get('rev')
# internal option used by pbranches
patches = opts.get('patches')
def getoutgoing(dest, revs):
Brendan Cully
Add --outgoing option to patchbomb
r4262 '''Return the revisions present locally but not in dest'''
Patrick Mezard
patchbomb: rewrite getoutgoing() with revsets...
r17178 url = ui.expandpath(dest or 'default-push', dest or 'default')
url = hg.parseurl(url)[0]
ui.status(_('comparing with %s\n') % util.hidepassword(url))
revs = [r for r in scmutil.revrange(repo, revs) if r >= 0]
if not revs:
revs = [len(repo) - 1]
revs = repo.revs('outgoing(%s) and ::%ld', dest or '', revs)
if not revs:
Brendan Cully
Add --outgoing option to patchbomb
r4262 ui.status(_("no changes found\n"))
return []
Patrick Mezard
patchbomb: rewrite getoutgoing() with revsets...
r17178 return [str(r) for r in revs]
Brendan Cully
Add --outgoing option to patchbomb
r4262
Benoit Boissinot
patch: export shouldn't close files received as a parameter...
r7615 def getpatches(revs):
Mads Kiilerich
patchbomb: warn when emailing a dirty working directory parent
r21055 prev = repo['.'].rev()
Matt Mackall
scmutil: move revsingle/pair/range from cmdutil...
r14319 for r in scmutil.revrange(repo, revs):
Mads Kiilerich
patchbomb: warn when emailing a dirty working directory parent
r21055 if r == prev and (repo[None].files() or repo[None].deleted()):
ui.warn(_('warning: working directory has '
'uncommitted changes\n'))
Benoit Boissinot
patch: export shouldn't close files received as a parameter...
r7615 output = cStringIO.StringIO()
Benoit Boissinot
patch/diff: move patch.export() to cmdutil.export()...
r10611 cmdutil.export(repo, [r], fp=output,
Peter Arrenbrecht
cleanup: drop variables for unused return values...
r7874 opts=patch.diffopts(ui, opts))
Benoit Boissinot
patch: export shouldn't close files received as a parameter...
r7615 yield output.getvalue().split('\n')
John Goerzen
Add common bundle/outgoing options to hg email
r4279 def getbundle(dest):
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 tmpdir = tempfile.mkdtemp(prefix='hg-email-bundle-')
tmpfn = os.path.join(tmpdir, 'bundle')
try:
John Goerzen
Add common bundle/outgoing options to hg email
r4279 commands.bundle(ui, repo, tmpfn, dest, **opts)
Dan Villiom Podlaski Christiansen
explicitly close files...
r13400 fp = open(tmpfn, 'rb')
data = fp.read()
fp.close()
return data
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 finally:
try:
os.unlink(tmpfn)
Brodie Rao
cleanup: replace naked excepts with more specific ones
r16688 except OSError:
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 pass
os.rmdir(tmpdir)
Christian Ebert
patchbomb: reduce number of opts.get calls...
r11413 if not (opts.get('test') or mbox):
Christian Ebert
Catch smtp exceptions
r5472 # really sending
Bryan O'Sullivan
patchbomb: Validate email config before we start prompting for info.
r4489 mail.validateconfig(ui)
Christian Ebert
patchbomb: reduce number of opts.get calls...
r11413 if not (revs or rev or outgoing or bundle or patches):
Bryan O'Sullivan
patchbomb: Fail early if no revs given to email
r4493 raise util.Abort(_('specify at least one changeset with -r or -o'))
Christian Ebert
patchbomb: reduce number of opts.get calls...
r11413 if outgoing and bundle:
Christian Ebert
patchbomb: break lines > 80 chars (coding style)
r5746 raise util.Abort(_("--outgoing mode always on with --bundle;"
" do not re-specify --outgoing"))
John Goerzen
Add ability to send bundles to patchbomb extension
r4278
Christian Ebert
patchbomb: reduce number of opts.get calls...
r11413 if outgoing or bundle:
Brendan Cully
Add --outgoing option to patchbomb
r4262 if len(revs) > 1:
raise util.Abort(_("too many destinations"))
dest = revs and revs[0] or None
revs = []
Christian Ebert
patchbomb: reduce number of opts.get calls...
r11413 if rev:
Brendan Cully
Add --outgoing option to patchbomb
r4262 if revs:
raise util.Abort(_('use only one form to specify the revision'))
Christian Ebert
patchbomb: reduce number of opts.get calls...
r11413 revs = rev
Brendan Cully
Add --outgoing option to patchbomb
r4262
Christian Ebert
patchbomb: reduce number of opts.get calls...
r11413 if outgoing:
revs = getoutgoing(dest, rev)
if bundle:
John Goerzen
Add common bundle/outgoing options to hg email
r4279 opts['revs'] = revs
Brendan Cully
Add --outgoing option to patchbomb
r4262
# start
Christian Ebert
patchbomb: reduce number of opts.get calls...
r11413 if date:
start_time = util.parsedate(date)
Bryan O'Sullivan
patchbomb: add --date option
r4566 else:
start_time = util.makedate()
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
def genmsgid(id):
Christian Ebert
patchbomb: fix timezone offset in message date header...
r4027 return '<%s.%s@%s>' % (id[:20], int(start_time[0]), socket.getfqdn())
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Patrick Mezard
patchbomb: make --bundle respect --desc
r5753 def getdescription(body, sender):
Christian Ebert
patchbomb: consistently use opts.get
r5818 if opts.get('desc'):
body = open(opts.get('desc')).read()
Patrick Mezard
patchbomb: make --bundle respect --desc
r5753 else:
ui.write(_('\nWrite the introductory message for the '
'patch series.\n\n'))
body = ui.edit(body, sender)
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 # Save series description in case sendmail fails
Nicolas Dumazet
patchbomb: save introductory message in .hg/last-email.txt
r13198 msgfile = repo.opener('last-email.txt', 'wb')
msgfile.write(body)
msgfile.close()
Patrick Mezard
patchbomb: make --bundle respect --desc
r5753 return body
Peter Arrenbrecht
patchbomb: make `hg email` reusable for other patch sources...
r7353 def getpatchmsgs(patches, patchnames=None):
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 msgs = []
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Martin Geisler
patchbomb: lowercase status messages
r16931 ui.write(_('this patch series consists of %d patches.\n\n')
Christian Ebert
patchbomb: break lines > 80 chars (coding style)
r5746 % len(patches))
John Goerzen
Add ability to send bundles to patchbomb extension
r4278
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 # build the intro message, or skip it if the user declines
if introwanted(opts, len(patches)):
msg = makeintro(patches)
if msg:
msgs.append(msg)
# are we going to send more than one message?
numbered = len(msgs) + len(patches) > 1
# now generate the actual patch messages
Peter Arrenbrecht
patchbomb: make `hg email` reusable for other patch sources...
r7353 name = None
Benoit Boissinot
use enumerate instead of zip
r7616 for i, p in enumerate(patches):
Peter Arrenbrecht
patchbomb: make `hg email` reusable for other patch sources...
r7353 if patchnames:
name = patchnames[i]
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 msg = makepatch(ui, repo, p, opts, _charsets, i + 1,
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 len(patches), numbered, name)
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 msgs.append(msg)
John Goerzen
Add ability to send bundles to patchbomb extension
r4278
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 return msgs
def makeintro(patches):
tlen = len(str(len(patches)))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 flag = opts.get('flag') or ''
if flag:
flag = ' ' + ' '.join(flag)
prefix = '[PATCH %0*d of %d%s]' % (tlen, 0, len(patches), flag)
subj = (opts.get('subject') or
Matt Mackall
patchbomb: add (optional) note to 0 of 0 prompt
r16233 prompt(ui, '(optional) Subject: ', rest=prefix, default=''))
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 if not subj:
return None # skip intro if the user doesn't bother
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 subj = prefix + ' ' + subj
John Goerzen
Add ability to send bundles to patchbomb extension
r4278
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 body = ''
if opts.get('diffstat'):
# generate a cumulative diffstat of the whole patch series
diffstat = patch.diffstat(sum(patches, []))
body = '\n' + diffstat
else:
diffstat = None
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 body = getdescription(body, sender)
msg = mail.mimeencode(ui, body, _charsets, opts.get('test'))
msg['Subject'] = mail.headencode(ui, subj, _charsets,
opts.get('test'))
return (msg, subj, diffstat)
Christian Ebert
make introductory message of patch series text/plain
r2704
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 def getbundlemsgs(bundle):
Christian Ebert
patchbomb: consistently use opts.get
r5818 subj = (opts.get('subject')
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 or prompt(ui, 'Subject:', 'A bundle for your repository'))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Patrick Mezard
patchbomb: make --bundle respect --desc
r5753 body = getdescription('', sender)
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 msg = email.MIMEMultipart.MIMEMultipart()
if body:
Christian Ebert
patchbomb: mime-encode headers and parts not containing patches...
r7115 msg.attach(mail.mimeencode(ui, body, _charsets, opts.get('test')))
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 datapart = email.MIMEBase.MIMEBase('application', 'x-mercurial-bundle')
datapart.set_payload(bundle)
John Mulligan
patchbomb: option to set the name of bundle attachment (issue1452)...
r7889 bundlename = '%s.hg' % opts.get('bundlename', 'bundle')
John Goerzen
Add a filename for the bundle
r4284 datapart.add_header('Content-Disposition', 'attachment',
John Mulligan
patchbomb: option to set the name of bundle attachment (issue1452)...
r7889 filename=bundlename)
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 email.Encoders.encode_base64(datapart)
msg.attach(datapart)
Christian Ebert
patchbomb: mime-encode headers and parts not containing patches...
r7115 msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get('test'))
Christian Ebert
patchbomb: let diffstat prompt only once with complete summary...
r12200 return [(msg, subj, None)]
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Christian Ebert
patchbomb: consistently use opts.get
r5818 sender = (opts.get('from') or ui.config('email', 'from') or
Vadim Gelfer
rename [patchbomb] section to [email] section in hgrc. old name still ok.
r2198 ui.config('patchbomb', 'from') or
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 prompt(ui, 'From', ui.username()))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Peter Arrenbrecht
patchbomb: make `hg email` reusable for other patch sources...
r7353 if patches:
msgs = getpatchmsgs(patches, opts.get('patchnames'))
Christian Ebert
patchbomb: reduce number of opts.get calls...
r11413 elif bundle:
John Goerzen
Add common bundle/outgoing options to hg email
r4279 msgs = getbundlemsgs(getbundle(dest))
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 else:
Benoit Boissinot
patch: export shouldn't close files received as a parameter...
r7615 msgs = getpatchmsgs(list(getpatches(revs)))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Christian Ebert
patchbomb: let diffstat prompt only once with complete summary...
r12200 showaddrs = []
Greg Ward
patchbomb: simplify some contorted logic and odd variable names.
r15162 def getaddrs(header, ask=False, default=None):
configkey = header.lower()
opt = header.replace('-', '_').lower()
addrs = opts.get(opt)
Cédric Duval
patchbomb: Reply-To support...
r11150 if addrs:
Greg Ward
patchbomb: simplify some contorted logic and odd variable names.
r15162 showaddrs.append('%s: %s' % (header, ', '.join(addrs)))
Christian Ebert
patchbomb: consistent code style in getaddrs()
r12264 return mail.addrlistencode(ui, addrs, _charsets, opts.get('test'))
Marti Raudsepp
patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc...
r9947
Greg Ward
patchbomb: simplify some contorted logic and odd variable names.
r15162 # not on the command line: fallback to config and then maybe ask
addr = (ui.config('email', configkey) or
ui.config('patchbomb', configkey) or
'')
if not addr and ask:
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 addr = prompt(ui, header, default=default)
Greg Ward
patchbomb: simplify some contorted logic and odd variable names.
r15162 if addr:
showaddrs.append('%s: %s' % (header, addr))
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 return mail.addrlistencode(ui, [addr], _charsets, opts.get('test'))
else:
return default
Marti Raudsepp
patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc...
r9947
Greg Ward
patchbomb: simplify some contorted logic and odd variable names.
r15162 to = getaddrs('To', ask=True)
Greg Ward
patchbomb: make it easy for the user to decline sending an intro message....
r15164 if not to:
# we can get here in non-interactive mode
raise util.Abort(_('no recipient addresses provided'))
cc = getaddrs('Cc', ask=True, default='') or []
bcc = getaddrs('Bcc') or []
Greg Ward
patchbomb: simplify some contorted logic and odd variable names.
r15162 replyto = getaddrs('Reply-To')
Christian Ebert
optionally send blind carbon copies...
r2679
Christian Ebert
patchbomb: add --confirm option to show series details and ask for confirmation...
r12201 if opts.get('diffstat') or opts.get('confirm'):
Christian Ebert
patchbomb: let diffstat prompt only once with complete summary...
r12200 ui.write(_('\nFinal summary:\n\n'))
Matt Mackall
i18n: wrap false positives for translation detection
r17956 ui.write(('From: %s\n' % sender))
Christian Ebert
patchbomb: let diffstat prompt only once with complete summary...
r12200 for addr in showaddrs:
ui.write('%s\n' % addr)
for m, subj, ds in msgs:
Matt Mackall
i18n: wrap false positives for translation detection
r17956 ui.write(('Subject: %s\n' % subj))
Christian Ebert
patchbomb: let diffstat prompt only once with complete summary...
r12200 if ds:
ui.write(ds)
ui.write('\n')
Matt Mackall
ui: merge prompt text components into a singe string...
r19226 if ui.promptchoice(_('are you sure you want to send (yn)?'
'$$ &Yes $$ &No')):
Christian Ebert
patchbomb: let diffstat prompt only once with complete summary...
r12200 raise util.Abort(_('patchbomb canceled'))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 ui.write('\n')
Henrik Stuart <henrik.stuart at edlund.dk>
patchbomb: Support initial in-reply-to header...
r8025 parent = opts.get('in_reply_to') or None
Cédric Duval
patchbomb: do not assume the presence of angle brackets around msg-id...
r8826 # angle brackets may be omitted, they're not semantically part of the msg-id
if parent is not None:
if not parent.startswith('<'):
parent = '<' + parent
if not parent.endswith('>'):
parent += '>'
Vadim Gelfer
get patchbomb extension to use demandload. speeds up hg startup by 50%.
r1827 sender_addr = email.Utils.parseaddr(sender)[1]
Christian Ebert
patchbomb: mime-encode headers and parts not containing patches...
r7115 sender = mail.addressencode(ui, sender, _charsets, opts.get('test'))
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 sendmail = None
Yuya Nishihara
patchbomb: show progress when sending emails or writing mbox
r12265 for i, (m, subj, ds) in enumerate(msgs):
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 try:
m['Message-Id'] = genmsgid(m['X-Mercurial-Node'])
except TypeError:
m['Message-Id'] = genmsgid('patchbomb')
if parent:
m['In-Reply-To'] = parent
Benoit Allard
email: add References field in the header...
r7413 m['References'] = parent
Thomas Arendsen Hein
patchbomb: respect --in-reply-to for all mails if no intro message is sent...
r17859 if not parent or 'X-Mercurial-Node' not in m:
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 parent = m['Message-Id']
Cédric Duval
patchbomb: with --in-reply-to, still thread message under first in series...
r8514
Henrik Stuart
patchbomb: add user agent header to mails
r8160 m['User-Agent'] = 'Mercurial-patchbomb/%s' % util.version()
Cédric Duval
patchbomb: use local time for the Date: header
r9047 m['Date'] = email.Utils.formatdate(start_time[0], localtime=True)
Volker Kleinfeld
patchbomb does not handle email time stamp plattform independent
r2443
Christian Ebert
patchbomb: fix timezone offset in message date header...
r4027 start_time = (start_time[0] + 1, start_time[1])
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 m['From'] = sender
m['To'] = ', '.join(to)
Christian Ebert
patchbomb: add linebreaks after colons (coding style)
r5785 if cc:
m['Cc'] = ', '.join(cc)
if bcc:
m['Bcc'] = ', '.join(bcc)
Cédric Duval
patchbomb: Reply-To support...
r11150 if replyto:
m['Reply-To'] = ', '.join(replyto)
Christian Ebert
patchbomb: consistently use opts.get
r5818 if opts.get('test'):
Martin Geisler
patchbomb: lowercase status messages
r16931 ui.status(_('displaying '), subj, ' ...\n')
Patrick Mezard
patchbomb: flush ui before delegating to pager.
r4596 ui.flush()
Yuya Nishihara
patchbomb: respect HGPLAIN when piping --test output to PAGER...
r11183 if 'PAGER' in os.environ and not ui.plain():
Dirkjan Ochtman
replace usage of os.popen() with util.popen()...
r6548 fp = util.popen(os.environ['PAGER'], 'w')
Patrick Mezard
patchbomb: page patchbomb messages only if PAGER is defined....
r4599 else:
fp = ui
Benoit Boissinot
patchbomb: Fix mangling of lines beginning with From...
r6447 generator = email.Generator.Generator(fp, mangle_from_=False)
Vadim Gelfer
patchbomb: ignore exception if pager quits.
r1871 try:
Benoit Boissinot
patchbomb: Fix mangling of lines beginning with From...
r6447 generator.flatten(m, 0)
Vadim Gelfer
patchbomb: ignore exception if pager quits.
r1871 fp.write('\n')
except IOError, inst:
if inst.errno != errno.EPIPE:
raise
Patrick Mezard
patchbomb: page patchbomb messages only if PAGER is defined....
r4599 if fp is not ui:
fp.close()
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 else:
if not sendmail:
FUJIWARA Katsunori
smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS...
r18888 verifycert = ui.config('smtp', 'verifycert')
if opts.get('insecure'):
Mads Kiilerich
config: set a 'source' in most cases where config don't come from file but code...
r20790 ui.setconfig('smtp', 'verifycert', 'loose', 'patchbomb')
FUJIWARA Katsunori
smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS...
r18888 try:
sendmail = mail.connect(ui, mbox=mbox)
finally:
Mads Kiilerich
config: set a 'source' in most cases where config don't come from file but code...
r20790 ui.setconfig('smtp', 'verifycert', verifycert, 'patchbomb')
Martin Geisler
patchbomb: lowercase status messages
r16931 ui.status(_('sending '), subj, ' ...\n')
Mads Kiilerich
patchbomb: minor refactoring of mbox functionality, preparing for move...
r15559 ui.progress(_('sending'), i, item=subj, total=len(msgs))
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 if not mbox:
# Exim does not remove the Bcc field
del m['Bcc']
Benoit Boissinot
patchbomb: Fix mangling of lines beginning with From...
r6447 fp = cStringIO.StringIO()
generator = email.Generator.Generator(fp, mangle_from_=False)
generator.flatten(m, 0)
Mads Kiilerich
patchbomb: minor refactoring of mbox functionality, preparing for move...
r15559 sendmail(sender_addr, to + bcc + cc, fp.getvalue())
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Yuya Nishihara
patchbomb: show progress when sending emails or writing mbox
r12265 ui.progress(_('writing'), None)
ui.progress(_('sending'), None)