commit 1a262c09f0cb5cdd3904cd656e65e19c0a08d779
author Tzung-Bi Shih <tzungbi@chromium.org> Thu Aug 13 10:49:55 2020 +0800
committer Commit Bot <commit-bot@chromium.org> Sat Aug 15 01:02:34 2020 +0000
tree 36fd77cd68515de3a69051b56a8dc67f6dbcfd11
parent 47f0c25122f2f93dd57f6659304d7953e6737882

fromupstream: support Cq-Depend from command line

BUG=none
TEST=1. fromupstream.py -b none -t none --cqdepend "chromium:12345" \
     linux://238c30468f46b
     2. git show -s
     3. git rebase --onto HEAD~1 HEAD

Change-Id: Ie76eb660d8264c4793a207908e73f4a16398ff22
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2352311
Tested-by: Tzung-Bi Shih <tzungbi@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Commit-Queue: Tzung-Bi Shih <tzungbi@chromium.org>

contrib/fromupstream.py

diff --git a/contrib/fromupstream.py b/contrib/fromupstream.py
index 816f52b..fdaf630 100755
--- a/contrib/fromupstream.py
+++ b/contrib/fromupstream.py
@@ -413,6 +413,8 @@
                         type=int, help='BUG=b: line')
     parser.add_argument('--changeid', '-c',
                         help='Overrides the gerrit generated Change-Id line')
+    parser.add_argument('--cqdepend',
+                        type=str, help='Cq-Depend: line')
 
     parser.add_argument('--replace', '-r',
                         action='store_true',
@@ -558,6 +560,11 @@
                                     args['changeid'], commit_message)
             args['changeid'] = None
 
+        if args['cqdepend'] is not None:
+            commit_message = re.sub(
+                r'(Change-Id: \w+)', r'Cq-Depend: %s\n\1' % args['cqdepend'],
+                commit_message)
+
         # decorate it that it's from outside
         commit_message = args['tag'] + commit_message