Mercurial > public > mercurial-scm > hg
annotate hgext/patchbomb.py @ 1702:e291d9a30bef
add --mbox output to patchbomb
add option to save generated mails in an mbox file for later
processing with formail, instead of sending them directly
| author | Johannes Stezenbach <js@linuxtv.org> |
|---|---|
| date | Mon, 06 Feb 2006 17:34:39 -0600 |
| parents | e70e1ed66093 |
| children | 26dd4ae77b7b |
| rev | line source |
|---|---|
|
1669
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
1 # Command for sending a collection of Mercurial changesets as a series |
|
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
2 # of patch emails. |
| 875 | 3 # |
| 4 # The series is started off with a "[PATCH 0 of N]" introduction, | |
| 5 # which describes the series as a whole. | |
| 6 # | |
| 7 # Each patch email has a Subject line of "[PATCH M of N] ...", using | |
| 8 # the first line of the changeset description as the subject text. | |
| 9 # The message contains two or three body parts: | |
| 10 # | |
| 11 # The remainder of the changeset description. | |
| 12 # | |
|
877
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
13 # [Optional] If the diffstat program is installed, the result of |
|
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
14 # running diffstat on the patch. |
| 875 | 15 # |
| 16 # The patch itself, as generated by "hg export". | |
| 17 # | |
| 18 # Each message refers to all of its predecessors using the In-Reply-To | |
| 19 # and References headers, so they will show up as a sequence in | |
| 20 # threaded mail and news readers, and in mail archives. | |
| 21 # | |
| 22 # For each changeset, you will be prompted with a diffstat summary and | |
| 23 # the changeset summary, so you can be sure you are sending the right | |
| 24 # changes. | |
| 25 # | |
| 26 # It is best to run this script with the "-n" (test only) flag before | |
|
877
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
27 # firing it up "for real", in which case it will use your pager to |
|
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
28 # display each of the messages that it would send. |
| 875 | 29 # |
|
1702
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
30 # The "-m" (mbox) option will create an mbox file instead of sending |
|
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
31 # the messages directly. This can be reviewed e.g. with "mutt -R -f mbox", |
|
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
32 # and finally sent with "formail -s sendmail -bm -t < mbox". |
|
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
33 # |
| 875 | 34 # To configure a default mail host, add a section like this to your |
| 35 # hgrc file: | |
| 36 # | |
| 37 # [smtp] | |
| 38 # host = my_mail_host | |
| 39 # port = 1025 | |
|
1226
f3837564ed03
patchbomb: add TLS and SMTP AUTH support.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1204
diff
changeset
|
40 # tls = yes # or omit if not needed |
|
f3837564ed03
patchbomb: add TLS and SMTP AUTH support.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1204
diff
changeset
|
41 # username = user # if SMTP authentication required |
|
f3837564ed03
patchbomb: add TLS and SMTP AUTH support.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1204
diff
changeset
|
42 # password = password # if SMTP authentication required - PLAINTEXT |
|
877
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
43 # |
|
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
44 # To configure other defaults, add a section like this to your hgrc |
|
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
45 # file: |
|
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
46 # |
|
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
47 # [patchbomb] |
|
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
48 # from = My Name <my@email> |
|
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
49 # to = recipient1, recipient2, ... |
|
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
50 # cc = cc1, cc2, ... |
| 875 | 51 |
| 52 from email.MIMEMultipart import MIMEMultipart | |
| 53 from email.MIMEText import MIMEText | |
|
1702
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
54 from email.Utils import parseaddr |
| 875 | 55 from mercurial import commands |
| 56 from mercurial import hg | |
| 57 from mercurial import ui | |
|
1671
ba30c17d55f6
forgot to add import statement for _.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
58 from mercurial.i18n import gettext as _ |
| 875 | 59 import os |
| 60 import popen2 | |
| 61 import smtplib | |
| 62 import socket | |
| 63 import sys | |
| 64 import tempfile | |
| 65 import time | |
| 66 | |
|
1204
b0f6053df539
patchbomb: continue if we can't import readline.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1154
diff
changeset
|
67 try: |
|
b0f6053df539
patchbomb: continue if we can't import readline.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1154
diff
changeset
|
68 # readline gives raw_input editing capabilities, but is not |
|
b0f6053df539
patchbomb: continue if we can't import readline.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1154
diff
changeset
|
69 # present on windows |
|
b0f6053df539
patchbomb: continue if we can't import readline.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1154
diff
changeset
|
70 import readline |
|
b0f6053df539
patchbomb: continue if we can't import readline.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1154
diff
changeset
|
71 except ImportError: pass |
|
b0f6053df539
patchbomb: continue if we can't import readline.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1154
diff
changeset
|
72 |
| 875 | 73 def diffstat(patch): |
| 74 fd, name = tempfile.mkstemp() | |
| 75 try: | |
| 76 p = popen2.Popen3('diffstat -p1 -w79 2>/dev/null > ' + name) | |
| 77 try: | |
| 78 for line in patch: print >> p.tochild, line | |
| 79 p.tochild.close() | |
| 80 if p.wait(): return | |
| 81 fp = os.fdopen(fd, 'r') | |
| 82 stat = [] | |
| 83 for line in fp: stat.append(line.lstrip()) | |
| 84 last = stat.pop() | |
| 85 stat.insert(0, last) | |
| 86 stat = ''.join(stat) | |
| 87 if stat.startswith('0 files'): raise ValueError | |
| 88 return stat | |
| 89 except: raise | |
| 90 finally: | |
| 91 try: os.unlink(name) | |
| 92 except: pass | |
| 93 | |
| 94 def patchbomb(ui, repo, *revs, **opts): | |
|
1672
07f931af5f40
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
95 '''send changesets as a series of patch emails |
|
07f931af5f40
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
96 |
|
07f931af5f40
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
97 The series starts with a "[PATCH 0 of N]" introduction, which |
|
07f931af5f40
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
98 describes the series as a whole. |
|
07f931af5f40
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
99 |
|
07f931af5f40
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
100 Each patch email has a Subject line of "[PATCH M of N] ...", using |
|
07f931af5f40
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
101 the first line of the changeset description as the subject text. |
|
07f931af5f40
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
102 The message contains two or three body parts. First, the rest of |
|
07f931af5f40
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
103 the changeset description. Next, (optionally) if the diffstat |
|
07f931af5f40
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
104 program is installed, the result of running diffstat on the patch. |
|
07f931af5f40
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1670
diff
changeset
|
105 Finally, the patch itself, as generated by "hg export".''' |
| 875 | 106 def prompt(prompt, default = None, rest = ': ', empty_ok = False): |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
107 if default: prompt += ' [%s]' % default |
|
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
108 prompt += rest |
|
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
109 while True: |
| 875 | 110 r = raw_input(prompt) |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
111 if r: return r |
|
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
112 if default is not None: return default |
|
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
113 if empty_ok: return r |
|
1670
fe19c54ee403
add _ to several strings
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1669
diff
changeset
|
114 ui.warn(_('Please enter a valid value.\n')) |
| 875 | 115 |
| 116 def confirm(s): | |
| 117 if not prompt(s, default = 'y', rest = '? ').lower().startswith('y'): | |
| 118 raise ValueError | |
| 119 | |
| 120 def cdiffstat(summary, patch): | |
| 121 s = diffstat(patch) | |
| 122 if s: | |
| 123 if summary: | |
| 124 ui.write(summary, '\n') | |
| 125 ui.write(s, '\n') | |
|
1670
fe19c54ee403
add _ to several strings
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1669
diff
changeset
|
126 confirm(_('Does the diffstat above look okay')) |
| 875 | 127 return s |
| 128 | |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
129 def makepatch(patch, idx, total): |
| 875 | 130 desc = [] |
| 131 node = None | |
|
1135
e455d91f6259
Variable 'body' was missing in patchbomb script.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1118
diff
changeset
|
132 body = '' |
| 875 | 133 for line in patch: |
| 134 if line.startswith('#'): | |
| 135 if line.startswith('# Node ID'): node = line.split()[-1] | |
| 136 continue | |
| 137 if line.startswith('diff -r'): break | |
| 138 desc.append(line) | |
| 139 if not node: raise ValueError | |
|
1118
63b5f68d8167
patchbomb: eliminate silly complete summary message
mpm@selenic.com
parents:
1032
diff
changeset
|
140 |
|
63b5f68d8167
patchbomb: eliminate silly complete summary message
mpm@selenic.com
parents:
1032
diff
changeset
|
141 #body = ('\n'.join(desc[1:]).strip() or |
|
63b5f68d8167
patchbomb: eliminate silly complete summary message
mpm@selenic.com
parents:
1032
diff
changeset
|
142 # 'Patch subject is complete summary.') |
|
63b5f68d8167
patchbomb: eliminate silly complete summary message
mpm@selenic.com
parents:
1032
diff
changeset
|
143 #body += '\n\n\n' |
|
63b5f68d8167
patchbomb: eliminate silly complete summary message
mpm@selenic.com
parents:
1032
diff
changeset
|
144 |
|
1604
da3f1121721b
add --plain option to patchbomb.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1603
diff
changeset
|
145 if opts['plain']: |
|
da3f1121721b
add --plain option to patchbomb.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1603
diff
changeset
|
146 while patch and patch[0].startswith('# '): patch.pop(0) |
|
da3f1121721b
add --plain option to patchbomb.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1603
diff
changeset
|
147 if patch: patch.pop(0) |
|
da3f1121721b
add --plain option to patchbomb.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1603
diff
changeset
|
148 while patch and not patch[0].strip(): patch.pop(0) |
|
877
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
149 if opts['diffstat']: |
|
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
150 body += cdiffstat('\n'.join(desc), patch) + '\n\n' |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
151 body += '\n'.join(patch) |
|
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
152 msg = MIMEText(body) |
| 875 | 153 subj = '[PATCH %d of %d] %s' % (idx, total, desc[0].strip()) |
| 154 if subj.endswith('.'): subj = subj[:-1] | |
| 155 msg['Subject'] = subj | |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
156 msg['X-Mercurial-Node'] = node |
| 875 | 157 return msg |
| 158 | |
| 159 start_time = int(time.time()) | |
| 160 | |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
161 def genmsgid(id): |
| 875 | 162 return '<%s.%s@%s>' % (id[:20], start_time, socket.getfqdn()) |
| 163 | |
| 164 patches = [] | |
| 165 | |
| 166 class exportee: | |
| 167 def __init__(self, container): | |
| 168 self.lines = [] | |
| 169 self.container = container | |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
170 self.name = 'email' |
| 875 | 171 |
| 172 def write(self, data): | |
| 173 self.lines.append(data) | |
| 174 | |
| 175 def close(self): | |
| 176 self.container.append(''.join(self.lines).split('\n')) | |
| 177 self.lines = [] | |
| 178 | |
|
1669
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
179 commands.export(ui, repo, *revs, **{'output': exportee(patches), |
|
1603
5352a5407dc1
make patchbomb work with recent changes to export
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1226
diff
changeset
|
180 'switch_parent': False, |
|
1032
706c590c9060
Get patchbomb working with tip again.
Bryan O'Sullivan <bos@serpentine.com>
parents:
998
diff
changeset
|
181 'text': None}) |
| 875 | 182 |
| 183 jumbo = [] | |
| 184 msgs = [] | |
| 185 | |
|
1670
fe19c54ee403
add _ to several strings
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1669
diff
changeset
|
186 ui.write(_('This patch series consists of %d patches.\n\n') % len(patches)) |
| 875 | 187 |
| 188 for p, i in zip(patches, range(len(patches))): | |
| 189 jumbo.extend(p) | |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
190 msgs.append(makepatch(p, i + 1, len(patches))) |
| 875 | 191 |
|
1670
fe19c54ee403
add _ to several strings
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1669
diff
changeset
|
192 ui.write(_('\nWrite the introductory message for the patch series.\n\n')) |
| 875 | 193 |
|
877
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
194 sender = (opts['from'] or ui.config('patchbomb', 'from') or |
|
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
195 prompt('From', ui.username())) |
| 875 | 196 |
| 197 msg = MIMEMultipart() | |
| 198 msg['Subject'] = '[PATCH 0 of %d] %s' % ( | |
| 199 len(patches), | |
|
877
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
200 opts['subject'] or |
| 875 | 201 prompt('Subject:', rest = ' [PATCH 0 of %d] ' % len(patches))) |
|
1154
c3cb9f39a91f
patchbomb: fix up confusion between strings and lists of strings.
bos@serpentine.internal.keyresearch.com
parents:
1136
diff
changeset
|
202 |
|
c3cb9f39a91f
patchbomb: fix up confusion between strings and lists of strings.
bos@serpentine.internal.keyresearch.com
parents:
1136
diff
changeset
|
203 def getaddrs(opt, prpt, default = None): |
|
c3cb9f39a91f
patchbomb: fix up confusion between strings and lists of strings.
bos@serpentine.internal.keyresearch.com
parents:
1136
diff
changeset
|
204 addrs = opts[opt] or (ui.config('patchbomb', opt) or |
|
c3cb9f39a91f
patchbomb: fix up confusion between strings and lists of strings.
bos@serpentine.internal.keyresearch.com
parents:
1136
diff
changeset
|
205 prompt(prpt, default = default)).split(',') |
|
c3cb9f39a91f
patchbomb: fix up confusion between strings and lists of strings.
bos@serpentine.internal.keyresearch.com
parents:
1136
diff
changeset
|
206 return [a.strip() for a in addrs if a.strip()] |
|
c3cb9f39a91f
patchbomb: fix up confusion between strings and lists of strings.
bos@serpentine.internal.keyresearch.com
parents:
1136
diff
changeset
|
207 to = getaddrs('to', 'To') |
|
c3cb9f39a91f
patchbomb: fix up confusion between strings and lists of strings.
bos@serpentine.internal.keyresearch.com
parents:
1136
diff
changeset
|
208 cc = getaddrs('cc', 'Cc', '') |
| 875 | 209 |
|
1670
fe19c54ee403
add _ to several strings
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1669
diff
changeset
|
210 ui.write(_('Finish with ^D or a dot on a line by itself.\n\n')) |
| 875 | 211 |
| 212 body = [] | |
| 213 | |
| 214 while True: | |
| 215 try: l = raw_input() | |
| 216 except EOFError: break | |
| 217 if l == '.': break | |
| 218 body.append(l) | |
| 219 | |
| 220 msg.attach(MIMEText('\n'.join(body) + '\n')) | |
| 221 | |
| 222 ui.write('\n') | |
| 223 | |
|
1136
d451888505d7
Make diffstat optional for patchbomb script.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1135
diff
changeset
|
224 if opts['diffstat']: |
|
1670
fe19c54ee403
add _ to several strings
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1669
diff
changeset
|
225 d = cdiffstat(_('Final summary:\n'), jumbo) |
|
1136
d451888505d7
Make diffstat optional for patchbomb script.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1135
diff
changeset
|
226 if d: msg.attach(MIMEText(d)) |
| 875 | 227 |
| 228 msgs.insert(0, msg) | |
| 229 | |
|
1702
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
230 if not opts['test'] and not opts['mbox']: |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
231 s = smtplib.SMTP() |
|
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
232 s.connect(host = ui.config('smtp', 'host', 'mail'), |
|
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
233 port = int(ui.config('smtp', 'port', 25))) |
|
1226
f3837564ed03
patchbomb: add TLS and SMTP AUTH support.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1204
diff
changeset
|
234 if ui.configbool('smtp', 'tls'): |
|
f3837564ed03
patchbomb: add TLS and SMTP AUTH support.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1204
diff
changeset
|
235 s.ehlo() |
|
f3837564ed03
patchbomb: add TLS and SMTP AUTH support.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1204
diff
changeset
|
236 s.starttls() |
|
f3837564ed03
patchbomb: add TLS and SMTP AUTH support.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1204
diff
changeset
|
237 s.ehlo() |
|
f3837564ed03
patchbomb: add TLS and SMTP AUTH support.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1204
diff
changeset
|
238 username = ui.config('smtp', 'username') |
|
f3837564ed03
patchbomb: add TLS and SMTP AUTH support.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1204
diff
changeset
|
239 password = ui.config('smtp', 'password') |
|
f3837564ed03
patchbomb: add TLS and SMTP AUTH support.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1204
diff
changeset
|
240 if username and password: |
|
f3837564ed03
patchbomb: add TLS and SMTP AUTH support.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1204
diff
changeset
|
241 s.login(username, password) |
| 875 | 242 parent = None |
| 243 tz = time.strftime('%z') | |
|
1702
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
244 sender_addr = parseaddr(sender)[1] |
| 875 | 245 for m in msgs: |
| 246 try: | |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
247 m['Message-Id'] = genmsgid(m['X-Mercurial-Node']) |
| 875 | 248 except TypeError: |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
249 m['Message-Id'] = genmsgid('patchbomb') |
| 875 | 250 if parent: |
| 251 m['In-Reply-To'] = parent | |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
252 else: |
|
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
253 parent = m['Message-Id'] |
|
877
25430c523677
Polish patchbomb script.
Bryan O'Sullivan <bos@serpentine.com>
parents:
876
diff
changeset
|
254 m['Date'] = time.strftime('%a, %e %b %Y %T ', time.localtime(start_time)) + tz |
| 875 | 255 start_time += 1 |
| 256 m['From'] = sender | |
| 257 m['To'] = ', '.join(to) | |
| 258 if cc: m['Cc'] = ', '.join(cc) | |
| 259 if opts['test']: | |
|
1702
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
260 ui.status('Displaying ', m['Subject'], ' ...\n') |
| 875 | 261 fp = os.popen(os.getenv('PAGER', 'more'), 'w') |
| 262 fp.write(m.as_string(0)) | |
| 263 fp.write('\n') | |
| 264 fp.close() | |
|
1702
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
265 elif opts['mbox']: |
|
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
266 ui.status('Writing ', m['Subject'], ' ...\n') |
|
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
267 fp = open(opts['mbox'], m.has_key('In-Reply-To') and 'ab+' or 'wb+') |
|
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
268 date = time.asctime(time.localtime(start_time)) |
|
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
269 fp.write('From %s %s\n' % (sender_addr, date)) |
|
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
270 fp.write(m.as_string(0)) |
|
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
271 fp.write('\n\n') |
|
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
272 fp.close() |
| 875 | 273 else: |
|
1702
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
274 ui.status('Sending ', m['Subject'], ' ...\n') |
| 875 | 275 s.sendmail(sender, to + cc, m.as_string(0)) |
|
1702
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
276 if not opts['test'] and not opts['mbox']: |
|
876
14cfaaec2e8e
Get patchbomb script to not use MIME attachments.
Bryan O'Sullivan <bos@serpentine.com>
parents:
875
diff
changeset
|
277 s.close() |
| 875 | 278 |
|
1669
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
279 cmdtable = { |
|
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
280 'email': |
|
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
281 (patchbomb, |
|
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
282 [('c', 'cc', [], 'email addresses of copy recipients'), |
|
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
283 ('d', 'diffstat', None, 'add diffstat output to messages'), |
|
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
284 ('f', 'from', '', 'email address of sender'), |
|
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
285 ('', 'plain', None, 'omit hg patch header'), |
|
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
286 ('n', 'test', None, 'print messages that would be sent'), |
|
1702
e291d9a30bef
add --mbox output to patchbomb
Johannes Stezenbach <js@linuxtv.org>
parents:
1691
diff
changeset
|
287 ('m', 'mbox', '', 'write messages to mbox file instead of sending them'), |
|
1669
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
288 ('s', 'subject', '', 'subject of introductory message'), |
|
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
289 ('t', 'to', [], 'email addresses of recipients')], |
|
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
290 "hg email [OPTION]... [REV]...") |
|
91d40fc959f0
turn patchbomb script into an extension module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1604
diff
changeset
|
291 } |