bin/get-{extra,fixes}-pick-list.sh: add support for ignore list

Both scripts does not use a file with the commits to ignore. So if we
have handled one of the suggested commits and decided we won't pick it,
the scripts will continue suggesting them.

v2:
- Mark the candidates in bin/get-extra-pick-list.sh (Juan A. Suarez)
- Use bin/.cherry-ignore to store rejected patches (Emil)

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh
index 4d3938931fb9838e6b0023c913caef4a07ff1176..dbd5474befa0d4792aafef196ee93e36d990eaa1 100755 (executable)
--- a/bin/get-extra-pick-list.sh
+++ b/bin/get-extra-pick-list.sh
@@ -30,6 +30,12 @@ do
                if grep -q ^$candidate already_picked ; then
                        continue
                fi
+               # Or if it isn't in the ignore list.
+               if [ -f bin/.cherry-ignore ] ; then
+                       if grep -q ^$candidate bin/.cherry-ignore ; then
+                               continue
+                       fi
+               fi
                echo Commit $candidate references $sha
        done
 done

diff --git a/bin/get-fixes-pick-list.sh b/bin/get-fixes-pick-list.sh
index 75242a22829d7aebffdb110532b5893564776670..73afd0c22a16c351c6bc1567a318101a3ab5eb54 100755 (executable)
--- a/bin/get-fixes-pick-list.sh
+++ b/bin/get-fixes-pick-list.sh
@@ -24,6 +24,13 @@ git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |
 git log --reverse --pretty=%H -i --grep="fixes:" $latest_branchpoint..origin/master |\
 while read sha
 do
+       # Check to see whether the patch is on the ignore list ...
+       if [ -f bin/.cherry-ignore ] ; then
+               if grep -q ^$sha bin/.cherry-ignore ; then
+                       continue
+               fi
+       fi
+
        # For each one try to extract the tag
        fixes_count=`git show $sha | grep -i "fixes:" | wc -l`
        if [ "x$fixes_count" != x1 ] ; then