patman: Update Series.ShowActions() to pass alias
Instead of using settings.alias pass this value in. This allows tests to
work without using settings.alias
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/tools/patman/series.py b/tools/patman/series.py
index 4322882..3ec33e0 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -102,16 +102,19 @@
commit.check_tags()
self.commits.append(commit)
- def ShowActions(self, args, cmd, process_tags):
+ def ShowActions(self, args, cmd, process_tags, alias):
"""Show what actions we will/would perform
Args:
args: List of patch files we created
cmd: The git command we would have run
process_tags: Process tags as if they were aliases
+ alias (dict): Alias dictionary
+ key: alias
+ value: list of aliases or email addresses
"""
- to_set = set(gitutil.build_email_list(self.to, settings.alias));
- cc_set = set(gitutil.build_email_list(self.cc, settings.alias));
+ to_set = set(gitutil.build_email_list(self.to, alias));
+ cc_set = set(gitutil.build_email_list(self.cc, alias));
col = terminal.Color()
print('Dry run, so not doing much. But I would do this:')
@@ -141,7 +144,7 @@
if self.cover:
print('Cover: %d lines' % len(self.cover))
cover_cc = gitutil.build_email_list(self.get('cover_cc', ''),
- settings.alias)
+ alias)
all_ccs = itertools.chain(cover_cc, *self._generated_cc.values())
for email in sorted(set(all_ccs) - to_set - cc_set):
print(' Cc: ', email)
@@ -271,9 +274,9 @@
"""
cc = []
if process_tags:
- cc += gitutil.build_email_list(commit.tags, settings.alias,
+ cc += gitutil.build_email_list(commit.tags, alias,
warn_on_error=warn_on_error)
- cc += gitutil.build_email_list(commit.cc_list, settings.alias,
+ cc += gitutil.build_email_list(commit.cc_list, alias,
warn_on_error=warn_on_error)
if type(add_maintainers) == type(cc):
cc += add_maintainers
@@ -353,7 +356,7 @@
if cover_fname:
cover_cc = gitutil.build_email_list(
- self.get('cover_cc', ''), settings.alias)
+ self.get('cover_cc', ''), alias)
cover_cc = list(set(cover_cc + all_ccs))
if limit is not None:
cover_cc = cover_cc[:limit]