from stgit.commands.common import *
from stgit.utils import *
-from stgit import stack, git, basedir
+from stgit import stack, git, version, templates
from stgit.config import config
help = 'send a patch or series of patches by e-mail'
-usage = """%prog [options] [<patch> [<patch2...]]
-
-Send a patch or a range of patches (defaulting to the applied patches)
-by e-mail using the 'smtpserver' configuration option. The From
-address and the e-mail format are generated from the template file
-passed as argument to '--template' (defaulting to .git/patchmail.tmpl
-or /usr/share/stgit/templates/patchmail.tmpl). The To/Cc/Bcc addresses
+usage = """%prog [options] [<patch1>] [<patch2>] [<patch3>..<patch4>]
+
+Send a patch or a range of patches by e-mail using the 'smtpserver'
+configuration option. The From address and the e-mail format are
+generated from the template file passed as argument to '--template'
+(defaulting to '.git/patchmail.tmpl' or
+'~/.stgit/templates/patchmail.tmpl' or or
+'/usr/share/stgit/templates/patchmail.tmpl'). The To/Cc/Bcc addresses
can either be added to the template file or passed via the
corresponding command line options.
A preamble e-mail can be sent using the '--cover' and/or '--edit'
options. The first allows the user to specify a file to be used as a
template. The latter option will invoke the editor on the specified
-file (defaulting to .git/covermail.tmpl or
-/usr/share/stgit/templates/covermail.tmpl).
+file (defaulting to '.git/covermail.tmpl' or
+'~/.stgit/templates/covermail.tmpl' or
+'/usr/share/stgit/templates/covermail.tmpl').
All the subsequent e-mails appear as replies to the first e-mail sent
(either the preamble or the first patch). E-mails can be seen as
options = [make_option('-a', '--all',
help = 'e-mail all the applied patches',
action = 'store_true'),
- make_option('-r', '--range',
- metavar = '[PATCH1][:[PATCH2]]',
- help = 'e-mail patches between PATCH1 and PATCH2'),
make_option('--to',
help = 'add TO to the To: list',
action = 'append'),
make_option('--bcc',
help = 'add BCC to the Bcc: list',
action = 'append'),
+ make_option('--noreply',
+ help = 'do not send subsequent messages as replies',
+ action = 'store_true'),
make_option('-v', '--version', metavar = 'VERSION',
help = 'add VERSION to the [PATCH ...] prefix'),
make_option('-t', '--template', metavar = 'FILE',
headers_end = headers_end[:-2] + '\n'
return headers_end
+def __build_extra_headers():
+ """Build extra headers like content-type etc.
+ """
+ headers = 'Content-Type: text/plain; charset=utf-8; format=fixed\n'
+ headers += 'Content-Transfer-Encoding: 8bit\n'
+ headers += 'User-Agent: StGIT/%s\n' % version.version
+
+ return headers
+
def __build_cover(tmpl, total_nr, msg_id, options):
"""Build the cover message (series description) to be sent via SMTP
"""
if options.refid:
headers_end += "In-Reply-To: %s\n" % options.refid
headers_end += "References: %s\n" % options.refid
+ headers_end += __build_extra_headers()
if options.version:
version_str = ' %s' % options.version
if ref_id:
headers_end += "In-Reply-To: %s\n" % ref_id
headers_end += "References: %s\n" % ref_id
+ headers_end += __build_extra_headers()
if options.version:
version_str = ' %s' % options.version
'shortdescr': short_descr,
'longdescr': long_descr,
'endofheaders': headers_end,
- 'diff': git.diff(rev1 = git_id('%s/bottom' % patch),
- rev2 = git_id('%s/top' % patch)),
- 'diffstat': git.diffstat(rev1 = git_id('%s/bottom'%patch),
- rev2 = git_id('%s/top' % patch)),
+ 'diff': git.diff(rev1 = git_id('%s//bottom' % patch),
+ rev2 = git_id('%s//top' % patch)),
+ 'diffstat': git.diffstat(rev1 = git_id('%s//bottom'%patch),
+ rev2 = git_id('%s//top' % patch)),
'date': email.Utils.formatdate(localtime = True),
'version': version_str,
'patchnr': patch_nr_str,
smtppassword = config.get('stgit', 'smtppassword')
applied = crt_series.get_applied()
- unapplied = crt_series.get_unapplied()
-
- if len(args) >= 1:
- for patch in args:
- if patch in unapplied:
- raise CmdException, 'Patch "%s" not applied' % patch
- if not patch in applied:
- raise CmdException, 'Patch "%s" does not exist' % patch
- patches = args
- elif options.all:
- patches = applied
- elif options.range:
- boundaries = options.range.split(':')
- if len(boundaries) == 1:
- start = boundaries[0]
- stop = boundaries[0]
- elif len(boundaries) == 2:
- if boundaries[0] == '':
- start = applied[0]
- else:
- start = boundaries[0]
- if boundaries[1] == '':
- stop = applied[-1]
- else:
- stop = boundaries[1]
- else:
- raise CmdException, 'incorrect parameters to "--range"'
-
- if start in applied:
- start_idx = applied.index(start)
- else:
- 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:
- 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'
-
- patches = applied[start_idx:stop_idx]
+ if options.all:
+ patches = applied
+ elif len(args) >= 1:
+ patches = parse_patches(args, applied)
else:
raise CmdException, 'Incorrect options. Unknown patches to send'
if total_nr == 0:
raise CmdException, 'No patches to send'
- ref_id = options.refid
+ if options.noreply:
+ ref_id = None
+ else:
+ ref_id = options.refid
if options.sleep != None:
sleep = options.sleep
if options.cover or options.edit:
# find the template file
if options.cover:
- tfile_list = [options.cover]
+ tmpl = file(options.template).read()
else:
- tfile_list = [os.path.join(basedir.get(), 'covermail.tmpl'),
- os.path.join(sys.prefix,
- 'share/stgit/templates/covermail.tmpl')]
-
- tmpl = None
- for tfile in tfile_list:
- if os.path.isfile(tfile):
- tmpl = file(tfile).read()
- break
- if not tmpl:
- raise CmdException, 'No cover message template file found'
+ tmpl = templates.get_template('covermail.tmpl')
+ if not tmpl:
+ raise CmdException, 'No cover message template file found'
msg_id = email.Utils.make_msgid('stgit')
msg = __build_cover(tmpl, total_nr, msg_id, options)
from_addr, to_addr_list = __parse_addresses(msg)
# subsequent e-mails are seen as replies to the first one
- ref_id = msg_id
+ if not options.noreply:
+ ref_id = msg_id
if options.mbox:
__write_mbox(from_addr, msg)
# send the patches
if options.template:
- tfile_list = [options.template]
+ tmpl = file(options.template).read()
else:
- tfile_list = [os.path.join(basedir.get(), 'patchmail.tmpl'),
- os.path.join(sys.prefix,
- 'share/stgit/templates/patchmail.tmpl')]
- tmpl = None
- for tfile in tfile_list:
- if os.path.isfile(tfile):
- tmpl = file(tfile).read()
- break
- if not tmpl:
- raise CmdException, 'No e-mail template file found'
+ tmpl = templates.get_template('patchmail.tmpl')
+ if not tmpl:
+ raise CmdException, 'No e-mail template file found'
for (p, patch_nr) in zip(patches, range(1, len(patches) + 1)):
msg_id = email.Utils.make_msgid('stgit')
from_addr, to_addr_list = __parse_addresses(msg)
# subsequent e-mails are seen as replies to the first one
- if not ref_id:
+ if not options.noreply and not ref_id:
ref_id = msg_id
if options.mbox: