##// END OF EJS Templates
commit: fix complaint about branch merge creating new heads (issue2186)
commit: fix complaint about branch merge creating new heads (issue2186)

File last commit:

r11150:f66ca443 default
r11181:6e65b451 default
Show More
patchbomb.py
533 lines | 19.7 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: wrap docstrings at 70 characters
r9269 With the -d/--diffstat option, you will be prompted for each changeset
with a diffstat summary and the changeset summary, so you can be sure
you are sending the right changes.
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 To configure other defaults, add a section like this to your hgrc
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 To avoid sending patches prematurely, it is a good idea to first run
Martin Geisler
Use hg role in help strings
r10973 the :hg:`email` command with the "-n" option (test only). You will be
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 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.
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 The -m/--mbox option is also very useful. 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, e.g. with mutt::
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
% mutt -R -f mbox
Cédric Duval
doc: fix quotes mismatches affecting rst
r9286 When you are previewing the patchbomb messages, you can use ``formail``
Martin Geisler
patchbomb: wrap docstrings at 70 characters
r9269 (a utility that is commonly installed as part of the procmail
package), to send each message out::
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
% formail -s sendmail -bm -t < mbox
Bill Barry
added information to patchbomb help pointing users to hgrc(5) to configure the [smtp] section in order to send patchbombs
r7694 That should be all. Now your patchbomb is on its way out.
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
Cédric Duval
patchbomb: fix From_ in the message's envelope...
r9046 import os, errno, socket, tempfile, cStringIO, time
Christian Ebert
patchbomb: mime-encode clean utf-8 patches (issue814)...
r7192 import email.MIMEMultipart, email.MIMEBase
Benoit Boissinot
patchbomb: Fix mangling of lines beginning with From...
r6447 import email.Utils, email.Encoders, email.Generator
Martin Geisler
patchbomb: respect diff settings
r7685 from mercurial import cmdutil, commands, hg, mail, patch, util
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
Alexander Solovyov
patchbomb: accept default if it is empty string...
r9648 def prompt(ui, prompt, default=None, rest=':'):
Matt Mackall
ui: make interactive a method
r8208 if not ui.interactive():
Alexander Solovyov
patchbomb: accept default if it is empty string...
r9648 if default is not None:
Alexander Solovyov
fix patchbomb prompt when sending series of patches
r9612 return default
Matt Mackall
many, many trivial check-code fixups
r10282 raise util.Abort(_("%s Please enter a valid value" % (prompt + rest)))
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 if default:
prompt += ' [%s]' % default
prompt += rest
while True:
r = ui.prompt(prompt, default=default)
if r:
return r
if default is not None:
return default
ui.warn(_('Please enter a valid value.\n'))
def cdiffstat(ui, summary, patchlines):
s = patch.diffstat(patchlines)
Alexander Solovyov
python implementation of diffstat...
r7547 if summary:
ui.write(summary, '\n')
ui.write(s, '\n')
Martin Geisler
patchbomb: fix double-spaces in prompts
r9647 ans = prompt(ui, _('does the diffstat above look okay?'), 'y')
Alexander Solovyov
python implementation of diffstat...
r7547 if not ans.lower().startswith('y'):
raise util.Abort(_('diffstat rejected'))
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 return s
Cédric Duval
patchbomb: --desc implies --intro...
r10734 def introneeded(opts, number):
'''is an introductory message required?'''
return number > 1 or opts.get('intro') or opts.get('desc')
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 def makepatch(ui, repo, patch, opts, _charsets, idx, total, patchname=None):
desc = []
node = None
body = ''
for line in patch:
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
if opts.get('attach'):
body = ('\n'.join(desc[1:]).strip() or
'Patch subject is complete summary.')
body += '\n\n\n'
if opts.get('plain'):
while patch and patch[0].startswith('# '):
patch.pop(0)
if patch:
patch.pop(0)
while patch and not patch[0].strip():
patch.pop(0)
if opts.get('diffstat'):
body += cdiffstat(ui, '\n'.join(desc), patch) + '\n\n'
if opts.get('attach') or opts.get('inline'):
msg = email.MIMEMultipart.MIMEMultipart()
if body:
msg.attach(mail.mimeencode(ui, body, _charsets, opts.get('test')))
p = mail.mimetextpatch('\n'.join(patch), 'x-patch', opts.get('test'))
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:
patchname = cmdutil.make_filename(repo, '%b-%n.patch',
Peter Arrenbrecht
patchbomb: fix patch name generation in patch series
r7359 binnode, seqno=idx, total=total)
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 else:
patchname = cmdutil.make_filename(repo, '%b.patch', binnode)
disposition = 'inline'
if opts.get('attach'):
disposition = 'attachment'
p['Content-Disposition'] = disposition + '; filename=' + patchname
msg.attach(p)
else:
body += '\n'.join(patch)
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('. ')
Cédric Duval
patchbomb: --desc implies --intro...
r10734 if not introneeded(opts, total):
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
return msg, subj
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
patchbomb: wrap docstrings at 70 characters
r9269 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
description. Next, (optionally) if the diffstat program is
installed and -d/--diffstat is used, the result of running
diffstat on the patch. Finally, the patch itself, as generated by
Martin Geisler
Use hg role in help strings
r10973 :hg:`export`.
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
will be created.
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
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
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)
Brendan Cully
Add --outgoing option to patchbomb
r4262 def outgoing(dest, revs):
'''Return the revisions present locally but not in dest'''
dest = ui.expandpath(dest or 'default-push', dest or 'default')
Sune Foldager
interpret repo#name url syntax as branch instead of revision...
r10365 dest, branches = hg.parseurl(dest)
revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
Sune Foldager
patchbomb: fix bug introduced in 4ddfad7ebd98 and add test...
r10022 if revs:
revs = [repo.lookup(rev) for rev in revs]
Matt Mackall
add cmdutil.remoteui...
r8188 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
Brendan Cully
Add --outgoing option to patchbomb
r4262 ui.status(_('comparing with %s\n') % dest)
o = repo.findoutgoing(other)
if not o:
ui.status(_("no changes found\n"))
return []
Sune Foldager
patchbomb: fix bug introduced in 4ddfad7ebd98 and add test...
r10022 o = repo.changelog.nodesbetween(o, revs)[0]
Brendan Cully
Add --outgoing option to patchbomb
r4262 return [str(repo.changelog.rev(r)) for r in o]
Benoit Boissinot
patch: export shouldn't close files received as a parameter...
r7615 def getpatches(revs):
for r in cmdutil.revrange(repo, revs):
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)
Patrick Mezard
patchbomb: read bundle file in binary mode
r5752 return open(tmpfn, 'rb').read()
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 finally:
try:
os.unlink(tmpfn)
except:
pass
os.rmdir(tmpdir)
Christian Ebert
patchbomb: consistently use opts.get
r5818 if not (opts.get('test') or opts.get('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: make "hg email -b" w/o destination work as advertised
r5643 if not (revs or opts.get('rev')
Peter Arrenbrecht
patchbomb: make `hg email` reusable for other patch sources...
r7353 or opts.get('outgoing') or opts.get('bundle')
or opts.get('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'))
Bryan O'Sullivan
patchbomb: Fix typo.
r4492 if opts.get('outgoing') and opts.get('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
if opts.get('outgoing') or opts.get('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 = []
if opts.get('rev'):
if revs:
raise util.Abort(_('use only one form to specify the revision'))
revs = opts.get('rev')
if opts.get('outgoing'):
revs = outgoing(dest, opts.get('rev'))
John Goerzen
Add common bundle/outgoing options to hg email
r4279 if opts.get('bundle'):
opts['revs'] = revs
Brendan Cully
Add --outgoing option to patchbomb
r4262
# start
Bryan O'Sullivan
patchbomb: add --date option
r4566 if opts.get('date'):
Christian Ebert
patchbomb: consistently use opts.get
r5818 start_time = util.parsedate(opts.get('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)
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 jumbo = []
msgs = []
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Christian Ebert
patchbomb: break lines > 80 chars (coding style)
r5746 ui.write(_('This patch series consists of %d patches.\n\n')
% len(patches))
John Goerzen
Add ability to send bundles to patchbomb extension
r4278
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):
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 jumbo.extend(p)
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,
len(patches), name)
msgs.append(msg)
John Goerzen
Add ability to send bundles to patchbomb extension
r4278
Cédric Duval
patchbomb: --desc implies --intro...
r10734 if introneeded(opts, len(patches)):
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 tlen = len(str(len(patches)))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Nicolas Dumazet
patchbomb: add --flag to put flags in subject prefixes...
r9346 flag = ' '.join(opts.get('flag'))
if flag:
Martin Geisler
patchbomb: fix double-spaces in prompts
r9647 subj = '[PATCH %0*d of %d %s]' % (tlen, 0, len(patches), flag)
Nicolas Dumazet
patchbomb: add --flag to put flags in subject prefixes...
r9346 else:
Martin Geisler
patchbomb: fix double-spaces in prompts
r9647 subj = '[PATCH %0*d of %d]' % (tlen, 0, len(patches))
subj += ' ' + (opts.get('subject') or
prompt(ui, 'Subject: ', rest=subj))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 body = ''
Christian Ebert
patchbomb: consistently use opts.get
r5818 if opts.get('diffstat'):
Dirkjan Ochtman
patchbomb: extract a bunch of nested functions...
r7354 d = cdiffstat(ui, _('Final summary:\n'), jumbo)
Christian Ebert
patchbomb: add linebreaks after colons (coding style)
r5785 if d:
body = '\n' + d
John Goerzen
Add ability to send bundles to patchbomb extension
r4278
Patrick Mezard
patchbomb: make --bundle respect --desc
r5753 body = getdescription(body, sender)
Christian Ebert
patchbomb: mime-encode headers and parts not containing patches...
r7115 msg = mail.mimeencode(ui, body, _charsets, opts.get('test'))
msg['Subject'] = mail.headencode(ui, subj, _charsets,
opts.get('test'))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Christian Ebert
patchbomb: mime-encode headers and parts not containing patches...
r7115 msgs.insert(0, (msg, subj))
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 return msgs
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'))
return [(msg, subj)]
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
Benoit Boissinot
patch: export shouldn't close files received as a parameter...
r7615 # internal option used by pbranches
Peter Arrenbrecht
patchbomb: make `hg email` reusable for other patch sources...
r7353 patches = opts.get('patches')
if patches:
msgs = getpatchmsgs(patches, opts.get('patchnames'))
elif opts.get('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
Marti Raudsepp
patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc...
r9947 def getaddrs(opt, prpt=None, default=None):
Cédric Duval
patchbomb: Reply-To support...
r11150 addrs = opts.get(opt.replace('-', '_'))
if addrs:
return mail.addrlistencode(ui, addrs, _charsets,
Marti Raudsepp
patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc...
r9947 opts.get('test'))
addrs = (ui.config('email', opt) or
ui.config('patchbomb', opt) or '')
if not addrs and prpt:
addrs = prompt(ui, prpt, default)
return mail.addrlistencode(ui, [addrs], _charsets, opts.get('test'))
Bryan O'Sullivan
patchbomb: Don't prompt for headers until sure we have revs to export....
r4485
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 to = getaddrs('to', 'To')
cc = getaddrs('cc', 'Cc', '')
Marti Raudsepp
patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc...
r9947 bcc = getaddrs('bcc')
Cédric Duval
patchbomb: Reply-To support...
r11150 replyto = getaddrs('reply-to')
Christian Ebert
optionally send blind carbon copies...
r2679
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 += '>'
Cédric Duval
patchbomb: with --in-reply-to, still thread message under first in series...
r8514 first = True
Volker Kleinfeld
patchbomb does not handle email time stamp plattform independent
r2443
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
Christian Ebert
patchbomb: mime-encode headers and parts not containing patches...
r7115 for m, subj in 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
Cédric Duval
patchbomb: with --in-reply-to, still thread message under first in series...
r8514 if first:
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 first = False
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'):
Christian Ebert
patchbomb: mime-encode headers and parts not containing patches...
r7115 ui.status(_('Displaying '), subj, ' ...\n')
Patrick Mezard
patchbomb: flush ui before delegating to pager.
r4596 ui.flush()
Patrick Mezard
patchbomb: page patchbomb messages only if PAGER is defined....
r4599 if 'PAGER' in os.environ:
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()
Christian Ebert
patchbomb: consistently use opts.get
r5818 elif opts.get('mbox'):
Christian Ebert
patchbomb: mime-encode headers and parts not containing patches...
r7115 ui.status(_('Writing '), subj, ' ...\n')
Christian Ebert
Prefer i in d over d.has_key(i)
r5915 fp = open(opts.get('mbox'), 'In-Reply-To' in m and 'ab+' or 'wb+')
Benoit Boissinot
patchbomb: Fix mangling of lines beginning with From...
r6447 generator = email.Generator.Generator(fp, mangle_from_=True)
Patrick Mezard
patchbomb: normalize date format in generated mboxes...
r9818 # Should be time.asctime(), but Windows prints 2-characters day
# of month instead of one. Make them print the same thing.
date = time.strftime('%a %b %d %H:%M:%S %Y',
time.localtime(start_time[0]))
Johannes Stezenbach
add --mbox output to patchbomb...
r1702 fp.write('From %s %s\n' % (sender_addr, date))
Benoit Boissinot
patchbomb: Fix mangling of lines beginning with From...
r6447 generator.flatten(m, 0)
Johannes Stezenbach
add --mbox output to patchbomb...
r1702 fp.write('\n\n')
fp.close()
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 else:
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 if not sendmail:
sendmail = mail.connect(ui)
Christian Ebert
patchbomb: mime-encode headers and parts not containing patches...
r7115 ui.status(_('Sending '), subj, ' ...\n')
Benoit Boissinot
mailbomb: add a comment and remove the bcc in a more pythonic way
r2790 # 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)
sendmail(sender, to + bcc + cc, fp.getvalue())
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Peter Arrenbrecht
patchbomb: make options to email command reusable...
r7352 emailopts = [
('a', 'attach', None, _('send patches as attachments')),
Dennis Schoen
patchbomb: attachment options changed...
r5819 ('i', 'inline', None, _('send patches as inline attachments')),
timeless
help: miscellaneous language fixes
r7807 ('', 'bcc', [], _('email addresses of blind carbon copy recipients')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 ('c', 'cc', [], _('email addresses of copy recipients')),
('d', 'diffstat', None, _('add diffstat output to messages')),
('', 'date', '', _('use the given date as the sending date')),
Bryan O'Sullivan
patchbomb: add --desc, to specify a file containing a series description
r4887 ('', 'desc', '', _('use the given file as the series description')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 ('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')),
Cédric Duval
patchbomb: Reply-To support...
r11150 ('', 'reply-to', [], _('email addresses replies should be sent to')),
Peter Arrenbrecht
patchbomb: make options to email command reusable...
r7352 ('s', 'subject', '',
_('subject of first message (intro or single patch)')),
Henrik Stuart <henrik.stuart at edlund.dk>
patchbomb: Support initial in-reply-to header...
r8025 ('', 'in-reply-to', '',
Martin Geisler
patchbomb: fix quotes in help string
r8331 _('message identifier to reply to')),
Nicolas Dumazet
patchbomb: add --flag to put flags in subject prefixes...
r9346 ('', 'flag', [], _('flags to add in subject prefixes')),
Peter Arrenbrecht
patchbomb: make options to email command reusable...
r7352 ('t', 'to', [], _('email addresses of recipients')),
]
cmdtable = {
"email":
(patchbomb,
[('g', 'git', None, _('use git extended diff format')),
('', 'plain', None, _('omit hg patch header')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 ('o', 'outgoing', None,
_('send changes not found in the target repository')),
('b', 'bundle', None,
_('send changes not in target as a binary bundle')),
John Mulligan
patchbomb: option to set the name of bundle attachment (issue1452)...
r7889 ('', 'bundlename', 'bundle',
timeless
Generally replace "file name" with "filename" in help and comments.
r8761 _('name of the bundle attachment file')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 ('r', 'rev', [], _('a revision to send')),
('', 'force', None,
Martin Geisler
help texts: write command line switches as -a/--abc
r8076 _('run even when remote repository is unrelated '
'(with -b/--bundle)')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 ('', 'base', [],
Martin Geisler
help texts: write command line switches as -a/--abc
r8076 _('a base changeset to specify instead of a destination '
'(with -b/--bundle)')),
Chris Winter
patchbomb: add option to send intro email for a single patch (issue1120)
r7360 ('', 'intro', None,
_('send an introduction email for a single patch')),
Peter Arrenbrecht
patchbomb: make options to email command reusable...
r7352 ] + emailopts + commands.remoteopts,
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 _('hg email [OPTION]... [DEST]...'))
}