3 # Script for generating a list of candidates for cherry-picking to a stable branch
7 # $ bin/get-pick-list.sh
8 # $ bin/get-pick-list.sh > picklist
9 # $ bin/get-pick-list.sh | tee picklist
11 # The output is as follows:
12 # [nomination_type] commit_sha commit summary
14 is_stable_nomination
()
16 git show
--summary "$1" |
grep -q -i -o "CC:.*mesa-stable"
21 git show
--summary "$1" |
grep -q -i -o "CC:.*mesa-dev"
24 # Helper to handle various mistypos of the fixes tag.
25 # The tag string itself is passed as argument and normalised within.
28 fixes
=`git show --pretty=medium -s $1 | tr -d "\n" | \
29 sed -e 's/'"$2"'/\nfixes:/Ig' | \
30 grep -Eo 'fixes:[a-f0-9]{8,40}'`
32 fixes_count
=`echo "$fixes" | wc -l`
33 if test $fixes_count -eq 0; then
36 while test $fixes_count -gt 0; do
37 # Treat only the current line
38 id
=`echo "$fixes" | tail -n $fixes_count | head -n 1 | cut -d : -f 2`
39 fixes_count
=$
(($fixes_count-1))
41 # Bail out if we cannot find suitable id.
42 # Any specific validation the $id is valid and not some junk, is
43 # implied with the follow up code
44 if test "x$id" = x
; then
48 #Check if the offending commit is in branch.
50 # Be that cherry-picked ...
51 # ... or landed before the branchpoint.
52 if grep -q ^
$id already_picked ||
53 grep -q ^
$id already_landed
; then
62 is_sha_nomination
"$1" "fixes:[[:space:]]*"
63 if test $?
-eq 0; then
66 is_sha_nomination
"$1" "fixes[[:space:]]\+"
69 is_brokenby_nomination
()
71 is_sha_nomination
"$1" "broken by"
74 is_revert_nomination
()
76 is_sha_nomination
"$1" "This reverts commit "
79 # Use the last branchpoint as our limit for the search
80 latest_branchpoint
=`git merge-base origin/master HEAD`
82 # List all the commits between day 1 and the branch point...
83 git log
--reverse --pretty=%H
$latest_branchpoint > already_landed
85 # ... and the ones cherry-picked.
86 git log
--reverse --pretty=medium
--grep="cherry picked from commit" $latest_branchpoint..HEAD |\
87 grep "cherry picked from commit" |\
88 sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
90 # Grep for potential candidates
91 git log
--reverse --pretty=%H
-i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|\<fixes\>\|\<broken by\>\|This reverts commit' $latest_branchpoint..origin
/master |\
94 # Check to see whether the patch is on the ignore list.
95 if test -f bin
/.cherry-ignore
; then
96 if grep -q ^
$sha bin
/.cherry-ignore
; then
101 # Check to see if it has already been picked over.
102 if grep -q ^
$sha already_picked
; then
106 if is_stable_nomination
"$sha"; then
108 elif is_typod_nomination
"$sha"; then
110 elif is_fixes_nomination
"$sha"; then
112 elif is_brokenby_nomination
"$sha"; then
114 elif is_revert_nomination
"$sha"; then
120 printf "[ %8s ] " "$tag"
121 git
--no-pager show
--summary --oneline $sha