##// END OF EJS Templates
manifest: remove execf/linkf methods
manifest: remove execf/linkf methods

File last commit:

r6666:53465a74 default
r6749:51b0e799 default
Show More
patchbomb.py
466 lines | 17.0 KiB | text/x-python | PythonLexer
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666 '''sending 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.
To enable this extension:
[extensions]
hgext.patchbomb =
To configure other defaults, add a section like this to your hgrc file:
[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, patchbomb messages are displayed. If PAGER environment variable
is set, 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
Christian Ebert
patchbomb: fix cStringIO import (spotted by pychecker)
r6478 import os, errno, socket, tempfile, cStringIO
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 import email.MIMEMultipart, email.MIMEText, email.MIMEBase
Benoit Boissinot
patchbomb: Fix mangling of lines beginning with From...
r6447 import email.Utils, email.Encoders, email.Generator
Joel Rosdahl
Remove unused imports
r6212 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
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
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):
Patrick Mezard
patchbomb: prompt with ui.prompt()...
r5641 if not ui.interactive:
return default
Christian Ebert
patchbomb: add linebreaks after colons (coding style)
r5785 if default:
prompt += ' [%s]' % default
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 prompt += rest
while True:
Patrick Mezard
patchbomb: prompt with ui.prompt()...
r5641 r = ui.prompt(prompt, default=default)
Christian Ebert
patchbomb: add linebreaks after colons (coding style)
r5785 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
Christian Ebert
patchbomb: no traceback if (diffstat) confirmation is refused
r5479 def confirm(s, denial):
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 if not prompt(s, default = 'y', rest = '? ').lower().startswith('y'):
Christian Ebert
patchbomb: no traceback if (diffstat) confirmation is refused
r5479 raise util.Abort(denial)
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
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')
Christian Ebert
patchbomb: no traceback if (diffstat) confirmation is refused
r5479 confirm(_('Does the diffstat above look okay'),
_('diffstat rejected'))
Benoit Boissinot
patchbomb: fix traceback when diffstat isn't available
r5478 elif s is None:
ui.warn(_('No diffstat information available.\n'))
s = ''
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('#'):
Christian Ebert
patchbomb: add linebreaks after colons (coding style)
r5785 if line.startswith('# Node ID'):
node = line.split()[-1]
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 continue
Christian Ebert
patchbomb: simplify some line continuations
r5786 if line.startswith('diff -r') or line.startswith('diff --git'):
Brendan Cully
Detect git patches in patchbomb makepatch function
r3054 break
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 desc.append(line)
Christian Ebert
patchbomb: add linebreaks after colons (coding style)
r5785 if not node:
raise ValueError
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Dennis Schoen
patchbomb: attachment options changed...
r5819 if opts['attach']:
body = ('\n'.join(desc[1:]).strip() or
'Patch subject is complete summary.')
body += '\n\n\n'
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
Christian Ebert
patchbomb: consistently use opts.get
r5818 if opts.get('plain'):
Christian Ebert
patchbomb: add linebreaks after colons (coding style)
r5785 while patch and patch[0].startswith('# '):
patch.pop(0)
if patch:
patch.pop(0)
while patch and not patch[0].strip():
patch.pop(0)
Christian Ebert
patchbomb: consistently use opts.get
r5818 if opts.get('diffstat'):
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 body += cdiffstat('\n'.join(desc), patch) + '\n\n'
Dennis Schoen
patchbomb: attachment options changed...
r5819 if opts.get('attach') or opts.get('inline'):
Christian Ebert
patchbomb: optionally send patches as inline attachments
r2707 msg = email.MIMEMultipart.MIMEMultipart()
Christian Ebert
patchbomb: add linebreaks after colons (coding style)
r5785 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: simplify some line continuations
r5786 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)
Dennis Schoen
patchbomb: attachment options changed...
r5819 disposition = 'inline'
if opts['attach']:
disposition = 'attachment'
p['Content-Disposition'] = disposition + '; filename=' + patchname
Vadim Gelfer
patchbomb: add content-disposition to make display inline and add filename...
r2708 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:
Christian Ebert
patchbomb: consistently use opts.get
r5818 subj = '[PATCH] ' + (opts.get('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)
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')
or opts.get('outgoing') or opts.get('bundle')):
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: 0c61124ad877 moved setremoteconfig into cmdutil
r4564 cmdutil.setremoteconfig(ui, opts)
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
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 = []
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
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 = []
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
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)))
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 subj = '[PATCH %0*d of %d] %s' % (
Christian Ebert
patchbomb: simplify some line continuations
r5786 tlen, 0, len(patches),
Christian Ebert
patchbomb: consistently use opts.get
r5818 opts.get('subject') or
Christian Ebert
patchbomb: simplify some line continuations
r5786 prompt('Subject:',
rest=' [PATCH %0*d of %d] ' % (tlen, 0, len(patches))))
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'):
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 d = cdiffstat(_('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)
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 msg = email.MIMEText.MIMEText(body)
msg['Subject'] = subj
Vadim Gelfer
turn patchbomb script into an extension module....
r1669
John Goerzen
Add ability to send bundles to patchbomb extension
r4278 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):
Christian Ebert
patchbomb: consistently use opts.get
r5818 subj = (opts.get('subject')
Thomas Arendsen Hein
Cleanup of whitespace, indentation and line continuation.
r4633 or prompt('Subject:', default='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:
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]
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
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 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
def getaddrs(opt, prpt, default = None):
Christian Ebert
patchbomb: consistently use opts.get
r5818 addrs = opts.get(opt) or (ui.config('email', opt) or
ui.config('patchbomb', opt) or
prompt(prpt, default = default)).split(',')
Vadim Gelfer
turn patchbomb script into an extension module....
r1669 return [a.strip() for a in addrs if a.strip()]
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', '')
Christian Ebert
patchbomb: consistently use opts.get
r5818 bcc = opts.get('bcc') or (ui.config('email', 'bcc') or
Christian Ebert
optionally send blind carbon copies...
r2679 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')
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]
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 sendmail = None
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']
Matt Mackall
dates: improve timezone handling...
r6229 m['Date'] = util.datestr(start_time, "%a, %d %b %Y %H:%M:%S %1%2")
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)
Christian Ebert
patchbomb: consistently use opts.get
r5818 if opts.get('test'):
Johannes Stezenbach
add --mbox output to patchbomb...
r1702 ui.status('Displaying ', m['Subject'], ' ...\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'):
Johannes Stezenbach
add --mbox output to patchbomb...
r1702 ui.status('Writing ', m['Subject'], ' ...\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)
Matt Mackall
dates: improve timezone handling...
r6229 date = util.datestr(start_time, '%a %b %d %H:%M:%S %Y')
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)
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']
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
cmdtable = {
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 "email":
(patchbomb,
Dennis Schoen
patchbomb: attachment options changed...
r5819 [('a', 'attach', None, _('send patches as attachments')),
('i', 'inline', None, _('send patches as inline attachments')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 ('', 'bcc', [], _('email addresses of blind copy recipients')),
('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 ('g', 'git', None, _('use git extended diff format')),
('f', 'from', '', _('email address of sender')),
('', 'plain', None, _('omit hg patch header')),
('n', 'test', None, _('print messages that would be sent')),
('m', 'mbox', '',
_('write messages to mbox file instead of sending them')),
('o', 'outgoing', None,
_('send changes not found in the target repository')),
('b', 'bundle', None,
_('send changes not in target as a binary bundle')),
('r', 'rev', [], _('a revision to send')),
('s', 'subject', '',
_('subject of first message (intro or single patch)')),
('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,
_('hg email [OPTION]... [DEST]...'))
}