[dpdk-stable] [PATCH] 2-send-notice: add option for queued patch repo and remove context
Kevin Traynor
ktraynor at redhat.com
Tue Apr 30 19:31:55 CEST 2019
The diff at the end can be difficult to read. Add an option to have
a personal repo with the queued patches, and when available reduce the
email diff context to zero.
Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
---
README | 7 +++++++
compose-notice | 20 +++++++++++++++++++-
lib.sh | 3 +++
3 files changed, 29 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/<release>/mail which can
then be sent with git send-email to the authors and stable at 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 ec6e6a9..d08119b 100644
--- a/compose-notice
+++ b/compose-notice
@@ -48,4 +48,15 @@ needed to apply to the stable branch. If there were code changes for rebasing
correctly done.
+EOF
+
+if [ "$QUEUED_REPO" != "none" ]
+then
+ cat << EOF
+Queued patches can be viewed on a temporary branch at:
+ ${QUEUED_REPO}
+
+EOF
+fi
+ cat << EOF
Thanks.
@@ -69,5 +80,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 bf955cd..0c31689 100644
--- a/lib.sh
+++ b/lib.sh
@@ -6,4 +6,7 @@ GIT="git --git-dir=$DPDK_DIR/.git"
SIGNATURE="Kevin Traynor"
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
More information about the stable
mailing list