OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bin/get-extra-pick-list: rework to use already_picked list

Browse Source 
Currently we loop (git log --grep) to check if the fix has landed. We
can simplify and make things faster by storing the already_picked list
and grep ping through it.

Slim down the message while we're here.

Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Emil Velikov
2017-02-11 12:45:21 +00:00
committed by Emil Velikov
parent cb1947eac7
commit 71e00d62ed
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/get-extra-pick-list.sh
View File

@@ -15,20 +15,23 @@ latest_branchpoint=`git merge-base origin/master HEAD`
# Grep for commits with "cherry picked from commit" in the commit message. # Grep for commits with "cherry picked from commit" in the commit message.
git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\ git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
grep "cherry picked from commit" |\ grep "cherry picked from commit" |\
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' |\ sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
cut -c -8 |\
# For each cherry-picked commit...
cat already_picked | cut -c -8 |\
while read sha while read sha
do do
# Check if the original commit is referenced in master # ... check if it's referenced (fixed by another) patch
git log -n1 --pretty=oneline --grep=$sha $latest_branchpoint..origin/master |\ git log -n1 --pretty=oneline --grep=$sha $latest_branchpoint..origin/master |\
cut -c -8 |\ cut -c -8 |\
while read candidate while read candidate
do do
# Check if the potential fix, hasn't landed in branch yet. # And flag up if it hasn't landed in branch yet.
found=`git log -n1 --pretty=oneline --reverse --grep=$candidate $latest_branchpoint..HEAD |wc -l` if grep -q ^$candidate already_picked ; then
if test $found = 0 continue
then
echo Commit $candidate might need to be picked, as it references $sha
fi fi
echo Commit $candidate references $sha
done done
done done
rm -f already_picked