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

comparison hgext/patchbomb.py @ 12200:aebb39d45500

patchbomb: let diffstat prompt only once with complete summary This changes the behaviour of --diffstat. Before the user was asked for confirmation of each patch with its description and diffstat, and a final summary. Now there is only one prompt right before sending with a final summary which does not include the patch descriptions, but the message details and the diffstats: Final summary: From: sender To: recipient(s) Cc: (if present) Bcc: (if present) Reply-To: (if present) Subject: [patch 0 of x [flags]] intro (if present) a | 28 ++++++++++++++++++++++++++++ b | 15 +++++++++++++++ Subject: [patch 1 of x [flags]] subject a | 28 ++++++++++++++++++++++++++++ [ ... ] are you sure you want to send (yn)?

author	Christian Ebert <blacktrash@gmx.net>
date	Fri, 10 Sep 2010 15:32:14 +0200
parents	17d604e522b4
children	5bfa45651cf6

comparison

equal deleted inserted replaced

-:17d604e522b4
+:aebb39d45500
 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.
-With the -d/--diffstat option, you will be prompted for each changeset
+With the -d/--diffstat option, you will be presented with a final
-with a diffstat summary and the changeset summary, so you can be sure
+summary of all messages and asked for confirmation before the messages
-you are sending the right changes.
+are sent.
 To configure other defaults, add a section like this to your hgrc
 file::
 [email]
 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)
-if summary:
-ui.write(summary, '\n')
-ui.write(s, '\n')
-if ui.promptchoice(_('does the diffstat above look okay (yn)?'),
-(_('&Yes'), _('&No'))):
-raise util.Abort(_('diffstat rejected'))
-return s
 def introneeded(opts, number):
 '''is an introductory message required?'''
 return number > 1 or opts.get('intro') or opts.get('desc')
 def makepatch(ui, repo, patchlines, opts, _charsets, idx, total,
 if patchlines:
 patchlines.pop(0)
 while patchlines and not patchlines[0].strip():
 patchlines.pop(0)
+ds = patch.diffstat(patchlines)
 if opts.get('diffstat'):
-body += cdiffstat(ui, '\n'.join(desc), patchlines) + '\n\n'
+body += ds + '\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')))
 else:
 tlen = len(str(total))
 subj = '[PATCH %0*d of %d%s] %s' % (tlen, idx, total, flag, subj)
 msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get('test'))
 msg['X-Mercurial-Node'] = node
-return msg, subj
+return msg, subj, ds
 def patchbomb(ui, repo, *revs, **opts):
 '''send changesets by email
 By default, diffs are sent in the format generated by
 subj = '[PATCH %0*d of %d]' % (tlen, 0, len(patches))
 subj += ' ' + (opts.get('subject') or
 prompt(ui, 'Subject: ', rest=subj))
 body = ''
-if opts.get('diffstat'):
+ds = patch.diffstat(jumbo)
-d = cdiffstat(ui, _('Final summary:\n'), jumbo)
+if ds and opts.get('diffstat'):
-if d:
+body = '\n' + ds
-body = '\n' + d
 body = getdescription(body, sender)
 msg = mail.mimeencode(ui, body, _charsets, opts.get('test'))
 msg['Subject'] = mail.headencode(ui, subj, _charsets,
 opts.get('test'))
-msgs.insert(0, (msg, subj))
+msgs.insert(0, (msg, subj, ds))
 return msgs
 def getbundlemsgs(bundle):
 subj = (opts.get('subject')
 or prompt(ui, 'Subject:', 'A bundle for your repository'))
 datapart.add_header('Content-Disposition', 'attachment',
 filename=bundlename)
 email.Encoders.encode_base64(datapart)
 msg.attach(datapart)
 msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get('test'))
-return [(msg, subj)]
+return [(msg, subj, None)]
 sender = (opts.get('from') or ui.config('email', 'from') or
 ui.config('patchbomb', 'from') or
 prompt(ui, 'From', ui.username()))
 elif bundle:
 msgs = getbundlemsgs(getbundle(dest))
 else:
 msgs = getpatchmsgs(list(getpatches(revs)))
+showaddrs = []
 def getaddrs(opt, prpt=None, default=None):
 addrs = opts.get(opt.replace('-', '_'))
+if opt != 'reply-to':
+showaddr = '%s:' % opt.capitalize()
+else:
+showaddr = 'Reply-To:'
 if addrs:
+showaddrs.append('%s %s' % (showaddr, ', '.join(addrs)))
 return mail.addrlistencode(ui, addrs, _charsets,
 opts.get('test'))
 addrs = ui.config('email', opt) or ui.config('patchbomb', opt) or ''
 if not addrs and prpt:
 addrs = prompt(ui, prpt, default)
+if addrs:
+showaddr = '%s %s' % (showaddr, addrs)
+showaddrs.append(showaddr)
 return mail.addrlistencode(ui, [addrs], _charsets, opts.get('test'))
 to = getaddrs('to', 'To')
 cc = getaddrs('cc', 'Cc', '')
 bcc = getaddrs('bcc')
 replyto = getaddrs('reply-to')
+if opts.get('diffstat'):
+ui.write(_('\nFinal summary:\n\n'))
+ui.write('From: %s\n' % sender)
+for addr in showaddrs:
+ui.write('%s\n' % addr)
+for m, subj, ds in msgs:
+ui.write('Subject: %s\n' % subj)
+if ds:
+ui.write(ds)
+ui.write('\n')
+if ui.promptchoice(_('are you sure you want to send (yn)?'),
+(_('&Yes'), _('&No'))):
+raise util.Abort(_('patchbomb canceled'))
 ui.write('\n')
 parent = opts.get('in_reply_to') or None
 # angle brackets may be omitted, they're not semantically part of the msg-id
 first = True
 sender_addr = email.Utils.parseaddr(sender)[1]
 sender = mail.addressencode(ui, sender, _charsets, opts.get('test'))
 sendmail = None
-for m, subj in msgs:
+for m, subj, ds in msgs:
 try:
 m['Message-Id'] = genmsgid(m['X-Mercurial-Node'])
 except TypeError:
 m['Message-Id'] = genmsgid('patchbomb')
 if parent:

Mercurial > public > mercurial-scm > hg

comparison hgext/patchbomb.py @ 12200:aebb39d45500