mercurial-crew-with-dirclash: comparison contrib/patchbomb

equal deleted inserted replaced

-:14cfaaec2e8e
+:25430c523677
 # 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.
 #
-#   If the diffstat program is installed, the result of running
+#   [Optional] If the diffstat program is installed, the result of
-#   diffstat on the patch.
+#   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
 # 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.
 #
 # It is best to run this script with the "-n" (test only) flag before
-# firing it up "for real", in which case it will display each of the
+# firing it up "for real", in which case it will use your pager to
-# messages that it would send.
+# display each of the messages that it would send.
 #
 # To configure a default mail host, add a section like this to your
 # hgrc file:
 #
 # [smtp]
 # host = my_mail_host
 # port = 1025
+#
+# To configure other defaults, add a section like this to your hgrc
+# file:
+#
+# [patchbomb]
+# from = My Name <my@email>
+# to = recipient1, recipient2, ...
+# cc = cc1, cc2, ...
 from email.MIMEMultipart import MIMEMultipart
 from email.MIMEText import MIMEText
 from mercurial import commands
 from mercurial import fancyopts
 while True:
 r = raw_input(prompt)
 if r: return r
 if default is not None: return default
 if empty_ok: return r
-print >> sys.stderr, 'Please enter a valid value.'
+ui.warn('Please enter a valid value.\n')
 def confirm(s):
 if not prompt(s, default = 'y', rest = '? ').lower().startswith('y'):
 raise ValueError
 if line.startswith('diff -r'): break
 desc.append(line)
 if not node: raise ValueError
 body = ('\n'.join(desc[1:]).strip() or
 'Patch subject is complete summary.')
-body += '\n\n\n' + cdiffstat('\n'.join(desc), patch) + '\n\n'
+body += '\n\n\n'
+if opts['diffstat']:
+body += cdiffstat('\n'.join(desc), patch) + '\n\n'
 body += '\n'.join(patch)
 msg = MIMEText(body)
 subj = '[PATCH %d of %d] %s' % (idx, total, desc[0].strip())
 if subj.endswith('.'): subj = subj[:-1]
 msg['Subject'] = subj
 jumbo.extend(p)
 msgs.append(makepatch(p, i + 1, len(patches)))
 ui.write('\nWrite the introductory message for the patch series.\n\n')
-sender = opts['sender'] or prompt('From', ui.username())
+sender = (opts['from'] or ui.config('patchbomb', 'from') or
+prompt('From', ui.username()))
 msg = MIMEMultipart()
 msg['Subject'] = '[PATCH 0 of %d] %s' % (
 len(patches),
+opts['subject'] or
 prompt('Subject:', rest = ' [PATCH 0 of %d] ' % len(patches)))
-to = opts['to'] or [s.strip() for s in prompt('To').split(',')]
+to = (opts['to'] or ui.config('patchbomb', 'to') or
-cc = opts['cc'] or [s.strip() for s in prompt('Cc', default = '').split(',')]
+[s.strip() for s in prompt('To').split(',')])
+cc = (opts['cc'] or ui.config('patchbomb', 'cc') or
+[s.strip() for s in prompt('Cc', default = '').split(',')])
 ui.write('Finish with ^D or a dot on a line by itself.\n\n')
 body = []
 m['Message-Id'] = genmsgid('patchbomb')
 if parent:
 m['In-Reply-To'] = parent
 else:
 parent = m['Message-Id']
-m['Date'] = time.strftime('%a, %m %b %Y %T ', time.localtime(start_time)) + tz
+m['Date'] = time.strftime('%a, %e %b %Y %T ', time.localtime(start_time)) + tz
 start_time += 1
 m['From'] = sender
 m['To'] = ', '.join(to)
 if cc: m['Cc'] = ', '.join(cc)
 ui.status('Sending ', m['Subject'], ' ...\n')
 if not opts['test']:
 s.close()
 if __name__ == '__main__':
 optspec = [('c', 'cc', [], 'email addresses of copy recipients'),
+('d', 'diffstat', None, 'add diffstat output to messages'),
+('f', 'from', '', 'email address of sender'),
 ('n', 'test', None, 'print messages that would be sent'),
-('s', 'sender', '', 'email address of sender'),
+('s', 'subject', '', 'subject of introductory message'),
 ('t', 'to', [], 'email addresses of recipients')]
 options = {}
 try:
 args = fancyopts.fancyopts(sys.argv[1:], commands.globalopts + optspec,
 options)

changeset 877	25430c523677
parent 876	14cfaaec2e8e
child 878	781266a78fe1