From patchwork Mon Feb 3 15:44:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Traynor X-Patchwork-Id: 65492 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9F2ACA052E; Mon, 3 Feb 2020 16:44:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 31D841BFB3; Mon, 3 Feb 2020 16:44:51 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id D66981BFB2 for ; Mon, 3 Feb 2020 16:44:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580744689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=omPImauvxg72frBLeQhyxIsgwuLj1qWZFbzP1MgRVq4=; b=PVAr9N+kSbjI396IeJ57aqtz8pyFA0du2MdUQ4yznfeiujevaiYgnl5tEGbuN+LKNfcuDK aJG++rJ0/NtuLp9z6gk6rW/j3AQtmLK3F9zfQjlTY5Eun/gqH0LMlmvf/CuIqDasNPWDIZ jvFId4dIQMo/s8FlXkSXF0uIGPMceyY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-184-K6BNMIIAMWutRVK97zTC1A-1; Mon, 03 Feb 2020 10:44:44 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9BF64189CD02; Mon, 3 Feb 2020 15:44:43 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1F62B60BE2; Mon, 3 Feb 2020 15:44:41 +0000 (UTC) From: Kevin Traynor To: dev@dpdk.org, thomas@monjalon.net Cc: stable@dpdk.org, bluca@debian.org, Kevin Traynor Date: Mon, 3 Feb 2020 15:44:26 +0000 Message-Id: <20200203154426.3488-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: K6BNMIIAMWutRVK97zTC1A-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH] devtools: add fixes column to git-log-fixes X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" During backporting, if the fixes or stable tag are missing, it usually requires some investigation by stable maintainer as to why. The fixes tag of the originating release, if present, is contained at the end of the line. Otherwise there is an (N/A). When there are a large amount of commits, adding an aligned column indicating the presence of a fixes tag beside the stable one makes it easier to quickly see the patches requiring further investigation. e.g. 20.02 8f33cbcfa S F net/i40e/base: fix buffer address (16.04) 20.02 4b3da9415 S F net/i40e/base: fix error message (1.7.0) 20.02 1da546c39 - F net/i40e/base: fix missing link modes (17.08) 20.02 79bfe7808 S F net/i40e/base: fix Tx descriptors number (1.7.0) 20.02 50126939c - F net/i40e/base: fix retrying logic (18.02) 20.02 dcd05da0a S F app/testpmd: fix GENEVE flow item (18.02) 20.02 b0b9fdad2 S - net/bnx2x: support secondary process (N/A) 20.02 f8279f47d S F net/netvsc: fix crash in secondary process (18.08) Signed-off-by: Kevin Traynor --- Not sure if anyone else is relying on this script and changing the output will break something for them? If it is not ok to make this change now, I will add a note and re-submit for 20.05. --- devtools/git-log-fixes.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index e37ee2260..6d468d673 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -95,9 +95,21 @@ stable_tag () # } +# print a marker for fixes tag presence +fixes_tag () # +{ + if git log --format='%b' -1 $1 | grep -qi '^Fixes: *' ; then + echo 'F' + else + echo '-' + fi +} + git log --oneline --reverse $range | while read id headline ; do origins=$(origin_filter $id) stable=$(stable_tag $id) - [ "$stable" = "S" ] || [ -n "$origins" ] || echo "$headline" | grep -q fix || continue + fixes=$(fixes_tag $id) + [ "$stable" = "S" ] || [ "$fixes" = "F" ] || [ -n "$origins" ] || \ + echo "$headline" | grep -q fix || continue version=$(commit_version $id) if [ -n "$origins" ] ; then @@ -109,4 +121,4 @@ while read id headline ; do origver='N/A' fi - printf '%s %7s %s %s (%s)\n' $version $id $stable "$headline" "$origver" + printf '%s %7s %s %s %s (%s)\n' $version $id $stable $fixes "$headline" "$origver" done