summaryrefslogtreecommitdiff
path: root/tools/patman
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-09-14 20:23:17 -0600
committerSimon Glass <sjg@chromium.org>2014-09-21 12:03:07 -0600
commit983a2749e2fdc459b2f44e82241a5c314ddbcdf6 (patch)
treee61e99d84d8cd056815933d1a31282d1fc8c9824 /tools/patman
parent7798e2285fda17aa2268cbe18498678cf857905f (diff)
downloadu-boot-imx-983a2749e2fdc459b2f44e82241a5c314ddbcdf6.zip
u-boot-imx-983a2749e2fdc459b2f44e82241a5c314ddbcdf6.tar.gz
u-boot-imx-983a2749e2fdc459b2f44e82241a5c314ddbcdf6.tar.bz2
patman: Add a -m option to avoid copying the maintainers
The get_maintainers script is a useful default, but sometimes is copies too many people, or takes a long time to run. Add an option to disable it and update the README. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/patman')
-rw-r--r--tools/patman/README4
-rwxr-xr-xtools/patman/patman.py6
-rw-r--r--tools/patman/series.py7
3 files changed, 12 insertions, 5 deletions
diff --git a/tools/patman/README b/tools/patman/README
index 5fb508b..e466886 100644
--- a/tools/patman/README
+++ b/tools/patman/README
@@ -27,8 +27,8 @@ Series-to: fred.blogs@napier.co.nz
in one of your commits, the series will be sent there.
-In Linux this will also call get_maintainer.pl on each of your
-patches automatically.
+In Linux and U-Boot this will also call get_maintainer.pl on each of your
+patches automatically (unless you use -m to disable this).
How to use this tool
diff --git a/tools/patman/patman.py b/tools/patman/patman.py
index 2ab6b35..6c6473e 100755
--- a/tools/patman/patman.py
+++ b/tools/patman/patman.py
@@ -32,6 +32,9 @@ parser.add_option('-c', '--count', dest='count', type='int',
parser.add_option('-i', '--ignore-errors', action='store_true',
dest='ignore_errors', default=False,
help='Send patches email even if patch errors are found')
+parser.add_option('-m', '--no-maintainers', action='store_false',
+ dest='add_maintainers', default=True,
+ help="Don't cc the file maintainers automatically")
parser.add_option('-n', '--dry-run', action='store_true', dest='dry_run',
default=False, help="Do a dry run (create but don't email patches)")
parser.add_option('-p', '--project', default=project.DetectProject(),
@@ -142,7 +145,8 @@ else:
ok = True
cc_file = series.MakeCcFile(options.process_tags, cover_fname,
- not options.ignore_bad_tags)
+ not options.ignore_bad_tags,
+ options.add_maintainers)
# Email the patches out (giving the user time to check / cancel)
cmd = ''
diff --git a/tools/patman/series.py b/tools/patman/series.py
index 88c0d87..b67f870 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -201,7 +201,8 @@ class Series(dict):
str = 'Change log exists, but no version is set'
print col.Color(col.RED, str)
- def MakeCcFile(self, process_tags, cover_fname, raise_on_error):
+ def MakeCcFile(self, process_tags, cover_fname, raise_on_error,
+ add_maintainers):
"""Make a cc file for us to use for per-commit Cc automation
Also stores in self._generated_cc to make ShowActions() faster.
@@ -211,6 +212,7 @@ class Series(dict):
cover_fname: If non-None the name of the cover letter.
raise_on_error: True to raise an error when an alias fails to match,
False to just print a message.
+ add_maintainers: Call the get_maintainers to CC maintainers
Return:
Filename of temp file created
"""
@@ -225,7 +227,8 @@ class Series(dict):
raise_on_error=raise_on_error)
list += gitutil.BuildEmailList(commit.cc_list,
raise_on_error=raise_on_error)
- list += get_maintainer.GetMaintainer(commit.patch)
+ if add_maintainers:
+ list += get_maintainer.GetMaintainer(commit.patch)
all_ccs += list
print >>fd, commit.patch, ', '.join(list)
self._generated_cc[commit.patch] = list