##// END OF EJS Templates
patchbomb: Hoist sender config higher.
patchbomb: Hoist sender config higher.

File last commit:

r4491:6d2d1dcd default
r4491:6d2d1dcd default
Show More
patchbomb.py
421 lines | 15.4 KiB | text/x-python | PythonLexer
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 # Command for sending a collection of Mercurial changesets as a series
# of patch emails.
#
# The series is started off with a "[PATCH 0 of N]" introduction,
# which describes the series as a whole.
#
# 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:
#
# The remainder of the changeset description.
#
# [Optional] If the diffstat program is installed, the result of
# running diffstat on the patch.
#
# The patch itself, as generated by "hg export".
#
# Each message refers to all of its predecessors 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.
#
# For each changeset, you will be prompted with a diffstat summary and
# the changeset summary, so you can be sure you are sending the right
# changes.
#
Giorgos Keramidas
hgext: more patchbomb documentation...
r2926 # To enable this extension:
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 #
Giorgos Keramidas
hgext: more patchbomb documentation...
r2926 # [extensions]
# hgext.patchbomb =
Johannes Stezenbach
add --mbox output to patchbomb...
r1702 #
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 # To configure other defaults, add a section like this to your hgrc
# file:
#
Giorgos Keramidas
hgext: more patchbomb documentation...
r2926 # [email]
# from = My Name <my@email>
# to = recipient1, recipient2, ...
# cc = cc1, cc2, ...
# bcc = bcc1, bcc2, ...
#
# Then you can use the "hg email" command to mail a series of changesets
# as a patchbomb.
#
# To avoid sending patches prematurely, it is a good idea to first run
# the "email" command with the "-n" option (test only). You will be
# prompted for an email recipient address, a subject an an introductory
# message describing the patches of your patchbomb. Then when all is
# done, your pager will be fired up once for each patchbomb message, so
# you can verify everything is alright.
#
# 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, i.e. with mutt:
#
# % mutt -R -f mbox
#
# When you are previewing the patchbomb messages, you can use `formail'
# (a utility that is commonly installed as part of the procmail package),
# to send each message out:
#
# % formail -s sendmail -bm -t < mbox
#
# That should be all. Now your patchbomb is on its way out.
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 import os, errno, socket, tempfile
import email.MIMEMultipart, email.MIMEText, email.MIMEBase
import email.Utils, email.Encoders
Benoit Boissinot
merge with -stable
r4029 from mercurial import cmdutil, commands, hg, mail, ui, patch, util
Matt Mackall
Simplify i18n imports
r3891 from mercurial.i18n import _
Vadim Gelfer
patchbomb: add content-disposition to make display inline and add filename...
r2708 from mercurial.node import *
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
add documentation for email command.
r1672
John Goerzen
Slight refining to help text in patchbomb.py
r4283 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
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. First, the rest of
the changeset description. Next, (optionally) if the diffstat
program is installed, the result of running diffstat on the patch.
Brendan Cully
Add --outgoing option to patchbomb
r4262 Finally, the patch itself, as generated by "hg export".
With --outgoing, emails will be generated for patches not
John Goerzen
Improve documentation for patchbomb and email
r4280 found in the destination repository (or only those which are
Brendan Cully
Add --outgoing option to patchbomb
r4262 ancestors of the specified revisions if any are provided)
John Goerzen
Improve documentation for patchbomb and email
r4280
With --bundle, changesets are selected as for --outgoing,
but a single email containing a binary Mercurial bundle as an
attachment will be sent.
Examples:
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)
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
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
Before using this command, you will need to enable email in your hgrc.
John Goerzen
Slight refining to help text in patchbomb.py
r4283 See the [email] section in hgrc(5) for details.
Brendan Cully
Add --outgoing option to patchbomb
r4262 '''
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 def prompt(prompt, default = None, rest = ': ', empty_ok = False):
Bryan O'Sullivan
patchbomb: Defer the import of readline....
r4486 try:
# readline gives raw_input editing capabilities, but is not
# present on windows
import readline
except ImportError: pass
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 if default: prompt += ' [%s]' % default
prompt += rest
while True:
r = raw_input(prompt)
if r: return r
if default is not None: return default
if empty_ok: return r
Vadim Gelfer
add _ to several strings
r1670 ui.warn(_('Please enter a valid value.\n'))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
def confirm(s):
if not prompt(s, default = 'y', rest = '? ').lower().startswith('y'):
raise ValueError
Matt Doar
Add support for diffstat in commit emails, and move diffstat from...
r3096 def cdiffstat(summary, patchlines):
s = patch.diffstat(patchlines)
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 if s:
if summary:
ui.write(summary, '\n')
ui.write(s, '\n')
Vadim Gelfer
add _ to several strings
r1670 confirm(_('Does the diffstat above look okay'))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 return s
def makepatch(patch, idx, total):
desc = []
node = None
body = ''
for line in patch:
if line.startswith('#'):
if line.startswith('# Node ID'): node = line.split()[-1]
continue
Brendan Cully
Detect git patches in patchbomb makepatch function
r3054 if (line.startswith('diff -r')
or line.startswith('diff --git')):
break
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 desc.append(line)
if not node: raise ValueError
#body = ('\n'.join(desc[1:]).strip() or
# 'Patch subject is complete summary.')
#body += '\n\n\n'
if opts['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['diffstat']:
body += cdiffstat('\n'.join(desc), patch) + '\n\n'
Christian Ebert
patchbomb: optionally send patches as inline attachments
r2707 if opts['attach']:
msg = email.MIMEMultipart.MIMEMultipart()
if body: msg.attach(email.MIMEText.MIMEText(body, 'plain'))
Vadim Gelfer
patchbomb: add content-disposition to make display inline and add filename...
r2708 p = email.MIMEText.MIMEText('\n'.join(patch), 'x-patch')
Christian Ebert
patchbomb: fix generation of message-id when sending attachments...
r2722 binnode = bin(node)
Vadim Gelfer
patchbomb: add content-disposition to make display inline and add filename...
r2708 # if node is mq patch, it will have patch file name as tag
Christian Ebert
patchbomb: fix generation of message-id when sending attachments...
r2722 patchname = [t for t in repo.nodetags(binnode)
Vadim Gelfer
patchbomb: add content-disposition to make display inline and add filename...
r2708 if t.endswith('.patch') or t.endswith('.diff')]
if patchname:
patchname = patchname[0]
elif total > 1:
Brendan Cully
patchbomb: update --attach to use cmdutil.make_filename
r3253 patchname = cmdutil.make_filename(repo, '%b-%n.patch',
Christian Ebert
patchbomb: fix generation of message-id when sending attachments...
r2722 binnode, idx, total)
Vadim Gelfer
patchbomb: add content-disposition to make display inline and add filename...
r2708 else:
Brendan Cully
patchbomb: update --attach to use cmdutil.make_filename
r3253 patchname = cmdutil.make_filename(repo, '%b.patch', binnode)
Vadim Gelfer
patchbomb: add content-disposition to make display inline and add filename...
r2708 p['Content-Disposition'] = 'inline; filename=' + patchname
msg.attach(p)
Christian Ebert
patchbomb: optionally send patches as inline attachments
r2707 else:
body += '\n'.join(patch)
msg = email.MIMEText.MIMEText(body)
Thomas Arendsen Hein
patchbomb: Allow to specify subject of single-patch-series (issue475)
r4141
Thomas Arendsen Hein
patchbomb: Strip more than one trailing dot (and spaces between them)
r4142 subj = desc[0].strip().rstrip('. ')
Vadim Gelfer
only put numbers on patches if > 1 patch.
r1846 if total == 1:
Thomas Arendsen Hein
patchbomb: Allow to specify subject of single-patch-series (issue475)
r4141 subj = '[PATCH] ' + (opts['subject'] or subj)
Vadim Gelfer
only put numbers on patches if > 1 patch.
r1846 else:
Josef "Jeff" Sipek
[patchbomb] prepend leading zeros in the "[PATCH N of M]" string...
r3291 tlen = len(str(total))
Thomas Arendsen Hein
patchbomb: Allow to specify subject of single-patch-series (issue475)
r4141 subj = '[PATCH %0*d of %d] %s' % (tlen, idx, total, subj)
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 msg['Subject'] = subj
msg['X-Mercurial-Node'] = node
return msg
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')
revs = [repo.lookup(rev) for rev in revs]
other = hg.repository(ui, dest)
ui.status(_('comparing with %s\n') % dest)
o = repo.findoutgoing(other)
if not o:
ui.status(_("no changes found\n"))
return []
o = repo.changelog.nodesbetween(o, revs or None)[0]
return [str(repo.changelog.rev(r)) for r in o]
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)
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 return open(tmpfn).read()
finally:
try:
os.unlink(tmpfn)
except:
pass
os.rmdir(tmpdir)
Bryan O'Sullivan
patchbomb: Validate email config before we start prompting for info.
r4489 if not opts['test']:
mail.validateconfig(ui)
Brendan Cully
Add --outgoing option to patchbomb
r4262 # option handling
commands.setremoteconfig(ui, opts)
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 if opts.get('outgoint') and opts.get('bundle'):
raise util.Abort(_("--outgoing mode always on with --bundle; do not re-specify --outgoing"))
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
Christian Ebert
patchbomb: fix timezone offset in message date header...
r4027 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
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 def getexportmsgs():
patches = []
class exportee:
def __init__(self, container):
self.lines = []
self.container = container
self.name = 'email'
def write(self, data):
self.lines.append(data)
def close(self):
self.container.append(''.join(self.lines).split('\n'))
self.lines = []
Josef "Jeff" Sipek
[patchbomb] prepend leading zeros in the "[PATCH N of M]" string...
r3291
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 commands.export(ui, repo, *revs, **{'output': exportee(patches),
'switch_parent': False,
'text': None,
'git': opts.get('git')})
jumbo = []
msgs = []
ui.write(_('This patch series consists of %d patches.\n\n') % len(patches))
for p, i in zip(patches, xrange(len(patches))):
jumbo.extend(p)
msgs.append(makepatch(p, i + 1, len(patches)))
if len(patches) > 1:
tlen = len(str(len(patches)))
Lee Cantey
Patchbomb only sends introductory message [0 of N] if there are multiple patches.
r1845
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 subj = '[PATCH %0*d of %d] %s' % (
tlen, 0,
len(patches),
opts['subject'] or
prompt('Subject:', rest = ' [PATCH %0*d of %d] ' % (tlen, 0,
len(patches))))
body = ''
if opts['diffstat']:
d = cdiffstat(_('Final summary:\n'), jumbo)
if d: body = '\n' + d
ui.write(_('\nWrite the introductory message for the patch series.\n\n'))
body = ui.edit(body, sender)
msg = email.MIMEText.MIMEText(body)
msg['Subject'] = subj
msgs.insert(0, msg)
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):
subj = opts['subject'] or \
prompt('Subject:', default='A bundle for your repository')
ui.write(_('\nWrite the introductory message for the bundle.\n\n'))
body = ui.edit('', sender)
Christian Ebert
make introductory message of patch series text/plain
r2704
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 msg = email.MIMEMultipart.MIMEMultipart()
if body:
msg.attach(email.MIMEText.MIMEText(body, 'plain'))
datapart = email.MIMEBase.MIMEBase('application', 'x-mercurial-bundle')
datapart.set_payload(bundle)
John Goerzen
Add a filename for the bundle
r4284 datapart.add_header('Content-Disposition', 'attachment',
filename='bundle.hg')
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 email.Encoders.encode_base64(datapart)
msg.attach(datapart)
Christian Ebert
make introductory message of patch series text/plain
r2704 msg['Subject'] = subj
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 return [msg]
Lee Cantey
Patchbomb only sends introductory message [0 of N] if there are multiple patches.
r1845
Bryan O'Sullivan
patchbomb: Hoist sender config higher.
r4491 sender = (opts['from'] or ui.config('email', 'from') or
ui.config('patchbomb', 'from') or
prompt('From', ui.username()))
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 if 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:
msgs = getexportmsgs()
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Bryan O'Sullivan
patchbomb: Don't prompt for headers until sure we have revs to export....
r4485 def getaddrs(opt, prpt, default = None):
addrs = opts[opt] or (ui.config('email', opt) or
ui.config('patchbomb', opt) or
prompt(prpt, default = default)).split(',')
return [a.strip() for a in addrs if a.strip()]
to = getaddrs('to', 'To')
cc = getaddrs('cc', 'Cc', '')
bcc = opts['bcc'] or (ui.config('email', 'bcc') or
ui.config('patchbomb', 'bcc') or '').split(',')
bcc = [a.strip() for a in bcc if a.strip()]
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 ui.write('\n')
Johannes Stezenbach
add --mbox output to patchbomb...
r1702 if not opts['test'] and not opts['mbox']:
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 mailer = mail.connect(ui)
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 parent = None
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]
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 for m in msgs:
try:
m['Message-Id'] = genmsgid(m['X-Mercurial-Node'])
except TypeError:
m['Message-Id'] = genmsgid('patchbomb')
if parent:
m['In-Reply-To'] = parent
else:
parent = m['Message-Id']
Christian Ebert
patchbomb: fix timezone offset in message date header...
r4027 m['Date'] = util.datestr(date=start_time,
format="%a, %d %b %Y %H:%M:%S", timezone=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
optionally send blind carbon copies...
r2679 if cc: m['Cc'] = ', '.join(cc)
if bcc: m['Bcc'] = ', '.join(bcc)
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 if opts['test']:
Johannes Stezenbach
add --mbox output to patchbomb...
r1702 ui.status('Displaying ', m['Subject'], ' ...\n')
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 fp = os.popen(os.getenv('PAGER', 'more'), 'w')
Vadim Gelfer
patchbomb: ignore exception if pager quits.
r1871 try:
fp.write(m.as_string(0))
fp.write('\n')
except IOError, inst:
if inst.errno != errno.EPIPE:
raise
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 fp.close()
Johannes Stezenbach
add --mbox output to patchbomb...
r1702 elif opts['mbox']:
ui.status('Writing ', m['Subject'], ' ...\n')
fp = open(opts['mbox'], m.has_key('In-Reply-To') and 'ab+' or 'wb+')
Christian Ebert
patchbomb: fix timezone offset in message date header...
r4027 date = util.datestr(date=start_time,
format='%a %b %d %H:%M:%S %Y', timezone=False)
Johannes Stezenbach
add --mbox output to patchbomb...
r1702 fp.write('From %s %s\n' % (sender_addr, date))
fp.write(m.as_string(0))
fp.write('\n\n')
fp.close()
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 else:
Johannes Stezenbach
add --mbox output to patchbomb...
r1702 ui.status('Sending ', m['Subject'], ' ...\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']
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 mailer.sendmail(sender, to + bcc + cc, m.as_string(0))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
cmdtable = {
'email':
(patchbomb,
Christian Ebert
patchbomb: optionally send patches as inline attachments
r2707 [('a', 'attach', None, 'send patches as inline attachments'),
('', 'bcc', [], 'email addresses of blind copy recipients'),
Christian Ebert
optionally send blind carbon copies...
r2679 ('c', 'cc', [], 'email addresses of copy recipients'),
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 ('d', 'diffstat', None, 'add diffstat output to messages'),
Brendan Cully
Add --git support to hg email
r3030 ('g', 'git', None, _('use git extended diff format')),
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 ('f', 'from', '', 'email address of sender'),
('', 'plain', None, 'omit hg patch header'),
('n', 'test', None, 'print messages that would be sent'),
Johannes Stezenbach
add --mbox output to patchbomb...
r1702 ('m', 'mbox', '', 'write messages to mbox file instead of sending them'),
Brendan Cully
Add --outgoing option to patchbomb
r4262 ('o', 'outgoing', None, _('send changes not found in the target repository')),
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 ('b', 'bundle', None, _('send changes not in target as a binary bundle')),
Brendan Cully
Add --outgoing option to patchbomb
r4262 ('r', 'rev', [], _('a revision to send')),
Thomas Arendsen Hein
patchbomb: Allow to specify subject of single-patch-series (issue475)
r4141 ('s', 'subject', '', 'subject of first message (intro or single patch)'),
John Goerzen
Add common bundle/outgoing options to hg email
r4279 ('t', 'to', [], 'email addresses of recipients'),
('', 'force', None, _('run even when remote repository is unrelated (with -b)')),
('', 'base', [],
_('a base changeset to specify instead of a destination (with -b)'))]
+ commands.remoteopts,
Brendan Cully
Add --outgoing option to patchbomb
r4262 "hg email [OPTION]... [DEST]...")
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 }