From 602dac4fa1f8552c5c787c8c5d4dddb283cf1efb Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 2 Jun 2016 11:13:15 +0200 Subject: [PATCH] scripts: check commits with checkpatch The new option -n allows to give a number of commits to check from the git HEAD. If neither -n nor patch files are given, the commits after origin/master are checked. Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson --- scripts/checkpatches.sh | 45 ++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/scripts/checkpatches.sh b/scripts/checkpatches.sh index 4cae86d924..7111558f37 100755 --- a/scripts/checkpatches.sh +++ b/scripts/checkpatches.sh @@ -48,17 +48,19 @@ NEW_TYPEDEFS,COMPARISON_TO_NULL" print_usage () { cat <<- END_OF_HELP - usage: $(basename $0) [-q] [-v] [patch1 [patch2] ...]] + usage: $(basename $0) [-q] [-v] [-nX|patch1 [patch2] ...]] Run Linux kernel checkpatch.pl with DPDK options. The environment variable DPDK_CHECKPATCH_PATH must be set. END_OF_HELP } +number=0 quiet=false verbose=false -while getopts hqv ARG ; do +while getopts hn:qv ARG ; do case $ARG in + n ) number=$OPTARG ;; q ) quiet=true && options="$options --no-summary" ;; v ) verbose=true ;; h ) print_usage ; exit 0 ;; @@ -74,17 +76,42 @@ if [ ! -x "$DPDK_CHECKPATCH_PATH" ] ; then exit 1 fi +total=0 status=0 -for p in "$@" ; do - ! $verbose || printf '\n### %s\n\n' "$p" - report=$($DPDK_CHECKPATCH_PATH $options "$p" 2>/dev/null) + +check () { # + total=$(($total + 1)) + ! $verbose || printf '\n### %s\n\n' "$3" + if [ -n "$1" ] ; then + report=$($DPDK_CHECKPATCH_PATH $options "$1" 2>/dev/null) + elif [ -n "$2" ] ; then + report=$(git format-patch --no-stat --stdout -1 $commit | + $DPDK_CHECKPATCH_PATH $options - 2>/dev/null) + fi [ $? -ne 0 ] || continue - $verbose || printf '\n### %s\n\n' "$p" + $verbose || printf '\n### %s\n\n' "$3" printf '%s\n' "$report" | head -n -6 status=$(($status + 1)) -done -pass=$(($# - $status)) -$quiet || printf '%d/%d valid patch' $pass $# +} + +if [ -z "$1" ] ; then + if [ $number -eq 0 ] ; then + commits=$(git rev-list origin/master..) + else + commits=$(git rev-list --max-count=$number HEAD) + fi + for commit in $commits ; do + subject=$(git log --format='%s' -1 $commit) + check '' $commit "$subject" + done +else + for patch in "$@" ; do + subject=$(sed -n 's,^Subject: ,,p' "$patch") + check "$patch" '' "$subject" + done +fi +pass=$(($total - $status)) +$quiet || printf '%d/%d valid patch' $pass $total $quiet || [ $pass -le 1 ] || printf 'es' $quiet || printf '\n' exit $status -- 2.20.1