From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 0C2F3A0AC5 for ; Wed, 1 May 2019 12:52:53 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C3D252B95; Wed, 1 May 2019 12:52:52 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 3DBE52B95 for ; Wed, 1 May 2019 12:52:50 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2C8B1C050061; Wed, 1 May 2019 10:52:50 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id E51BC18214; Wed, 1 May 2019 10:52:48 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org, bluca@debian.org, yskoh@mellanox.com Cc: Kevin Traynor Date: Wed, 1 May 2019 11:52:43 +0100 Message-Id: <20190501105243.13711-1-ktraynor@redhat.com> In-Reply-To: <20190430173155.6583-1-ktraynor@redhat.com> References: <20190430173155.6583-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 01 May 2019 10:52:50 +0000 (UTC) Subject: [dpdk-stable] [PATCH v2] 2-send-notice: add option for queued patch repo and remove context X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" The diff of patches can be difficult to read. Add an option to have a personal repo with the queued patches. If available it will add to the 2-send-notice emails like this: - Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/858ffc60a46052dadb106411868a3b2572d86ef3 - It will also remove the context from the email diff of patches. Signed-off-by: Kevin Traynor --- v2: add direct link to commit in queued repo README | 7 +++++++ compose-notice | 24 +++++++++++++++++++++++- lib.sh | 3 +++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/README b/README index bef3762..ec9c899 100644 --- a/README +++ b/README @@ -81,4 +81,11 @@ This will create .patch files located in stable-scripts//mail which can then be sent with git send-email to the authors and stable@dpdk.org. +As part of this email a diff is provided between the master and stable branch +patches. As there are diffs in the patches and diffs between the patches, it +can be hard to see how the patch will look in the repo when there are rebase +changes. To aid this, a personal repo like github can be used to store the queued +patches and it can be referenced in the email. If it is available it is set it +in lib.sh with QUEUED_REPO. + 3-request-backport ================== diff --git a/compose-notice b/compose-notice index 95260bd..21cbc68 100644 --- a/compose-notice +++ b/compose-notice @@ -33,4 +33,5 @@ construct_header() construct_notice() { + stable_commit=$(grep "^From " $patch | awk '{ print $2 }') cat << EOF Hi, @@ -46,4 +47,18 @@ to the branch. If the code is different (ie: not only metadata diffs), due for e a change in context or macro names, please double check it. +EOF + +if [ "$QUEUED_REPO" != "none" ] +then + cat << EOF +Queued patches are on a temporary branch at: +${QUEUED_REPO} + +This queued commit can be viewed at: +${QUEUED_REPO}/commit/$stable_commit + +EOF +fi + cat << EOF Thanks. @@ -67,5 +82,12 @@ construct_diff_of_diff() echo " Diff of the applied patch vs upstream commit (please double-check if non-empty:" echo "---" - $GIT format-patch --stdout -1 $upstream_commit | diff -Naur - $patch + if [ "$QUEUED_REPO" != "none" ] + then + # There is a queued repo so context can be seen there + $GIT format-patch --stdout -1 $upstream_commit | diff -Nar -u0 - $patch + else + # There is a no queued repo so better to show some context in diff + $GIT format-patch --stdout -1 $upstream_commit | diff -Naur - $patch + fi fi } diff --git a/lib.sh b/lib.sh index 42d0669..0af23b4 100644 --- a/lib.sh +++ b/lib.sh @@ -6,4 +6,7 @@ GIT="git --git-dir=$DPDK_DIR/.git" SIGNATURE="PLACEHOLDER" SIGN_TAG="no" +# If there is a repo that contains the queue of patches for a stable +# branch, then add the URL below and it will be referenced in 2-send-notice +QUEUED_REPO="none" # If set to yes, commits with a Fixes: line that applies to a newer # release will be automatically pruned. -- 2.20.1