This is the first step in turning stg mail into a wrapper for
git send-email. It requires passing the --git option to stg mail
for now.
Only a few basic options are supported for now, namely To/Cc/Bcc.
git send-email options used:
--suppress-cc=self prevent further information prompts
--quiet reduce git send-email output
Cc: Karl Wiberg <kha@xxxxxxxxxxx>
Signed-off-by: Alex Chiang <achiang@xxxxxx>
---
stgit/commands/mail.py | 60 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py
index 7f811e8..81ec77e 100644
--- a/stgit/commands/mail.py
+++ b/stgit/commands/mail.py
@@ -140,7 +140,9 @@ options = [
opt('-b', '--branch', args = [argparse.stg_branches],
short = 'Use BRANCH instead of the default branch'),
opt('-m', '--mbox', action = 'store_true',
- short = 'Generate an mbox file instead of sending')
+ short = 'Generate an mbox file instead of sending'),
+ opt('--git', action = 'store_true',
+ short = 'Use git send-email (EXPERIMENTAL)')
] + argparse.diff_opts_option()
directory = DirectoryHasRepository(log = False)
@@ -228,6 +230,52 @@ def __send_message_smtp(smtpserver, from_addr, to_addr_list, msg, options):
s.quit()
+def __send_message_git(msg, options):
+ """Send the message using git send-email
+ """
+ from subprocess import call
+ from tempfile import mkstemp
+
+ cmd = ["git", "send-email", "--from=%s" % msg['From']]
+ cmd.append("--quiet")
+ cmd.append("--suppress-cc=self")
+
+ # XXX: yuck, there's gotta be a more pythonic way. Ideally we'd like
+ # to use the git_opts dictionary as our mapping between stg mail and
+ # git send-email; extract k, v pairs from git_opts, and use those
+ # to iterate across options somehow.
+ git_opts = { 'to': '--to=', 'cc': '--cc=', 'bcc': '--bcc=' }
+ if options.to:
+ for a in options.to:
+ cmd.append("--to=%s" % a)
+ if options.cc:
+ for a in options.cc:
+ cmd.append("--cc=%s" % a)
+ if options.bcc:
+ for a in options.bcc:
+ cmd.append("--bcc=%s" % a)
+ if not options.auto:
+ cmd.append("--suppress-cc=body")
+
+ # XXX: hack for now so that we don't duplicate To/Cc/Bcc headers
+ # in the mail, as git send-email inserts those for us.
+ del msg['To']
+ del msg['Cc']
+ del msg['Bcc']
+
+ (fd, path) = mkstemp()
+ os.write(fd, msg.as_string(options.mbox))
+ os.close(fd)
+
+ try:
+ cmd.append(path)
+ call(cmd)
+ except Exception, err:
+ os.unlink(path)
+ raise CmdException, str(err)
+
+ os.unlink(path)
+
def __send_message(tmpl, options, *args):
"""Message sending dispatcher.
"""
@@ -242,10 +290,13 @@ def __send_message(tmpl, options, *args):
return msg_id
outstr = { 1: 'the cover message', 4: 'patch "%s"' % args[0] }
- out.start('Sending ' + outstr[len(args)])
+ if not options.git:
+ out.start('Sending ' + outstr[len(args)])
smtpserver = options.smtp_server or config.get('stgit.smtpserver')
- if smtpserver.startswith('/'):
+ if options.git:
+ __send_message_git(msg, options)
+ elif smtpserver.startswith('/'):
# Use the sendmail tool
__send_message_sendmail(smtpserver, msg_str)
else:
@@ -257,7 +308,8 @@ def __send_message(tmpl, options, *args):
if len(args) == 1 or (len(args) == 4 and args[1] < args[2]):
sleep = options.sleep or config.getint('stgit.smtpdelay')
time.sleep(sleep)
- out.done()
+ if not options.git:
+ out.done()
return msg_id
def __update_header(msg, header, addr = '', ignore = ()):
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html