Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-import sys, os, re, time, smtplib, email.Utils
+import sys, os, re, time, datetime, smtplib, email.Utils
from optparse import OptionParser, make_option
-from time import gmtime, strftime
from stgit.commands.common import *
from stgit.utils import *
make_option('-p', '--smtp-password', metavar = 'PASSWORD',
help = 'username for SMTP authentication'),
make_option('-b', '--branch',
- help = 'use BRANCH instead of the default one')]
+ help = 'use BRANCH instead of the default one'),
+ make_option('-m', '--mbox',
+ help = 'generate an mbox file instead of sending',
+ action = 'store_true')]
def __get_maintainer():
else:
return None
-def __parse_addresses(string):
+def __parse_addresses(addresses):
"""Return a two elements tuple: (from, [to])
"""
- def __addr_list(string):
- m = re.search('[^@\s<,]+@[^>\s,]+', string);
- if (m == None):
- return []
- return [ m.group() ] + __addr_list(string[m.end():])
+ def __addr_list(addrs):
+ m = re.search('[^@\s<,]+@[^>\s,]+', addrs);
+ if (m == None):
+ return []
+ return [ m.group() ] + __addr_list(addrs[m.end():])
from_addr_list = []
to_addr_list = []
- for line in string.split('\n'):
+ for line in addresses.split('\n'):
if re.match('from:\s+', line, re.I):
from_addr_list += __addr_list(line)
elif re.match('(to|cc|bcc):\s+', line, re.I):
s.quit()
+def __write_mbox(from_addr, msg):
+ """Write an mbox like file to the standard output
+ """
+ r = re.compile('^From ', re.M)
+ msg = r.sub('>\g<0>', msg)
+
+ print 'From %s %s' % (from_addr, datetime.datetime.today().ctime())
+ print msg
+ print
+
def __build_address_headers(options):
headers_end = ''
if options.to:
- headers_end += 'To: '
- for to in options.to:
- headers_end += '%s,' % to
- headers_end = headers_end[:-1] + '\n'
+ headers_end += 'To: '
+ for to in options.to:
+ headers_end += '%s, ' % to
+ headers_end = headers_end[:-2] + '\n'
if options.cc:
- headers_end += 'Cc: '
- for cc in options.cc:
- headers_end += '%s,' % cc
- headers_end = headers_end[:-1] + '\n'
+ headers_end += 'Cc: '
+ for cc in options.cc:
+ headers_end += '%s, ' % cc
+ headers_end = headers_end[:-2] + '\n'
if options.bcc:
- headers_end += 'Bcc: '
- for bcc in options.bcc:
- headers_end += '%s,' % bcc
- headers_end = headers_end[:-1] + '\n'
+ headers_end += 'Bcc: '
+ for bcc in options.bcc:
+ headers_end += '%s, ' % bcc
+ headers_end = headers_end[:-2] + '\n'
return headers_end
def __build_cover(tmpl, total_nr, msg_id, options):
headers_end = __build_address_headers(options)
headers_end += 'Message-Id: %s\n' % msg_id
+ if options.refid:
+ headers_end += "In-Reply-To: %s\n" % options.refid
+ headers_end += "References: %s\n" % options.refid
if options.version:
version_str = ' %s' % options.version
msg = f.read()
f.close()
- return msg
+ return msg.strip('\n')
def __build_message(tmpl, patch, patch_nr, total_nr, msg_id, ref_id, options):
"""Build the message to be sent via SMTP
raise CmdException, 'Only "%(name)s" variables are ' \
'supported in the patch template'
- return msg
+ return msg.strip('\n')
def func(parser, options, args):
"""Send the patches by e-mail using the patchmail.tmpl file as
smtppassword = config.get('stgit', 'smtppassword')
applied = crt_series.get_applied()
+ unapplied = crt_series.get_unapplied()
if len(args) >= 1:
for patch in args:
- if not patch in applied:
+ if patch in unapplied:
raise CmdException, 'Patch "%s" not applied' % patch
- patches = args
+ if not patch in applied:
+ raise CmdException, 'Patch "%s" does not exist' % patch
+ patches = args
elif options.all:
patches = applied
elif options.range:
if start in applied:
start_idx = applied.index(start)
else:
- raise CmdException, 'Patch "%s" not applied' % start
+ if start in unapplied:
+ raise CmdException, 'Patch "%s" not applied' % start
+ else:
+ raise CmdException, 'Patch "%s" does not exist' % start
if stop in applied:
stop_idx = applied.index(stop) + 1
else:
- raise CmdException, 'Patch "%s" not applied' % stop
+ if stop in unapplied:
+ raise CmdException, 'Patch "%s" not applied' % stop
+ else:
+ raise CmdException, 'Patch "%s" does not exist' % stop
if start_idx >= stop_idx:
raise CmdException, 'Incorrect patch range order'
if options.sleep != None:
sleep = options.sleep
else:
- sleep = 2
+ sleep = config.getint('stgit', 'smtpdelay')
# send the cover message (if any)
if options.cover or options.edit:
if options.cover:
tfile_list = [options.cover]
else:
- tfile_list = [os.path.join(git.base_dir, 'covermail.tmpl'),
+ tfile_list = [os.path.join(git.get_base_dir(), 'covermail.tmpl'),
os.path.join(sys.prefix,
'share/stgit/templates/covermail.tmpl')]
# subsequent e-mails are seen as replies to the first one
ref_id = msg_id
- print 'Sending the cover message...',
- sys.stdout.flush()
-
- __send_message(smtpserver, from_addr, to_addr_list, msg, sleep,
- smtpuser, smtppassword)
-
- print 'done'
+ if options.mbox:
+ __write_mbox(from_addr, msg)
+ else:
+ print 'Sending the cover message...',
+ sys.stdout.flush()
+ __send_message(smtpserver, from_addr, to_addr_list, msg, sleep,
+ smtpuser, smtppassword)
+ print 'done'
# send the patches
if options.template:
tfile_list = [options.template]
else:
- tfile_list = [os.path.join(git.base_dir, 'patchmail.tmpl'),
+ tfile_list = [os.path.join(git.get_base_dir(), 'patchmail.tmpl'),
os.path.join(sys.prefix,
'share/stgit/templates/patchmail.tmpl')]
tmpl = None
if not ref_id:
ref_id = msg_id
- print 'Sending patch "%s"...' % p,
- sys.stdout.flush()
-
- __send_message(smtpserver, from_addr, to_addr_list, msg, sleep,
- smtpuser, smtppassword)
-
- print 'done'
+ if options.mbox:
+ __write_mbox(from_addr, msg)
+ else:
+ print 'Sending patch "%s"...' % p,
+ sys.stdout.flush()
+ __send_message(smtpserver, from_addr, to_addr_list, msg, sleep,
+ smtpuser, smtppassword)
+ print 'done'
~mdw / stgit / blobdiff