2012-10-19 21:30:53 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
2012-10-19 21:54:56 +01:00
|
|
|
# Script for generating a list of candidates for cherry-picking to a stable branch
|
2013-04-18 08:32:39 +01:00
|
|
|
#
|
|
|
|
# Usage examples:
|
|
|
|
#
|
|
|
|
# $ bin/get-pick-list.sh
|
|
|
|
# $ bin/get-pick-list.sh > picklist
|
|
|
|
# $ bin/get-pick-list.sh | tee picklist
|
2018-11-08 15:05:14 +00:00
|
|
|
#
|
|
|
|
# The output is as follows:
|
|
|
|
# [nomination_type] commit_sha commit summary
|
|
|
|
|
|
|
|
is_stable_nomination()
|
|
|
|
{
|
|
|
|
git show --summary "$1" | grep -q -i -o "CC:.*mesa-stable"
|
|
|
|
}
|
2012-10-19 21:54:56 +01:00
|
|
|
|
2018-11-08 15:05:15 +00:00
|
|
|
is_typod_nomination()
|
|
|
|
{
|
|
|
|
git show --summary "$1" | grep -q -i -o "CC:.*mesa-dev"
|
|
|
|
}
|
|
|
|
|
2018-11-08 15:05:18 +00:00
|
|
|
# Helper to handle various mistypos of the fixes tag.
|
|
|
|
# The tag string itself is passed as argument and normalised within.
|
|
|
|
is_sha_nomination()
|
2018-11-08 15:05:16 +00:00
|
|
|
{
|
|
|
|
fixes=`git show --pretty=medium -s $1 | tr -d "\n" | \
|
2018-11-08 15:05:18 +00:00
|
|
|
sed -e 's/'"$2"'/\nfixes:/Ig' | \
|
2018-11-08 15:05:17 +00:00
|
|
|
grep -Eo 'fixes:[a-f0-9]{8,40}'`
|
2018-11-08 15:05:16 +00:00
|
|
|
|
|
|
|
fixes_count=`echo "$fixes" | wc -l`
|
|
|
|
if [ $fixes_count -eq 0 ] ; then
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
while [ $fixes_count -gt 0 ] ; do
|
|
|
|
# Treat only the current line
|
|
|
|
id=`echo "$fixes" | tail -n $fixes_count | head -n 1 | cut -d : -f 2`
|
|
|
|
fixes_count=$(($fixes_count-1))
|
|
|
|
|
|
|
|
# Bail out if we cannot find suitable id.
|
|
|
|
# Any specific validation the $id is valid and not some junk, is
|
|
|
|
# implied with the follow up code
|
|
|
|
if [ "x$id" = x ] ; then
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
|
|
|
|
#Check if the offending commit is in branch.
|
|
|
|
|
|
|
|
# Be that cherry-picked ...
|
|
|
|
# ... or landed before the branchpoint.
|
|
|
|
if grep -q ^$id already_picked ||
|
|
|
|
grep -q ^$id already_landed ; then
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
return 1
|
|
|
|
}
|
|
|
|
|
2018-11-08 15:05:18 +00:00
|
|
|
is_fixes_nomination()
|
|
|
|
{
|
|
|
|
is_sha_nomination "$1" "fixes:[[:space:]]*"
|
2018-11-08 15:05:19 +00:00
|
|
|
if test $? -eq 0; then
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
is_sha_nomination "$1" "fixes[[:space:]]\+"
|
2018-11-08 15:05:18 +00:00
|
|
|
}
|
|
|
|
|
2018-11-08 15:05:20 +00:00
|
|
|
is_brokenby_nomination()
|
|
|
|
{
|
|
|
|
is_sha_nomination "$1" "broken by"
|
|
|
|
}
|
|
|
|
|
2017-02-13 00:37:03 +00:00
|
|
|
# Use the last branchpoint as our limit for the search
|
|
|
|
latest_branchpoint=`git merge-base origin/master HEAD`
|
|
|
|
|
2018-11-08 15:05:16 +00:00
|
|
|
# List all the commits between day 1 and the branch point...
|
|
|
|
git log --reverse --pretty=%H $latest_branchpoint > already_landed
|
|
|
|
|
|
|
|
# ... and the ones cherry-picked.
|
2018-05-21 18:30:42 +01:00
|
|
|
git log --reverse --pretty=medium --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
|
2012-10-19 22:13:12 +01:00
|
|
|
grep "cherry picked from commit" |\
|
|
|
|
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
|
|
|
|
|
2018-11-08 15:05:16 +00:00
|
|
|
# Grep for potential candidates
|
2018-11-08 15:05:20 +00:00
|
|
|
git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|\<fixes\>\|\<broken by\>' $latest_branchpoint..origin/master |\
|
2012-10-19 21:30:53 +01:00
|
|
|
while read sha
|
|
|
|
do
|
2012-10-20 20:50:30 +01:00
|
|
|
# Check to see whether the patch is on the ignore list.
|
2012-10-22 20:18:17 +01:00
|
|
|
if [ -f bin/.cherry-ignore ] ; then
|
|
|
|
if grep -q ^$sha bin/.cherry-ignore ; then
|
2012-10-20 20:50:30 +01:00
|
|
|
continue
|
|
|
|
fi
|
2012-10-19 21:30:53 +01:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Check to see if it has already been picked over.
|
2012-10-19 22:13:12 +01:00
|
|
|
if grep -q ^$sha already_picked ; then
|
|
|
|
continue
|
2012-10-19 21:30:53 +01:00
|
|
|
fi
|
|
|
|
|
2018-11-08 15:05:14 +00:00
|
|
|
if is_stable_nomination "$sha"; then
|
|
|
|
tag=stable
|
2018-11-08 15:05:15 +00:00
|
|
|
elif is_typod_nomination "$sha"; then
|
|
|
|
tag=typod
|
2018-11-08 15:05:16 +00:00
|
|
|
elif is_fixes_nomination "$sha"; then
|
|
|
|
tag=fixes
|
2018-11-08 15:05:20 +00:00
|
|
|
elif is_brokenby_nomination "$sha"; then
|
|
|
|
tag=brokenby
|
2018-11-08 15:05:14 +00:00
|
|
|
else
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
|
|
|
|
printf "[ %8s ] " "$tag"
|
2018-11-08 15:05:13 +00:00
|
|
|
git --no-pager show --summary --oneline $sha
|
2012-10-19 21:30:53 +01:00
|
|
|
done
|
2012-10-19 22:13:12 +01:00
|
|
|
|
|
|
|
rm -f already_picked
|
2018-11-08 15:05:16 +00:00
|
|
|
rm -f already_landed
|