summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
be24d87)
This option adds a version string in the [PATCH version nr/total] form for
the e-mailed patches.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
To: Some Address <some.address@somelist.com>
Cc: other.address@otherlist.com, other.person@othercompany.com
Bcc: Your Name <your.name@yourcompany.com>
To: Some Address <some.address@somelist.com>
Cc: other.address@otherlist.com, other.person@othercompany.com
Bcc: Your Name <your.name@yourcompany.com>
-Subject: [PATCH%(number)s] Series short description
+Subject: [PATCH%(version)s%(number)s] Series short description
Date: %(date)s
%(endofheaders)s
The following series implements...
Date: %(date)s
%(endofheaders)s
The following series implements...
%(diff)s - unified diff of the patch
%(diffstat)s - diff statistics
%(date)s - current date/time
%(diff)s - unified diff of the patch
%(diffstat)s - diff statistics
%(date)s - current date/time
+ %(version)s - ' version' string passed on the command line (or empty)
%(patchnr)s - patch number
%(totalnr)s - total number of patches to be sent
%(number)s - empty if only one patch is sent or ' patchnr/totalnr'
%(patchnr)s - patch number
%(totalnr)s - total number of patches to be sent
%(number)s - empty if only one patch is sent or ' patchnr/totalnr'
%(commemail)s - committer's e-mail
For the preamble e-mail template, only the %(maintainer)s, %(date)s,
%(commemail)s - committer's e-mail
For the preamble e-mail template, only the %(maintainer)s, %(date)s,
-%(endofheaders)s, %(patchnr)s, %(totalnr)s and %(number)s variables
-are supported."""
+%(endofheaders)s, %(version)s, %(patchnr)s, %(totalnr)s and %(number)s
+variables are supported."""
options = [make_option('-a', '--all',
help = 'e-mail all the applied patches',
options = [make_option('-a', '--all',
help = 'e-mail all the applied patches',
metavar = '[PATCH1][:[PATCH2]]',
help = 'e-mail patches between PATCH1 and PATCH2'),
make_option('--to',
metavar = '[PATCH1][:[PATCH2]]',
help = 'e-mail patches between PATCH1 and PATCH2'),
make_option('--to',
- help = 'Add TO to the To: list'),
+ help = 'add TO to the To: list'),
- help = 'Add CC to the Cc: list'),
+ help = 'add CC to the Cc: list'),
- help = 'Add BCC to the Bcc: list'),
+ help = 'add BCC to the Bcc: list'),
+ make_option('-v', '--version', metavar = 'VERSION',
+ help = 'add VERSION to the [PATCH ...] prefix'),
make_option('-t', '--template', metavar = 'FILE',
help = 'use FILE as the message template'),
make_option('-f', '--first', metavar = 'FILE',
make_option('-t', '--template', metavar = 'FILE',
help = 'use FILE as the message template'),
make_option('-f', '--first', metavar = 'FILE',
make_option('-s', '--sleep', type = 'int', metavar = 'SECONDS',
help = 'sleep for SECONDS between e-mails sending'),
make_option('--refid',
make_option('-s', '--sleep', type = 'int', metavar = 'SECONDS',
help = 'sleep for SECONDS between e-mails sending'),
make_option('--refid',
- help = 'Use REFID as the reference id'),
+ help = 'use REFID as the reference id'),
make_option('-u', '--smtp-user', metavar = 'USER',
help = 'username for SMTP authentication'),
make_option('-p', '--smtp-password', metavar = 'PASSWORD',
make_option('-u', '--smtp-user', metavar = 'USER',
help = 'username for SMTP authentication'),
make_option('-p', '--smtp-password', metavar = 'PASSWORD',
headers_end += 'Bcc: %s\n' % options.bcc
headers_end += 'Message-Id: %s\n' % msg_id
headers_end += 'Bcc: %s\n' % options.bcc
headers_end += 'Message-Id: %s\n' % msg_id
+ if options.version:
+ version_str = ' %s' % options.version
+
total_nr_str = str(total_nr)
patch_nr_str = '0'.zfill(len(total_nr_str))
if total_nr > 1:
total_nr_str = str(total_nr)
patch_nr_str = '0'.zfill(len(total_nr_str))
if total_nr > 1:
tmpl_dict = {'maintainer': maintainer,
'endofheaders': headers_end,
'date': email.Utils.formatdate(localtime = True),
tmpl_dict = {'maintainer': maintainer,
'endofheaders': headers_end,
'date': email.Utils.formatdate(localtime = True),
+ 'version': version_str,
'patchnr': patch_nr_str,
'totalnr': total_nr_str,
'number': number_str}
'patchnr': patch_nr_str,
'totalnr': total_nr_str,
'number': number_str}
headers_end += "In-Reply-To: %s\n" % ref_id
headers_end += "References: %s\n" % ref_id
headers_end += "In-Reply-To: %s\n" % ref_id
headers_end += "References: %s\n" % ref_id
+ if options.version:
+ version_str = ' %s' % options.version
+
total_nr_str = str(total_nr)
patch_nr_str = str(patch_nr).zfill(len(total_nr_str))
if total_nr > 1:
total_nr_str = str(total_nr)
patch_nr_str = str(patch_nr).zfill(len(total_nr_str))
if total_nr > 1:
'diffstat': git.diffstat(rev1 = git_id('%s/bottom'%patch),
rev2 = git_id('%s/top' % patch)),
'date': email.Utils.formatdate(localtime = True),
'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,
'totalnr': total_nr_str,
'number': number_str,
'patchnr': patch_nr_str,
'totalnr': total_nr_str,
'number': number_str,
-Subject: [PATCH%(number)s] %(shortdescr)s
+Subject: [PATCH%(version)s%(number)s] %(shortdescr)s
Date: %(date)s
%(endofheaders)s
%(longdescr)s
Date: %(date)s
%(endofheaders)s
%(longdescr)s