Commit | Line | Data |
---|---|---|
b4bddc06 CM |
1 | __copyright__ = """ |
2 | Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com> | |
3 | ||
4 | This program is free software; you can redistribute it and/or modify | |
5 | it under the terms of the GNU General Public License version 2 as | |
6 | published by the Free Software Foundation. | |
7 | ||
8 | This program is distributed in the hope that it will be useful, | |
9 | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
11 | GNU General Public License for more details. | |
12 | ||
13 | You should have received a copy of the GNU General Public License | |
14 | along with this program; if not, write to the Free Software | |
15 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
16 | """ | |
17 | ||
6cf5ec9b | 18 | import sys, os, re, time, datetime, socket, smtplib, getpass |
61eed152 | 19 | import email, email.Utils, email.Header |
575bbdae | 20 | from stgit.argparse import opt |
b4bddc06 CM |
21 | from stgit.commands.common import * |
22 | from stgit.utils import * | |
5e888f30 | 23 | from stgit.out import * |
20a52e06 | 24 | from stgit import argparse, stack, git, version, templates |
b4bddc06 | 25 | from stgit.config import config |
a0fe60a2 | 26 | from stgit.run import Run |
ef954fe6 | 27 | from stgit.lib import git as gitlib |
b4bddc06 | 28 | |
575bbdae | 29 | help = 'Send a patch or series of patches by e-mail' |
33ff9cdd | 30 | kind = 'patch' |
54239abf | 31 | usage = [' [options] [--] [<patch1>] [<patch2>] [<patch3>..<patch4>]'] |
575bbdae | 32 | description = r""" |
cec913c4 KH |
33 | Send a patch or a range of patches by e-mail using the SMTP server |
34 | specified by the 'stgit.smtpserver' configuration option, or the | |
a0fe60a2 CM |
35 | '--smtp-server' command line option. This option can also be an |
36 | absolute path to 'sendmail' followed by command line arguments. | |
37 | ||
38 | The From address and the e-mail format are generated from the template | |
39 | file passed as argument to '--template' (defaulting to | |
40 | '.git/patchmail.tmpl' or '~/.stgit/templates/patchmail.tmpl' or | |
e5c32acf | 41 | '/usr/share/stgit/templates/patchmail.tmpl'). A patch can be sent as |
a0fe60a2 CM |
42 | attachment using the --attach option in which case the |
43 | 'mailattch.tmpl' template will be used instead of 'patchmail.tmpl'. | |
79df2f0d CM |
44 | |
45 | The To/Cc/Bcc addresses can either be added to the template file or | |
46 | passed via the corresponding command line options. They can be e-mail | |
47 | addresses or aliases which are automatically expanded to the values | |
48 | stored in the [mail "alias"] section of GIT configuration files. | |
2bb96902 | 49 | |
0ba13ee9 KH |
50 | A preamble e-mail can be sent using the '--cover' and/or |
51 | '--edit-cover' options. The first allows the user to specify a file to | |
52 | be used as a template. The latter option will invoke the editor on the | |
53 | specified file (defaulting to '.git/covermail.tmpl' or | |
94d18868 YD |
54 | '~/.stgit/templates/covermail.tmpl' or |
55 | '/usr/share/stgit/templates/covermail.tmpl'). | |
e3e05587 CM |
56 | |
57 | All the subsequent e-mails appear as replies to the first e-mail sent | |
58 | (either the preamble or the first patch). E-mails can be seen as | |
ae5305d2 | 59 | replies to a different e-mail by using the '--in-reply-to' option. |
26aab5b0 CM |
60 | |
61 | SMTP authentication is also possible with '--smtp-user' and | |
62 | '--smtp-password' options, also available as configuration settings: | |
fc44c2ca PR |
63 | 'smtpuser' and 'smtppassword'. TLS encryption can be enabled by |
64 | '--smtp-tls' option and 'smtptls' setting. | |
26aab5b0 | 65 | |
27827959 KH |
66 | The following variables are accepted by both the preamble and the |
67 | patch e-mail templates: | |
26aab5b0 | 68 | |
26aab5b0 | 69 | %(diffstat)s - diff statistics |
27827959 | 70 | %(number)s - empty if only one patch is sent or ' patchnr/totalnr' |
26aab5b0 | 71 | %(patchnr)s - patch number |
27827959 | 72 | %(sender)s - 'sender' or 'authname <authemail>' as per the config file |
26aab5b0 | 73 | %(totalnr)s - total number of patches to be sent |
27827959 KH |
74 | %(version)s - ' version' string passed on the command line (or empty) |
75 | ||
76 | In addition to the common variables, the preamble e-mail template | |
77 | accepts the following: | |
78 | ||
79 | %(shortlog)s - first line of each patch description, listed by author | |
80 | ||
81 | In addition to the common variables, the patch e-mail template accepts | |
82 | the following: | |
83 | ||
26aab5b0 | 84 | %(authdate)s - patch creation date |
27827959 KH |
85 | %(authemail)s - author's email |
86 | %(authname)s - author's name | |
26aab5b0 | 87 | %(commemail)s - committer's e-mail |
27827959 KH |
88 | %(commname)s - committer's name |
89 | %(diff)s - unified diff of the patch | |
77eeb7f4 | 90 | %(fromauth)s - 'From: author\n\n' if different from sender |
27827959 KH |
91 | %(longdescr)s - the rest of the patch description, after the first line |
92 | %(patch)s - patch name | |
93 | %(prefix)s - 'prefix ' string passed on the command line | |
94 | %(shortdescr)s - the first line of the patch description""" | |
b4bddc06 | 95 | |
6c8a90e1 KH |
96 | args = [argparse.patch_range(argparse.applied_patches, |
97 | argparse.unapplied_patches, | |
98 | argparse.hidden_patches)] | |
575bbdae KH |
99 | options = [ |
100 | opt('-a', '--all', action = 'store_true', | |
101 | short = 'E-mail all the applied patches'), | |
102 | opt('--to', action = 'append', | |
103 | short = 'Add TO to the To: list'), | |
104 | opt('--cc', action = 'append', | |
105 | short = 'Add CC to the Cc: list'), | |
106 | opt('--bcc', action = 'append', | |
107 | short = 'Add BCC to the Bcc: list'), | |
108 | opt('--auto', action = 'store_true', | |
109 | short = 'Automatically cc the patch signers'), | |
ae5305d2 | 110 | opt('--no-thread', action = 'store_true', |
575bbdae KH |
111 | short = 'Do not send subsequent messages as replies'), |
112 | opt('--unrelated', action = 'store_true', | |
113 | short = 'Send patches without sequence numbering'), | |
114 | opt('--attach', action = 'store_true', | |
115 | short = 'Send a patch as attachment'), | |
116 | opt('-v', '--version', metavar = 'VERSION', | |
117 | short = 'Add VERSION to the [PATCH ...] prefix'), | |
118 | opt('--prefix', metavar = 'PREFIX', | |
119 | short = 'Add PREFIX to the [... PATCH ...] prefix'), | |
120 | opt('-t', '--template', metavar = 'FILE', | |
121 | short = 'Use FILE as the message template'), | |
122 | opt('-c', '--cover', metavar = 'FILE', | |
123 | short = 'Send FILE as the cover message'), | |
124 | opt('-e', '--edit-cover', action = 'store_true', | |
125 | short = 'Edit the cover message before sending'), | |
126 | opt('-E', '--edit-patches', action = 'store_true', | |
127 | short = 'Edit each patch before sending'), | |
128 | opt('-s', '--sleep', type = 'int', metavar = 'SECONDS', | |
129 | short = 'Sleep for SECONDS between e-mails sending'), | |
ae5305d2 | 130 | opt('--in-reply-to', metavar = 'REFID', |
575bbdae KH |
131 | short = 'Use REFID as the reference id'), |
132 | opt('--smtp-server', metavar = 'HOST[:PORT] or "/path/to/sendmail -t -i"', | |
133 | short = 'SMTP server or command to use for sending mail'), | |
134 | opt('-u', '--smtp-user', metavar = 'USER', | |
135 | short = 'Username for SMTP authentication'), | |
136 | opt('-p', '--smtp-password', metavar = 'PASSWORD', | |
137 | short = 'Password for SMTP authentication'), | |
138 | opt('-T', '--smtp-tls', action = 'store_true', | |
139 | short = 'Use SMTP with TLS encryption'), | |
6c8a90e1 | 140 | opt('-b', '--branch', args = [argparse.stg_branches], |
575bbdae KH |
141 | short = 'Use BRANCH instead of the default branch'), |
142 | opt('-m', '--mbox', action = 'store_true', | |
97ccbbbc AC |
143 | short = 'Generate an mbox file instead of sending'), |
144 | opt('--git', action = 'store_true', | |
145 | short = 'Use git send-email (EXPERIMENTAL)') | |
575bbdae KH |
146 | ] + argparse.diff_opts_option() |
147 | ||
117ed129 | 148 | directory = DirectoryHasRepository(log = False) |
b4bddc06 | 149 | |
901288c2 | 150 | def __get_sender(): |
dae0f0be CM |
151 | """Return the 'authname <authemail>' string as read from the |
152 | configuration file | |
153 | """ | |
c73e63b7 YD |
154 | sender=config.get('stgit.sender') |
155 | if not sender: | |
9e3f506f KH |
156 | try: |
157 | sender = str(git.user()) | |
158 | except git.GitException: | |
ea09f8ce GH |
159 | try: |
160 | sender = str(git.author()) | |
161 | except git.GitException: | |
162 | pass | |
9e3f506f | 163 | if not sender: |
ea09f8ce GH |
164 | raise CmdException, ('Unknown sender name and e-mail; you should' |
165 | ' for example set git config user.name and' | |
166 | ' user.email') | |
cd74a041 CM |
167 | sender = email.Utils.parseaddr(sender) |
168 | ||
169 | return email.Utils.formataddr(address_or_alias(sender)) | |
dae0f0be | 170 | |
cd74a041 CM |
171 | def __addr_list(msg, header): |
172 | return [addr for name, addr in | |
173 | email.Utils.getaddresses(msg.get_all(header, []))] | |
9e3f506f | 174 | |
d650d6ed | 175 | def __parse_addresses(msg): |
b4bddc06 CM |
176 | """Return a two elements tuple: (from, [to]) |
177 | """ | |
d650d6ed | 178 | from_addr_list = __addr_list(msg, 'From') |
24aadb3f | 179 | if len(from_addr_list) == 0: |
b4bddc06 | 180 | raise CmdException, 'No "From" address' |
d650d6ed CM |
181 | |
182 | to_addr_list = __addr_list(msg, 'To') + __addr_list(msg, 'Cc') \ | |
183 | + __addr_list(msg, 'Bcc') | |
b4bddc06 CM |
184 | if len(to_addr_list) == 0: |
185 | raise CmdException, 'No "To/Cc/Bcc" addresses' | |
186 | ||
cd74a041 | 187 | return (from_addr_list[0], set(to_addr_list)) |
b4bddc06 | 188 | |
a0fe60a2 CM |
189 | def __send_message_sendmail(sendmail, msg): |
190 | """Send the message using the sendmail command. | |
191 | """ | |
192 | cmd = sendmail.split() | |
193 | Run(*cmd).raw_input(msg).discard_output() | |
194 | ||
89d7ec43 | 195 | def __send_message_smtp(smtpserver, from_addr, to_addr_list, msg, options): |
b4bddc06 CM |
196 | """Send the message using the given SMTP server |
197 | """ | |
89d7ec43 AC |
198 | smtppassword = options.smtp_password or config.get('stgit.smtppassword') |
199 | smtpuser = options.smtp_user or config.get('stgit.smtpuser') | |
200 | smtpusetls = options.smtp_tls or config.get('stgit.smtptls') == 'yes' | |
201 | ||
202 | if (smtppassword and not smtpuser): | |
203 | raise CmdException('SMTP password supplied, username needed') | |
204 | if (smtpusetls and not smtpuser): | |
205 | raise CmdException('SMTP over TLS requested, username needed') | |
206 | if (smtpuser and not smtppassword): | |
207 | smtppassword = getpass.getpass("Please enter SMTP password: ") | |
208 | ||
b4bddc06 CM |
209 | try: |
210 | s = smtplib.SMTP(smtpserver) | |
211 | except Exception, err: | |
212 | raise CmdException, str(err) | |
213 | ||
214 | s.set_debuglevel(0) | |
215 | try: | |
eb026d93 B |
216 | if smtpuser and smtppassword: |
217 | s.ehlo() | |
89d7ec43 | 218 | if smtpusetls: |
fc44c2ca PR |
219 | if not hasattr(socket, 'ssl'): |
220 | raise CmdException, "cannot use TLS - no SSL support in Python" | |
221 | s.starttls() | |
222 | s.ehlo() | |
eb026d93 B |
223 | s.login(smtpuser, smtppassword) |
224 | ||
0bc1343c YD |
225 | result = s.sendmail(from_addr, to_addr_list, msg) |
226 | if len(result): | |
227 | print "mail server refused delivery for the following recipients: %s" % result | |
b4bddc06 CM |
228 | except Exception, err: |
229 | raise CmdException, str(err) | |
230 | ||
231 | s.quit() | |
232 | ||
97ccbbbc AC |
233 | def __send_message_git(msg, options): |
234 | """Send the message using git send-email | |
235 | """ | |
236 | from subprocess import call | |
237 | from tempfile import mkstemp | |
238 | ||
239 | cmd = ["git", "send-email", "--from=%s" % msg['From']] | |
240 | cmd.append("--quiet") | |
241 | cmd.append("--suppress-cc=self") | |
242 | if not options.auto: | |
243 | cmd.append("--suppress-cc=body") | |
35112e50 CM |
244 | if options.in_reply_to: |
245 | cmd.extend(["--in-reply-to", options.in_reply_to]) | |
246 | if options.no_thread: | |
247 | cmd.append("--no-thread") | |
97ccbbbc AC |
248 | |
249 | # We only support To/Cc/Bcc in git send-email for now. | |
250 | for x in ['to', 'cc', 'bcc']: | |
251 | if getattr(options, x): | |
252 | cmd.extend('--%s=%s' % (x, a) for a in getattr(options, x)) | |
253 | ||
97ccbbbc AC |
254 | (fd, path) = mkstemp() |
255 | os.write(fd, msg.as_string(options.mbox)) | |
256 | os.close(fd) | |
257 | ||
258 | try: | |
259 | try: | |
260 | cmd.append(path) | |
261 | call(cmd) | |
262 | except Exception, err: | |
263 | raise CmdException, str(err) | |
264 | finally: | |
265 | os.unlink(path) | |
266 | ||
9cb369d4 | 267 | def __send_message(type, tmpl, options, *args): |
a0fe60a2 CM |
268 | """Message sending dispatcher. |
269 | """ | |
9cb369d4 AC |
270 | (build, outstr) = {'cover': (__build_cover, 'the cover message'), |
271 | 'patch': (__build_message, 'patch "%s"' % args[0])}[type] | |
272 | if type == 'patch': | |
273 | (patch_nr, total_nr) = (args[1], args[2]) | |
274 | ||
275 | msg_id = email.Utils.make_msgid('stgit') | |
276 | msg = build(tmpl, msg_id, options, *args) | |
277 | ||
9cb369d4 AC |
278 | msg_str = msg.as_string(options.mbox) |
279 | if options.mbox: | |
280 | out.stdout_raw(msg_str + '\n') | |
281 | return msg_id | |
282 | ||
97ccbbbc | 283 | if not options.git: |
e2a3c618 | 284 | from_addr, to_addrs = __parse_addresses(msg) |
97ccbbbc | 285 | out.start('Sending ' + outstr) |
89d7ec43 | 286 | |
9cb369d4 | 287 | smtpserver = options.smtp_server or config.get('stgit.smtpserver') |
97ccbbbc AC |
288 | if options.git: |
289 | __send_message_git(msg, options) | |
290 | elif smtpserver.startswith('/'): | |
a0fe60a2 | 291 | # Use the sendmail tool |
9cb369d4 | 292 | __send_message_sendmail(smtpserver, msg_str) |
a0fe60a2 CM |
293 | else: |
294 | # Use the SMTP server (we have host and port information) | |
9cb369d4 AC |
295 | __send_message_smtp(smtpserver, from_addr, to_addrs, msg_str, options) |
296 | ||
297 | # give recipients a chance of receiving related patches in correct order | |
298 | if type == 'cover' or (type == 'patch' and patch_nr < total_nr): | |
299 | sleep = options.sleep or config.getint('stgit.smtpdelay') | |
300 | time.sleep(sleep) | |
97ccbbbc AC |
301 | if not options.git: |
302 | out.done() | |
9cb369d4 | 303 | return msg_id |
a0fe60a2 | 304 | |
c28b8841 | 305 | def __update_header(msg, header, addr = '', ignore = ()): |
cd74a041 CM |
306 | def __addr_pairs(msg, header, extra): |
307 | pairs = email.Utils.getaddresses(msg.get_all(header, []) + extra) | |
308 | # remove pairs without an address and resolve the aliases | |
309 | return [address_or_alias(p) for p in pairs if p[1]] | |
310 | ||
c28b8841 AC |
311 | addr_pairs = __addr_pairs(msg, header, [addr]) |
312 | del msg[header] | |
313 | # remove the duplicates and filter the addresses | |
314 | addr_dict = dict((addr, email.Utils.formataddr((name, addr))) | |
315 | for name, addr in addr_pairs if addr not in ignore) | |
316 | if addr_dict: | |
317 | msg[header] = ', '.join(addr_dict.itervalues()) | |
318 | return set(addr_dict.iterkeys()) | |
f8d1cf65 | 319 | |
c28b8841 AC |
320 | def __build_address_headers(msg, options, extra_cc = []): |
321 | """Build the address headers and check existing headers in the | |
322 | template. | |
323 | """ | |
f8d1cf65 CM |
324 | to_addr = '' |
325 | cc_addr = '' | |
cd74a041 | 326 | extra_cc_addr = '' |
f8d1cf65 CM |
327 | bcc_addr = '' |
328 | ||
c73e63b7 | 329 | autobcc = config.get('stgit.autobcc') or '' |
d884c4d8 | 330 | |
e83b3149 | 331 | if options.to: |
61eed152 | 332 | to_addr = ', '.join(options.to) |
e83b3149 | 333 | if options.cc: |
cd74a041 CM |
334 | cc_addr = ', '.join(options.cc) |
335 | if extra_cc: | |
336 | extra_cc_addr = ', '.join(extra_cc) | |
e83b3149 | 337 | if options.bcc: |
61eed152 | 338 | bcc_addr = ', '.join(options.bcc + [autobcc]) |
d884c4d8 CM |
339 | elif autobcc: |
340 | bcc_addr = autobcc | |
f8d1cf65 | 341 | |
cd74a041 | 342 | # if an address is on a header, ignore it from the rest |
c28b8841 AC |
343 | to_set = __update_header(msg, 'To', to_addr) |
344 | cc_set = __update_header(msg, 'Cc', cc_addr, to_set) | |
345 | bcc_set = __update_header(msg, 'Bcc', bcc_addr, to_set.union(cc_set)) | |
cd74a041 CM |
346 | |
347 | # --auto generated addresses, don't include the sender | |
c28b8841 AC |
348 | from_set = __update_header(msg, 'From') |
349 | __update_header(msg, 'Cc', extra_cc_addr, | |
350 | to_set.union(bcc_set).union(from_set)) | |
f8d1cf65 CM |
351 | |
352 | def __get_signers_list(msg): | |
353 | """Return the address list generated from signed-off-by and | |
354 | acked-by lines in the message. | |
355 | """ | |
356 | addr_list = [] | |
de41ecc8 DW |
357 | tags = '%s|%s|%s|%s|%s|%s|%s' % ( |
358 | 'signed-off-by', | |
359 | 'acked-by', | |
360 | 'cc', | |
361 | 'reviewed-by', | |
362 | 'reported-by', | |
363 | 'tested-by', | |
364 | 'reported-and-tested-by') | |
365 | regex = '^(%s):\s+(.+)$' % tags | |
366 | ||
367 | r = re.compile(regex, re.I) | |
f8d1cf65 CM |
368 | for line in msg.split('\n'): |
369 | m = r.match(line) | |
370 | if m: | |
371 | addr_list.append(m.expand('\g<2>')) | |
372 | ||
373 | return addr_list | |
e83b3149 | 374 | |
61eed152 CM |
375 | def __build_extra_headers(msg, msg_id, ref_id = None): |
376 | """Build extra email headers and encoding | |
19a56fa1 | 377 | """ |
61eed152 CM |
378 | del msg['Date'] |
379 | msg['Date'] = email.Utils.formatdate(localtime = True) | |
380 | msg['Message-ID'] = msg_id | |
381 | if ref_id: | |
00375337 CM |
382 | # make sure the ref id has the angle brackets |
383 | ref_id = '<%s>' % ref_id.strip(' \t\n<>') | |
61eed152 CM |
384 | msg['In-Reply-To'] = ref_id |
385 | msg['References'] = ref_id | |
d5214f56 | 386 | msg['User-Agent'] = 'StGit/%s' % version.version |
61eed152 | 387 | |
c28b8841 AC |
388 | # update other address headers |
389 | __update_header(msg, 'Reply-To') | |
390 | __update_header(msg, 'Mail-Reply-To') | |
391 | __update_header(msg, 'Mail-Followup-To') | |
392 | ||
393 | ||
61eed152 CM |
394 | def __encode_message(msg): |
395 | # 7 or 8 bit encoding | |
396 | charset = email.Charset.Charset('utf-8') | |
397 | charset.body_encoding = None | |
398 | ||
399 | # encode headers | |
400 | for header, value in msg.items(): | |
401 | words = [] | |
402 | for word in value.split(' '): | |
403 | try: | |
404 | uword = unicode(word, 'utf-8') | |
405 | except UnicodeDecodeError: | |
406 | # maybe we should try a different encoding or report | |
407 | # the error. At the moment, we just ignore it | |
408 | pass | |
409 | words.append(email.Header.Header(uword).encode()) | |
410 | new_val = ' '.join(words) | |
411 | msg.replace_header(header, new_val) | |
412 | ||
413 | # encode the body and set the MIME and encoding headers | |
e5c32acf CM |
414 | if msg.is_multipart(): |
415 | for p in msg.get_payload(): | |
416 | p.set_charset(charset) | |
417 | else: | |
418 | msg.set_charset(charset) | |
19a56fa1 | 419 | |
58c61f10 | 420 | def __edit_message(msg): |
0ba13ee9 KH |
421 | fname = '.stgitmail.txt' |
422 | ||
423 | # create the initial file | |
424 | f = file(fname, 'w') | |
425 | f.write(msg) | |
426 | f.close() | |
427 | ||
83bb4e4c | 428 | call_editor(fname) |
0ba13ee9 KH |
429 | |
430 | # read the message back | |
431 | f = file(fname) | |
432 | msg = f.read() | |
433 | f.close() | |
434 | ||
435 | return msg | |
436 | ||
c18d3a36 | 437 | def __build_cover(tmpl, msg_id, options, patches): |
e3e05587 | 438 | """Build the cover message (series description) to be sent via SMTP |
b4bddc06 | 439 | """ |
901288c2 | 440 | sender = __get_sender() |
dae0f0be | 441 | |
d0d139a3 CM |
442 | if options.version: |
443 | version_str = ' %s' % options.version | |
ed5de0cc CM |
444 | else: |
445 | version_str = '' | |
d0d139a3 | 446 | |
d323b5da RR |
447 | if options.prefix: |
448 | prefix_str = options.prefix + ' ' | |
449 | else: | |
a7e0d4ee YD |
450 | confprefix = config.get('stgit.mail.prefix') |
451 | if confprefix: | |
452 | prefix_str = confprefix + ' ' | |
453 | else: | |
454 | prefix_str = '' | |
d323b5da | 455 | |
99c4a4c5 | 456 | total_nr_str = str(len(patches)) |
b8d258e5 | 457 | patch_nr_str = '0'.zfill(len(total_nr_str)) |
99c4a4c5 | 458 | if len(patches) > 1: |
b8d258e5 CM |
459 | number_str = ' %s/%s' % (patch_nr_str, total_nr_str) |
460 | else: | |
461 | number_str = '' | |
b4bddc06 | 462 | |
901288c2 CM |
463 | tmpl_dict = {'sender': sender, |
464 | # for backward template compatibility | |
465 | 'maintainer': sender, | |
61eed152 CM |
466 | # for backward template compatibility |
467 | 'endofheaders': '', | |
468 | # for backward template compatibility | |
469 | 'date': '', | |
d0d139a3 | 470 | 'version': version_str, |
d323b5da | 471 | 'prefix': prefix_str, |
b8d258e5 CM |
472 | 'patchnr': patch_nr_str, |
473 | 'totalnr': total_nr_str, | |
99c4a4c5 | 474 | 'number': number_str, |
27827959 | 475 | 'shortlog': stack.shortlog(crt_series.get_patch(p) |
c9379a15 | 476 | for p in reversed(patches)), |
ef954fe6 | 477 | 'diffstat': gitlib.diffstat(git.diff( |
e4560d7e | 478 | rev1 = git_id(crt_series, '%s^' % patches[0]), |
baf8241d CM |
479 | rev2 = git_id(crt_series, '%s' % patches[-1]), |
480 | diff_flags = options.diff_flags))} | |
b4bddc06 CM |
481 | |
482 | try: | |
61eed152 | 483 | msg_string = tmpl % tmpl_dict |
b4bddc06 CM |
484 | except KeyError, err: |
485 | raise CmdException, 'Unknown patch template variable: %s' \ | |
486 | % err | |
487 | except TypeError: | |
488 | raise CmdException, 'Only "%(name)s" variables are ' \ | |
489 | 'supported in the patch template' | |
490 | ||
58c61f10 CM |
491 | if options.edit_cover: |
492 | msg_string = __edit_message(msg_string) | |
493 | ||
61eed152 CM |
494 | # The Python email message |
495 | try: | |
496 | msg = email.message_from_string(msg_string) | |
497 | except Exception, ex: | |
498 | raise CmdException, 'template parsing error: %s' % str(ex) | |
499 | ||
e2a3c618 AC |
500 | if not options.git: |
501 | __build_address_headers(msg, options) | |
ae5305d2 | 502 | __build_extra_headers(msg, msg_id, options.in_reply_to) |
61eed152 CM |
503 | __encode_message(msg) |
504 | ||
d650d6ed | 505 | return msg |
b4bddc06 | 506 | |
c18d3a36 | 507 | def __build_message(tmpl, msg_id, options, patch, patch_nr, total_nr, ref_id): |
b4bddc06 CM |
508 | """Build the message to be sent via SMTP |
509 | """ | |
510 | p = crt_series.get_patch(patch) | |
511 | ||
c897c87c AS |
512 | if p.get_description(): |
513 | descr = p.get_description().strip() | |
514 | else: | |
515 | # provide a place holder and force the edit message option on | |
516 | descr = '<empty message>' | |
517 | options.edit_patches = True | |
b4bddc06 | 518 | |
c897c87c | 519 | descr_lines = descr.split('\n') |
42857cbe ST |
520 | short_descr = descr_lines[0].strip() |
521 | long_descr = '\n'.join(l.rstrip() for l in descr_lines[1:]).lstrip('\n') | |
b4bddc06 | 522 | |
1d1485c3 CM |
523 | authname = p.get_authname(); |
524 | authemail = p.get_authemail(); | |
525 | commname = p.get_commname(); | |
526 | commemail = p.get_commemail(); | |
527 | ||
901288c2 | 528 | sender = __get_sender() |
1d1485c3 CM |
529 | |
530 | fromauth = '%s <%s>' % (authname, authemail) | |
901288c2 | 531 | if fromauth != sender: |
1d1485c3 CM |
532 | fromauth = 'From: %s\n\n' % fromauth |
533 | else: | |
534 | fromauth = '' | |
dae0f0be | 535 | |
d0d139a3 CM |
536 | if options.version: |
537 | version_str = ' %s' % options.version | |
ed5de0cc CM |
538 | else: |
539 | version_str = '' | |
d0d139a3 | 540 | |
d323b5da RR |
541 | if options.prefix: |
542 | prefix_str = options.prefix + ' ' | |
543 | else: | |
a7e0d4ee YD |
544 | confprefix = config.get('stgit.mail.prefix') |
545 | if confprefix: | |
546 | prefix_str = confprefix + ' ' | |
547 | else: | |
548 | prefix_str = '' | |
0d219030 | 549 | |
b4bddc06 CM |
550 | total_nr_str = str(total_nr) |
551 | patch_nr_str = str(patch_nr).zfill(len(total_nr_str)) | |
c2a8af1d | 552 | if not options.unrelated and total_nr > 1: |
b8d258e5 CM |
553 | number_str = ' %s/%s' % (patch_nr_str, total_nr_str) |
554 | else: | |
555 | number_str = '' | |
b4bddc06 | 556 | |
e4560d7e CM |
557 | diff = git.diff(rev1 = git_id(crt_series, '%s^' % patch), |
558 | rev2 = git_id(crt_series, '%s' % patch), | |
a45cea15 | 559 | diff_flags = options.diff_flags) |
b4bddc06 | 560 | tmpl_dict = {'patch': patch, |
901288c2 CM |
561 | 'sender': sender, |
562 | # for backward template compatibility | |
563 | 'maintainer': sender, | |
b4bddc06 CM |
564 | 'shortdescr': short_descr, |
565 | 'longdescr': long_descr, | |
61eed152 CM |
566 | # for backward template compatibility |
567 | 'endofheaders': '', | |
a45cea15 | 568 | 'diff': diff, |
ef954fe6 | 569 | 'diffstat': gitlib.diffstat(diff), |
61eed152 CM |
570 | # for backward template compatibility |
571 | 'date': '', | |
d0d139a3 | 572 | 'version': version_str, |
d323b5da | 573 | 'prefix': prefix_str, |
b4bddc06 CM |
574 | 'patchnr': patch_nr_str, |
575 | 'totalnr': total_nr_str, | |
b8d258e5 | 576 | 'number': number_str, |
1d1485c3 CM |
577 | 'fromauth': fromauth, |
578 | 'authname': authname, | |
579 | 'authemail': authemail, | |
b4bddc06 | 580 | 'authdate': p.get_authdate(), |
1d1485c3 CM |
581 | 'commname': commname, |
582 | 'commemail': commemail} | |
61eed152 | 583 | # change None to '' |
b4bddc06 CM |
584 | for key in tmpl_dict: |
585 | if not tmpl_dict[key]: | |
586 | tmpl_dict[key] = '' | |
587 | ||
588 | try: | |
61eed152 | 589 | msg_string = tmpl % tmpl_dict |
b4bddc06 CM |
590 | except KeyError, err: |
591 | raise CmdException, 'Unknown patch template variable: %s' \ | |
592 | % err | |
593 | except TypeError: | |
594 | raise CmdException, 'Only "%(name)s" variables are ' \ | |
595 | 'supported in the patch template' | |
596 | ||
58c61f10 CM |
597 | if options.edit_patches: |
598 | msg_string = __edit_message(msg_string) | |
599 | ||
61eed152 CM |
600 | # The Python email message |
601 | try: | |
602 | msg = email.message_from_string(msg_string) | |
603 | except Exception, ex: | |
604 | raise CmdException, 'template parsing error: %s' % str(ex) | |
605 | ||
606 | if options.auto: | |
607 | extra_cc = __get_signers_list(descr) | |
608 | else: | |
609 | extra_cc = [] | |
610 | ||
e2a3c618 AC |
611 | if not options.git: |
612 | __build_address_headers(msg, options, extra_cc) | |
61eed152 CM |
613 | __build_extra_headers(msg, msg_id, ref_id) |
614 | __encode_message(msg) | |
615 | ||
d650d6ed | 616 | return msg |
b4bddc06 | 617 | |
b4bddc06 CM |
618 | def func(parser, options, args): |
619 | """Send the patches by e-mail using the patchmail.tmpl file as | |
620 | a template | |
621 | """ | |
b4bddc06 | 622 | applied = crt_series.get_applied() |
b4bddc06 | 623 | |
6b1e0111 CM |
624 | if options.all: |
625 | patches = applied | |
626 | elif len(args) >= 1: | |
b4f656f0 CM |
627 | unapplied = crt_series.get_unapplied() |
628 | patches = parse_patches(args, applied + unapplied, len(applied)) | |
b4bddc06 | 629 | else: |
9a316368 | 630 | raise CmdException, 'Incorrect options. Unknown patches to send' |
b4bddc06 | 631 | |
ea09f8ce GH |
632 | # early test for sender identity |
633 | __get_sender() | |
634 | ||
3c04f430 CM |
635 | out.start('Checking the validity of the patches') |
636 | for p in patches: | |
637 | if crt_series.empty_patch(p): | |
638 | raise CmdException, 'Cannot send empty patch "%s"' % p | |
639 | out.done() | |
640 | ||
b4bddc06 | 641 | total_nr = len(patches) |
9a316368 CM |
642 | if total_nr == 0: |
643 | raise CmdException, 'No patches to send' | |
b4bddc06 | 644 | |
ae5305d2 CM |
645 | if options.in_reply_to: |
646 | if options.no_thread or options.unrelated: | |
c2a8af1d | 647 | raise CmdException, \ |
ae5305d2 CM |
648 | '--in-reply-to option not allowed with --no-thread or --unrelated' |
649 | ref_id = options.in_reply_to | |
c2a8af1d CM |
650 | else: |
651 | ref_id = None | |
b4bddc06 | 652 | |
b4bddc06 | 653 | |
e3e05587 | 654 | # send the cover message (if any) |
0ba13ee9 | 655 | if options.cover or options.edit_cover: |
c2a8af1d CM |
656 | if options.unrelated: |
657 | raise CmdException, 'cover sending not allowed with --unrelated' | |
658 | ||
e3e05587 CM |
659 | # find the template file |
660 | if options.cover: | |
16fee874 | 661 | tmpl = file(options.cover).read() |
e3e05587 | 662 | else: |
1f3bb017 CM |
663 | tmpl = templates.get_template('covermail.tmpl') |
664 | if not tmpl: | |
665 | raise CmdException, 'No cover message template file found' | |
b4bddc06 | 666 | |
9cb369d4 | 667 | msg_id = __send_message('cover', tmpl, options, patches) |
d650d6ed | 668 | |
b4bddc06 | 669 | # subsequent e-mails are seen as replies to the first one |
ae5305d2 | 670 | if not options.no_thread: |
d1ed3a12 | 671 | ref_id = msg_id |
b4bddc06 | 672 | |
b4bddc06 CM |
673 | # send the patches |
674 | if options.template: | |
1f3bb017 | 675 | tmpl = file(options.template).read() |
b4bddc06 | 676 | else: |
e5c32acf CM |
677 | if options.attach: |
678 | tmpl = templates.get_template('mailattch.tmpl') | |
679 | else: | |
680 | tmpl = templates.get_template('patchmail.tmpl') | |
1f3bb017 CM |
681 | if not tmpl: |
682 | raise CmdException, 'No e-mail template file found' | |
b4bddc06 | 683 | |
9cb369d4 AC |
684 | for (p, n) in zip(patches, range(1, total_nr + 1)): |
685 | msg_id = __send_message('patch', tmpl, options, p, n, total_nr, ref_id) | |
d650d6ed | 686 | |
b4bddc06 | 687 | # subsequent e-mails are seen as replies to the first one |
ae5305d2 | 688 | if not options.no_thread and not options.unrelated and not ref_id: |
b4bddc06 | 689 | ref_id = msg_id |