bin/get-pick-list.sh

   1 #!/bin/sh
   2
   3 # Script for generating a list of candidates for cherry-picking to a stable branch
   4 #
   5 # Usage examples:
   6 #
   7 # $ bin/get-pick-list.sh
   8 # $ bin/get-pick-list.sh > picklist
   9 # $ bin/get-pick-list.sh | tee picklist
  10 #
  11 # The output is as follows:
  12 # [nomination_type] commit_sha commit summary
  13
  14 is_stable_nomination()
  15 {
  16         git show --summary "$1" | grep -q -i -o "CC:.*mesa-stable"
  17 }
  18
  19 is_typod_nomination()
  20 {
  21         git show --summary "$1" | grep -q -i -o "CC:.*mesa-dev"
  22 }
  23
  24 # Helper to handle various mistypos of the fixes tag.
  25 # The tag string itself is passed as argument and normalised within.
  26 is_sha_nomination()
  27 {
  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}'`
  31
  32         fixes_count=`echo "$fixes" | wc -l`
  33         if [ $fixes_count -eq 0 ] ; then
  34                 return 0
  35         fi
  36         while [ $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))
  40
  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 [ "x$id" = x ] ; then
  45                         continue
  46                 fi
  47
  48                 #Check if the offending commit is in branch.
  49
  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
  54                         return 0
  55                 fi
  56         done
  57         return 1
  58 }
  59
  60 is_fixes_nomination()
  61 {
  62         is_sha_nomination "$1" "fixes:[[:space:]]*"
  63         if test $? -eq 0; then
  64                 return 0
  65         fi
  66         is_sha_nomination "$1" "fixes[[:space:]]\+"
  67 }
  68
  69 # Use the last branchpoint as our limit for the search
  70 latest_branchpoint=`git merge-base origin/master HEAD`
  71
  72 # List all the commits between day 1 and the branch point...
  73 git log --reverse --pretty=%H $latest_branchpoint > already_landed
  74
  75 # ... and the ones cherry-picked.
  76 git log --reverse --pretty=medium --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
  77         grep "cherry picked from commit" |\
  78         sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
  79
  80 # Grep for potential candidates
  81 git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|\<fixes\>' $latest_branchpoint..origin/master |\
  82 while read sha
  83 do
  84         # Check to see whether the patch is on the ignore list.
  85         if [ -f bin/.cherry-ignore ] ; then
  86                 if grep -q ^$sha bin/.cherry-ignore ; then
  87                         continue
  88                 fi
  89         fi
  90
  91         # Check to see if it has already been picked over.
  92         if grep -q ^$sha already_picked ; then
  93                 continue
  94         fi
  95
  96         if is_stable_nomination "$sha"; then
  97                 tag=stable
  98         elif is_typod_nomination "$sha"; then
  99                 tag=typod
 100         elif is_fixes_nomination "$sha"; then
 101                 tag=fixes
 102         else
 103                 continue
 104         fi
 105
 106         printf "[ %8s ] " "$tag"
 107         git --no-pager show --summary --oneline $sha
 108 done
 109
 110 rm -f already_picked
 111 rm -f already_landed