diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2017-01-13 19:11:29 +0100 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-01-17 18:01:10 +0100 |
| commit | 6f27edd3773dd8aa587e112366f7708e248d19fc (patch) | |
| tree | 195e64efaddc81c64f78f3b1bc5be774a59c7f4f /util/scripts/cross-repo-cherrypick | |
| parent | 8b89252f8ad2a79e8bdffc2abf250fc7110f3884 (diff) | |
| download | coreboot-6f27edd3773dd8aa587e112366f7708e248d19fc.tar.xz | |
util/scripts: extend cross-repo-cherrypick
The script now automatically discovers the original branch (if known)
and configures itself appropriately.
Additionally, commit messages for changes coming _from_ upstream will
be prefixed with "UPSTREAM: ".
With the optional --cros argument, it also adds a BUG/BRANCH/TEST block
at the right place in the commit message (right above the metadata) if
one doesn't already exist.
Change-Id: I81864ddca62fd99a9eb905d7075e5b53f58c4eb5
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/18135
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'util/scripts/cross-repo-cherrypick')
| -rwxr-xr-x | util/scripts/cross-repo-cherrypick | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick index 9247cc2e40..0f2acf8eae 100755 --- a/util/scripts/cross-repo-cherrypick +++ b/util/scripts/cross-repo-cherrypick @@ -2,7 +2,7 @@ # rebase.sh - rebase helper script # -# Copyright 2015 Google Inc. +# Copyright 2015, 2017 Google Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # # Adapt to your remote branch: -BRANCH="cros/chromeos-2016.05" +BRANCH="origin/master" # When pulling in patches from another tree from a gerrit repository, # do the following at the end of a larger cherry-pick series: @@ -26,10 +26,32 @@ BRANCH="cros/chromeos-2016.05" # Alternatively, you can run util/gitconfig/rebase.sh after every # individual cherry-pick. +# use $0 --cros to add a stub BUG/BRANCH/TEST block + commit_message() { git log -n 1 | grep "^ " | cut -c5- } +ORIGIN_HOST=$( commit_message |grep "^Reviewed-on: " |head -1 |cut -d/ -f3 ) +case "${ORIGIN_HOST}" in + review.coreboot.org) + BRANCH="origin/master" + MESSAGE_PREFIX="UPSTREAM: " + ;; + chromium-review.googlesource.com) + BRANCH="cros/chromeos-2016.05" + MESSAGE_PREFIX="" + ;; +esac + +# lines must be backwards due to tac(1) +SPLICE_CMD="" +if test "$1" = "--cros"; then + if test -z "$( commit_message |egrep '^(BUG|TEST)=')"; then + SPLICE_CMD='print "\nTEST=none\nBRANCH=none\nBUG=none\n"' + fi +fi + CHID=$( commit_message | grep -i "^Change-Id: I" ) CID=$( git log -n1 --grep "^$CHID$" --pretty=%H $BRANCH ) GUID="$(git config user.name) <$(git config user.email)>" @@ -37,9 +59,11 @@ GUID="$(git config user.name) <$(git config user.email)>" # TBD: Don't add Original- to empty lines, and possibly make script more # solid for commits with an unexpected order of meta data lines. -commit_message | tac | awk '/^$/ { - if (end==0) - print "Original-Commit-Id: '"$CID"'\nSigned-off-by: '"$GUID"'"; +(printf "${MESSAGE_PREFIX}"; commit_message) | tac | awk '/^$/ { + if (end==0) { + print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'"; + '"${SPLICE_CMD}"' + } end=1 }; { if (end==0) |