From b8d258e59a1e769d296526296bccb12c07d06f72 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 3 Aug 2005 13:40:48 +0100 Subject: [PATCH] Add the 'number' variable to the e-mail template This variable expands to an empty string if there is only one patch to be sent or to ' patchnr/totalnr' otherwise. Signed-off-by: Catalin Marinas --- examples/firstmail.tmpl | 2 +- stgit/commands/mail.py | 18 ++++++++++++++++-- templates/patchmail.tmpl | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/examples/firstmail.tmpl b/examples/firstmail.tmpl index fa5ff9a..5ffcab7 100644 --- a/examples/firstmail.tmpl +++ b/examples/firstmail.tmpl @@ -2,7 +2,7 @@ From: Your Name To: Some Address Cc: other.address@otherlist.com, other.person@othercompany.com Bcc: Your Name -Subject: [PATCH 0/%(totalnr)s] Series short description +Subject: [PATCH%(number)s] Series short description Date: %(date)s %(endofheaders)s The following series implements... diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py index 58965e2..d758b9c 100644 --- a/stgit/commands/mail.py +++ b/stgit/commands/mail.py @@ -60,6 +60,7 @@ the following variables: %(date)s - current date/time %(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' %(authname)s - author's name %(authemail)s - author's email %(authdate)s - patch creation date @@ -67,7 +68,8 @@ the following variables: %(commemail)s - committer's e-mail For the preamble e-mail template, only the %(maintainer)s, %(date)s, -%(endofheaders)s and %(totalnr)s variables are supported.""" +%(endofheaders)s, %(patchnr)s, %(totalnr)s and %(number)s variables +are supported.""" options = [make_option('-a', '--all', help = 'e-mail all the applied patches', @@ -167,11 +169,18 @@ def __build_first(tmpl, total_nr, msg_id, options): headers_end += 'Message-Id: %s\n' % msg_id total_nr_str = str(total_nr) + patch_nr_str = '0'.zfill(len(total_nr_str)) + if total_nr > 1: + number_str = ' %s/%s' % (patch_nr_str, total_nr_str) + else: + number_str = '' tmpl_dict = {'maintainer': maintainer, 'endofheaders': headers_end, 'date': email.Utils.formatdate(localtime = True), - 'totalnr': total_nr_str} + 'patchnr': patch_nr_str, + 'totalnr': total_nr_str, + 'number': number_str} try: msg = tmpl % tmpl_dict @@ -214,6 +223,10 @@ def __build_message(tmpl, patch, patch_nr, total_nr, msg_id, ref_id, options): total_nr_str = str(total_nr) patch_nr_str = str(patch_nr).zfill(len(total_nr_str)) + if total_nr > 1: + number_str = ' %s/%s' % (patch_nr_str, total_nr_str) + else: + number_str = '' tmpl_dict = {'patch': patch, 'maintainer': maintainer, @@ -227,6 +240,7 @@ def __build_message(tmpl, patch, patch_nr, total_nr, msg_id, ref_id, options): 'date': email.Utils.formatdate(localtime = True), 'patchnr': patch_nr_str, 'totalnr': total_nr_str, + 'number': number_str, 'authname': p.get_authname(), 'authemail': p.get_authemail(), 'authdate': p.get_authdate(), diff --git a/templates/patchmail.tmpl b/templates/patchmail.tmpl index 4c1136d..96da5b9 100644 --- a/templates/patchmail.tmpl +++ b/templates/patchmail.tmpl @@ -1,5 +1,5 @@ From: %(maintainer)s -Subject: [PATCH %(patchnr)s/%(totalnr)s] %(shortdescr)s +Subject: [PATCH%(number)s] %(shortdescr)s Date: %(date)s %(endofheaders)s %(longdescr)s -- 2.11.0