summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/patman/patman.py6
-rw-r--r--tools/patman/series.py13
2 files changed, 13 insertions, 6 deletions
diff --git a/tools/patman/patman.py b/tools/patman/patman.py
index cfe06d0..de8314a 100755
--- a/tools/patman/patman.py
+++ b/tools/patman/patman.py
@@ -140,14 +140,16 @@ else:
options.count + options.start):
ok = False
+ cc_file = series.MakeCcFile(options.process_tags)
+
# Email the patches out (giving the user time to check / cancel)
cmd = ''
if ok or options.ignore_errors:
- cc_file = series.MakeCcFile(options.process_tags)
cmd = gitutil.EmailPatches(series, cover_fname, args,
options.dry_run, cc_file)
- os.remove(cc_file)
# For a dry run, just show our actions as a sanity check
if options.dry_run:
series.ShowActions(args, cmd, options.process_tags)
+
+ os.remove(cc_file)
diff --git a/tools/patman/series.py b/tools/patman/series.py
index d2971f4..ad8288d 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -46,6 +46,11 @@ class Series(dict):
self.notes = []
self.changes = {}
+ # Written in MakeCcFile()
+ # key: name of patch file
+ # value: list of email addresses
+ self._generated_cc = {}
+
# These make us more like a dictionary
def __setattr__(self, name, value):
self[name] = value
@@ -109,10 +114,7 @@ class Series(dict):
for upto in range(len(args)):
commit = self.commits[upto]
print col.Color(col.GREEN, ' %s' % args[upto])
- cc_list = []
- if process_tags:
- cc_list += gitutil.BuildEmailList(commit.tags)
- cc_list += gitutil.BuildEmailList(commit.cc_list)
+ cc_list = list(self._generated_cc[commit.patch])
# Skip items in To list
if 'to' in self:
@@ -202,6 +204,8 @@ class Series(dict):
def MakeCcFile(self, process_tags):
"""Make a cc file for us to use for per-commit Cc automation
+ Also stores in self._generated_cc to make ShowActions() faster.
+
Args:
process_tags: Process tags as if they were aliases
Return:
@@ -216,6 +220,7 @@ class Series(dict):
list += gitutil.BuildEmailList(commit.tags)
list += gitutil.BuildEmailList(commit.cc_list)
print >>fd, commit.patch, ', '.join(list)
+ self._generated_cc[commit.patch] = list
fd.close()
return fname