From: Thomas Monjalon <thomas@monjalon.net>
To: Christian Ehrhardt <christian.ehrhardt@canonical.com>,
bluca@debian.org, ktraynor@redhat.com
Cc: stable@dpdk.org, dev@dpdk.org, Xueming Li <xuemingl@nvidia.com>
Subject: Re: [dpdk-stable] [PATCH v3 2/2] devtools: fix patches missing if range newer than HEAD
Date: Sat, 26 Nov 2022 22:44:26 +0100 [thread overview]
Message-ID: <17952871.sWSEgdgrri@thomas> (raw)
In-Reply-To: <20210811112207.370348-2-xuemingl@nvidia.com>
Someone to help with review of this patch please?
Is there a real need?
11/08/2021 13:22, Xueming Li:
> Current fix scan scripts used HEAD branch as history reference.
> When users ran it in an earlier branch, few patches were scanned
> due to the fixes in the range are newer and not merged to current
> branch.
>
> This patch introduces optional <branch> argument, default to HEAD
> if not specified. Checks the <range> specified in parameter must
> being merged in <branch>.
>
> Fixes: 752d8e097ec1 ("scripts: show fixes with release version of bug")
> Cc: Thomas Monjalon <thomas@monjalon.net>
> Cc: stable@dpdk.org
> Cc: Christian Ehrhardt <christian.ehrhardt@canonical.com>
>
> Signed-off-by: Xueming Li <xuemingl@nvidia.com>
> ---
> devtools/git-log-fixes.sh | 26 +++++++++++++++++++-------
> 1 file changed, 19 insertions(+), 7 deletions(-)
>
> diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh
> index 153ba5b438..dbed4b6419 100755
> --- a/devtools/git-log-fixes.sh
> +++ b/devtools/git-log-fixes.sh
> @@ -4,7 +4,7 @@
>
> print_usage ()
> {
> - echo "usage: $(basename $0) [-h] <git_range>"
> + echo "usage: $(basename $0) [-h] <git_range> [<branch>]"
> }
>
> print_help ()
> @@ -15,6 +15,7 @@ print_help ()
> Find fixes to backport on previous versions.
> It looks for the word "fix" in the headline or a tag "Fixes" or "Reverts".
> The oldest bug origin is printed as well as partially fixed versions.
> + It looks into current branch or the branch specified.
> END_OF_HELP
> }
>
> @@ -33,14 +34,23 @@ while getopts h ARG ; do
> done
> shift $(($OPTIND - 1))
> [ $# -ge 1 ] || usage_error 'range argument required'
> -range="$*"
> +range="$1"
> +branch="$2"
> +
> +# default to current branch as history reference
> +[ -n "$branch" ] || branch="HEAD"
> +# get real brnach name
> +refbranch=$(git rev-parse --abbrev-ref $branch)
> +range_last=$(git rev-parse $range | head -n1)
> +if ! git branch -a --contains $range_last | grep -q -e " $refbranch$" -e " remotes/$refbranch$"; then
> + echo "range $range not included by branch $refbranch"
> + exit 1
> +fi
>
> # get major release version of a commit
> commit_version () # <hash>
> {
> local VER="v*.*"
> - # use current branch as history reference
> - local refbranch=$(git rev-parse --abbrev-ref HEAD)
> local tag=$( (git tag -l "$VER" --contains $1 --sort=creatordate --merged $refbranch 2>&- ||
> # tag --merged option has been introduced in git 2.7.0
> # below is a fallback in case of old git version
> @@ -49,9 +59,11 @@ commit_version () # <hash>
> sed "s,.\+,$t,"
> done) |
> head -n1)
> - if [ -z "$tag" ] ; then
> - # before -rc1 tag of release in progress
> - cat VERSION | cut -d'.' -f-2
> + if [ -z "$tag" ]; then
> + if [ "$branch" = 'HEAD' ]; then
> + # before -rc1 tag of release in progress
> + cat VERSION | cut -d'.' -f-2
> + fi
> else
> echo $tag | sed 's,^v,,' | sed 's,-rc.*,,'
> fi
>
prev parent reply other threads:[~2022-11-26 21:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-12 13:56 [dpdk-stable] [PATCH 1/2] devtools: fix version pattern for fix search Xueming Li
2021-06-12 13:56 ` [dpdk-stable] [PATCH 2/2] devtools: auto detect branch to search fix patches Xueming Li
2021-06-14 14:15 ` Christian Ehrhardt
2021-06-15 10:56 ` Xueming(Steven) Li
2021-06-30 6:46 ` Xueming(Steven) Li
2021-06-14 13:56 ` [dpdk-stable] [PATCH 1/2] devtools: fix version pattern for fix search Christian Ehrhardt
2021-06-16 4:03 ` [dpdk-stable] [PATCH v1 " Xueming Li
2021-06-30 6:34 ` [dpdk-stable] [PATCH v2 " Xueming Li
2021-06-30 6:34 ` [dpdk-stable] [PATCH v2 2/2] devtools: fix patches missing if range newer than HEAD Xueming Li
2021-08-08 11:24 ` Thomas Monjalon
2021-08-09 7:44 ` Xueming(Steven) Li
2021-08-08 11:14 ` [dpdk-stable] [PATCH v2 1/2] devtools: fix version pattern for fix search Thomas Monjalon
2021-08-09 3:32 ` Xueming(Steven) Li
2021-06-16 4:03 ` [dpdk-stable] [PATCH v1 2/2] devtools: auto detect branch to search fix patches Xueming Li
2021-08-11 11:22 ` [dpdk-stable] [PATCH v3 1/2] devtools: fix version pattern for fix search Xueming Li
2021-08-11 11:22 ` [dpdk-stable] [PATCH v3 2/2] devtools: fix patches missing if range newer than HEAD Xueming Li
2022-11-26 21:44 ` Thomas Monjalon [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=17952871.sWSEgdgrri@thomas \
--to=thomas@monjalon.net \
--cc=bluca@debian.org \
--cc=christian.ehrhardt@canonical.com \
--cc=dev@dpdk.org \
--cc=ktraynor@redhat.com \
--cc=stable@dpdk.org \
--cc=xuemingl@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).