summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMateusz Kulikowski <mateusz.kulikowski@gmail.com>2016-01-14 20:37:41 +0100
committerSimon Glass <sjg@chromium.org>2016-01-20 19:06:23 -0700
commit27067a46c56cdaa0f8a2ef433f0aed4376834c44 (patch)
treee81f5fa7f1be8d34f4541a91d1d237531803fc29 /tools
parentf0e075162f815f9cb769c7bb9003e0ad3b829811 (diff)
downloadtalos-obmc-uboot-27067a46c56cdaa0f8a2ef433f0aed4376834c44.tar.gz
talos-obmc-uboot-27067a46c56cdaa0f8a2ef433f0aed4376834c44.zip
patman: Add --thread option
Add option to create threaded series of patches. With it, it will be possible to create patch threads like this: [PATCH 0/10] Add support for time travel [PATCH 1/10] Add Flux Capacitor driver [PATCH 2/10] Add Mr. Fusion driver (...) Internally it will call git send-email with --thread option Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/patman/gitutil.py6
-rwxr-xr-xtools/patman/patman.py4
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index 9e739d89b6..5f1b4f6e76 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -328,7 +328,7 @@ def BuildEmailList(in_list, tag=None, alias=None, raise_on_error=True):
return result
def EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname,
- self_only=False, alias=None, in_reply_to=None):
+ self_only=False, alias=None, in_reply_to=None, thread=False):
"""Email a patch series.
Args:
@@ -342,6 +342,8 @@ def EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname,
self_only: True to just email to yourself as a test
in_reply_to: If set we'll pass this to git as --in-reply-to.
Should be a message ID that this is in reply to.
+ thread: True to add --thread to git send-email (make
+ all patches reply to cover-letter or first patch in series)
Returns:
Git command that was/would be run
@@ -400,6 +402,8 @@ def EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname,
cmd = ['git', 'send-email', '--annotate']
if in_reply_to:
cmd.append('--in-reply-to="%s"' % in_reply_to)
+ if thread:
+ cmd.append('--thread')
cmd += to
cmd += cc
diff --git a/tools/patman/patman.py b/tools/patman/patman.py
index 6fe8fe068c..d05c5ff8e1 100755
--- a/tools/patman/patman.py
+++ b/tools/patman/patman.py
@@ -61,6 +61,8 @@ parser.add_option('--no-check', action='store_false', dest='check_patch',
help="Don't check for patch compliance")
parser.add_option('--no-tags', action='store_false', dest='process_tags',
default=True, help="Don't process subject tags as aliaes")
+parser.add_option('-T', '--thread', action='store_true', dest='thread',
+ default=False, help='Create patches as a single thread')
parser.usage += """
@@ -161,7 +163,7 @@ else:
if its_a_go:
cmd = gitutil.EmailPatches(series, cover_fname, args,
options.dry_run, not options.ignore_bad_tags, cc_file,
- in_reply_to=options.in_reply_to)
+ in_reply_to=options.in_reply_to, thread=options.thread)
else:
print col.Color(col.RED, "Not sending emails due to errors/warnings")
OpenPOWER on IntegriCloud