From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id A16432931 for ; Mon, 11 Apr 2016 17:39:11 +0200 (CEST) Received: by mail-wm0-f42.google.com with SMTP id u206so109935598wme.1 for ; Mon, 11 Apr 2016 08:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=eaI7vNtqKsmznpTWQOpYZXty5NAXE571OJ+C+SdvVEE=; b=co5P56pKdZSmYH9KhuL6QMLs/l8MCSGNbB5dhnDbXhME6qwYRffXoAuRYhXackMJOB S6AeVaYz7lmy9aPSKqGNnlFS4zIlxWFOSqyY1gnl6tcaRFZa7NMGVVri23OPlCeZlqd1 Tg4INCn0RYb1JaMUjJvj4mCg8LcGsuG2UsZYmAQsAt6BlPlFmKDYiuFzkhpIwBNBjVDn fj7toRDdKu7LK466yzbr3e81MGoboa3kS8P5TKYVWO+rNSJRTKYBMH2ZwItCIffMpEoo 4pLq+fXm9Ir9QpcNl4rTzcbGxqVVVPx/vp2mj9CSP9ni5lu0mZHlpsRcrGZC4HqL1c2B cZBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=eaI7vNtqKsmznpTWQOpYZXty5NAXE571OJ+C+SdvVEE=; b=QRNAAGS0/vLUl0/XUQMyXsMWMi/elsgmvmuADNBh9Sj5xUdydtWRNc/KldtiaYcST7 2f+9d4YkvRY4mjbB2GvksQj5T1nRU3velzxKTV6yCfH10CHKNLuwvhXngUvMKPxPmLYe Q7nV/g1YP9ePUyybevhm9shb0BnSupWBrZ4aXAqGrJDyVVjyhhXbh57EXkOH1BhGcCJ6 qFYRIwyoVjVBBPosAGwexp/jnIIbkJw8E3HoSc962yJE6BHX6JMsyrw5bhlIsfvwPYHa 7RGNYc7xnBgz8+HUmxHSrL5Zwpz0CioCPR6quWu0e2dsW7RLEEStLntqMnx7vRy9Utm2 k6Fw== X-Gm-Message-State: AD7BkJJljp7kF4pH0yP1TGAhNn7KauluqY14dgktYInjY4m5kJ/gxk27jNC6o+ZdAQ4fnkJQ X-Received: by 10.28.153.203 with SMTP id b194mr19788353wme.3.1460389151389; Mon, 11 Apr 2016 08:39:11 -0700 (PDT) Received: from XPS13.localdomain (245.111.75.86.rev.sfr.net. [86.75.111.245]) by smtp.gmail.com with ESMTPSA id s6sm8938661wjy.31.2016.04.11.08.39.09 for (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Apr 2016 08:39:10 -0700 (PDT) From: Thomas Monjalon To: dev@dpdk.org Date: Mon, 11 Apr 2016 17:39:05 +0200 Message-Id: <1460389145-5570-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1459286986-31148-1-git-send-email-thomas.monjalon@6wind.com> References: <1459286986-31148-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH v2] scripts: check commit formatting X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Apr 2016 15:39:11 -0000 The git messages have three parts: 1/ the headline 2/ the explanations 3/ the footer tags The headline helps to quickly browse an history or catch instantly the purpose of a commit. Making it short with some consistent wording allows to easily parse it or match some patterns. The explanations must give some keys like the reason of the change. Nothing can be automatically checked for this part, except line length. The footer contains some tags to find the origin of a bug or who was working on it. This script is doing some basic checks mostly on parts 1 and 3. Signed-off-by: Thomas Monjalon --- MAINTAINERS | 1 + doc/guides/contributing/patches.rst | 8 +++ scripts/check-git-log.sh | 140 ++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100755 scripts/check-git-log.sh v2: - accept not only 12 long hash in Fixes: - check line length - add doc diff --git a/MAINTAINERS b/MAINTAINERS index f213500..1953ea2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25,6 +25,7 @@ M: Thomas Monjalon T: git://dpdk.org/dpdk F: MAINTAINERS F: scripts/check-maintainers.sh +F: scripts/check-git-log.sh F: scripts/checkpatches.sh F: scripts/load-devel-config.sh F: scripts/test-build.sh diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index 3ebe95b..06af91d 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -258,6 +258,14 @@ Where: * ``-v``: verbose. * ``patchX``: path to one or more patches. +Then the git logs should be checked using the ``check-git-log.sh`` script. + +The script usage is:: + + check-git-log.sh [range] + +Where the range is a ``git log`` option. + .. _contrib_check_compilation: diff --git a/scripts/check-git-log.sh b/scripts/check-git-log.sh new file mode 100755 index 0000000..ce6c15e --- /dev/null +++ b/scripts/check-git-log.sh @@ -0,0 +1,140 @@ +#! /bin/sh + +# BSD LICENSE +# +# Copyright 2016 6WIND S.A. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of 6WIND S.A. nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Check commit logs (headlines and references) +# +# If any doubt about the formatting, please check in the most recent history: +# git log --format='%>|(15)%cr %s' --reverse | grep -i + +if [ "$1" = '-h' -o "$1" = '--help' ] ; then + cat <<- END_OF_HELP + usage: $(basename $0) [-h] [range] + + Check commit log formatting. + The git range can be specified as a "git log" option, + e.g. -1 to check only the latest commit. + The default range starts from origin/master to HEAD. + END_OF_HELP + exit +fi + +range=${1:-origin/master..} + +headlines=$(git log --format='%s' $range) +bodylines=$(git log --format='%b' $range) +tags=$(git log --format='%b' $range | grep -i -e 'by *:' -e 'fix.*:') +fixes=$(git log --format='%h %s' $range | grep -i ': *fix' | cut -d' ' -f1) + +# check headline format (spacing, no punctuation, no code) +bad=$(echo "$headlines" | grep \ + -e ' ' \ + -e '^ ' \ + -e ' $' \ + -e '\.$' \ + -e '[,;!?&|]' \ + -e ':.*_' \ + -e '^[^:]*$' \ + -e ':[^ ]' \ + -e ' :' \ + | sed 's,^,\t,') +[ -z "$bad" ] || printf "Wrong headline format:\n$bad\n" + +# check headline label for common typos +bad=$(echo "$headlines" | grep \ + -e '^example[:/]' \ + -e '^apps/' \ + -e '^testpmd' \ + -e 'test-pmd' \ + -e '^bond:' \ + | sed 's,^,\t,') +[ -z "$bad" ] || printf "Wrong headline label:\n$bad\n" + +# check headline lowercase for first words +bad=$(echo "$headlines" | grep \ + -e '^.*[A-Z].*:' \ + -e ': *[A-Z]' \ + | sed 's,^,\t,') +[ -z "$bad" ] || printf "Wrong headline uppercase:\n$bad\n" + +# check headline uppercase (Rx/Tx, VF, L2, MAC, Linux, ARM...) +bad=$(echo "$headlines" | grep \ + -e 'rx\|tx\|RX\|TX' \ + -e '\<[pv]f\>' \ + -e '\' \ + -e ':.*\' \ + -e ':.*\' \ + -e ':.*\' \ + -e ':.*\' \ + -e ':.*\' \ + -e ':.*\' \ + -e ':.*\' \ + -e ':.*\' \ + -e ':.*\' \ + -e ':.*\' \ + -e ':.*\' \ + -e ':.*\' \ + -e ':.*\' \ + | sed 's,^,\t,') +[ -z "$bad" ] || printf "Wrong headline lowercase:\n$bad\n" + +# check headline length (60 max) +bad=$(echo "$headlines" | awk 'length>60 {print}' | sed 's,^,\t,') +[ -z "$bad" ] || printf "Headline too long:\n$bad\n" + +# check body lines length (75 max) +bad=$(echo "$bodylines" | awk 'length>75 {print}' | sed 's,^,\t,') +[ -z "$bad" ] || printf "Line too long:\n$bad\n" + +# check tags spelling +bad=$(echo "$tags" | + grep -v '^\(Reported\|Suggested\|Signed-off\|Acked\|Reviewed\|Tested\)-by: [^,]* <.*@.*>$' | + grep -v '^Fixes: [0-9a-f]\{7\}[0-9a-f]* (".*")$' | + sed 's,^.,\t&,') +[ -z "$bad" ] || printf "Wrong tag:\n$bad\n" + +# check missing Fixes: tag +bad=$(for fix in $fixes ; do + git log --format='%b' -1 $fix | grep -q '^Fixes: ' || + git log --format='\t%s' -1 $fix +done) +[ -z "$bad" ] || printf "Missing 'Fixes' tag:\n$bad\n" + +# check Fixes: reference +IFS=' +' +fixtags=$(echo "$tags" | grep '^Fixes: ') +bad=$(for fixtag in $fixtags ; do + hash=$(echo "$fixtag" | sed 's,^Fixes: \([0-9a-f]*\).*,\1,') + good="Fixes: $hash "$(git log --format='("%s")' -1 $hash 2>&-) + printf "$fixtag" | grep -v "^$good$" +done | sed 's,^,\t,') +[ -z "$bad" ] || printf "Wrong 'Fixes' reference:\n$bad\n" -- 2.7.0