Message ID | 20210630063416.9550-1-xuemingl@nvidia.com (mailing list archive) |
---|---|
State | Superseded, archived |
Delegated to: | Thomas Monjalon |
Headers |
Return-Path: <dev-bounces@dpdk.org> X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6BA96A0A0F; Wed, 30 Jun 2021 08:34:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E543940040; Wed, 30 Jun 2021 08:34:49 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2054.outbound.protection.outlook.com [40.107.220.54]) by mails.dpdk.org (Postfix) with ESMTP id 781354003C; Wed, 30 Jun 2021 08:34:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PY0z2J6NBZbR0YhN1NuA0BMytoToDuS9sbGvDNW9NVUrEzq949VcAMCc28g3S6GxSBtXO63zdgVFYFG2LPWNvUuIVxrTVeP1XGN1upUjgCtmJNl4vb4BjcvNJPwUBhzoCq2D0Fk8VxOX/oPtlujSKQ106EueFQEEeiyBt0tq6aCdEtPjBUIGnFWM+gzIdLgQ57y8WE3zBSu1W0+10OZuNrY7DkHVEuzdtXAkA3FfzcPRcRTM2mVxLEpkSt/z6/N1S8zE19KlAagLX/KgMtZ7AkAyGOkfptPxp6HtpgMlJxemmDcegAGgkFkTo+rYHkJQ+YWszVXfoPUn57nda1EAgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/Yn2MqWf9zZT//+YmqK9aEuCHy/9TFBKH8On2Akgoxg=; b=ZbbCW04zgE9l0w+7Zf6t2a+NaE8KuENbU5GWFrJCoiwqD53T0V2OqlvpZPaTZAW1z7rysB72NsvwFpSUowD9T0IpWrwS/xtDIG+C9UfNaKLR0NZCi1ZWu3lUMeCU9VqfJrZ51rrUNOH3Hri/xhHm+jc+zamMnuAEidvS7OCS2DJ7oe91SQv7jIRbV0Fy3YNWY763PqKIQzSEIXs42lUGMDmkWPTTVslJqiABY9KjKZp9wRBmPEMsVl/rSZx3ynrbzzYVSepmZAUc6N3k78lO5GAl9Gdss1lHfMhdgV34C7EtLBnl+zJBVYMtBYqPbgtVT39xjdVOheON6XHlkNS36g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=canonical.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/Yn2MqWf9zZT//+YmqK9aEuCHy/9TFBKH8On2Akgoxg=; b=Gd7HVM3veOfop/AFvdiP616UZXHD5iSx0sOH9YGxevZP1gIjrluRSgWB3P9Y/eEhCmdkOII1++ZZxVmIpnANWuuGo1QACf3NOHNYL9X+kvXoSV7q9GIrKa2+tCc625o7P1yoqCfj2gGaNAYOWoS7UyZEGEGmD0ttB63D2cqZhifP+3ywSu7y+4hHvGrndxHIne5xssWlJAAGfHXxs6LbYFC2s1IqTJQcy/IGii6i+rWOVEEtGb+S5b+HxKgxPY9MtP1PJtkLbDj2VY9JGlpfMgtP9jc+GrKSoI+WeaUhqoSYCZnPUl2hShdHSq8qQNiQvF6nNsDq9OKzMIG+rRJC6Q== Received: from MW4PR04CA0128.namprd04.prod.outlook.com (2603:10b6:303:84::13) by BN9PR12MB5384.namprd12.prod.outlook.com (2603:10b6:408:105::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18; Wed, 30 Jun 2021 06:34:46 +0000 Received: from CO1NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:303:84:cafe::a6) by MW4PR04CA0128.outlook.office365.com (2603:10b6:303:84::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.23 via Frontend Transport; Wed, 30 Jun 2021 06:34:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; canonical.com; dkim=none (message not signed) header.d=none;canonical.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT006.mail.protection.outlook.com (10.13.174.246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4287.22 via Frontend Transport; Wed, 30 Jun 2021 06:34:45 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 30 Jun 2021 06:34:43 +0000 From: Xueming Li <xuemingl@nvidia.com> To: <dev@dpdk.org> CC: Thomas Monjalon <thomas@monjalon.net>, <stable@dpdk.org>, Christian Ehrhardt <christian.ehrhardt@canonical.com>, Yuanhan Liu <yuanhan.liu@linux.intel.com> Date: Wed, 30 Jun 2021 14:34:14 +0800 Message-ID: <20210630063416.9550-1-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210616040324.311461-1-xuemingl@nvidia.com> References: <20210616040324.311461-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f100e1be-5592-4e2a-605f-08d93b9126f4 X-MS-TrafficTypeDiagnostic: BN9PR12MB5384: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: <BN9PR12MB53847CB4D22AB672937E1979A1019@BN9PR12MB5384.namprd12.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:370; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NSrxWFHa/xNpVs/oU8ROiCpUmulnkTzTkacjFCWYp67XtuBNEHtVsqE9rkpRDM5hQa83vF/AtEIQeA0lQJFCm1AI8EvSISwjTt1sF7Voyjg0IHFN8jnbpWUMMLioBxzd0rNtWYCGcFAsHHE+5tygZ/utPLuCMAnGyqjt7N0/kTCrw33SBWbnTxTp05FXxYj4zKd0lwEfvA5H+JPx4N/fKsQgLSuwcQjQa6oASEiu1Pc1e3ytfstFpcjccp5siaF0fHRiDoqhPbouYUxWL/kRE9GrZfg5uxCNnurbm7cxttCVR3F642x15qrGpzMigA4HJ53sJduXxW5tXj96EafB0Nh9XXuM19snVEByu5BeHBMP1PpR2GA5k0Be9sVrWZOe2Kdz5LinrrCyYNqqaOeBNrfbUl3DOrwdspYAJBU5c4syhmqcGMpV3BAHqi8Du3VH0UU4yHUjjcKFEscbUO/9gC9HoFsjLfq7QY7HLHfrnghzcdOzwidrcauAcqoAgygHJeNEc8qXMf/aqlZlwAFE5A5MpHKKCj0ducusZ+aAJancvQhctCrLmu+s+Jg0AlSFRXbBA5d2Cx/YvL6/nJPKH118H8Fwil3IH6p0KnNxK0JTY2LdN1ZO0TGIrKcqSPnfmce27a/Rs+UDpypnHz4IENyivk4ydttWTPp9S5UDVs1jHaPq0SKOzgT92Yma0U1MexvXu/GNqzKVj//SDBTRpA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(396003)(376002)(346002)(39860400002)(36840700001)(46966006)(6916009)(478600001)(426003)(5660300002)(336012)(36860700001)(70586007)(6286002)(70206006)(47076005)(8936002)(2616005)(8676002)(6666004)(82740400003)(55016002)(1076003)(86362001)(4326008)(186003)(316002)(54906003)(83380400001)(26005)(7696005)(82310400003)(36756003)(2906002)(16526019)(7636003)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2021 06:34:45.8362 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f100e1be-5592-4e2a-605f-08d93b9126f4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5384 Subject: [dpdk-dev] [PATCH v2 1/2] devtools: fix version pattern for fix search X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions <dev.dpdk.org> List-Unsubscribe: <https://mails.dpdk.org/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://mails.dpdk.org/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <https://mails.dpdk.org/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org> |
Series |
[v2,1/2] devtools: fix version pattern for fix search
|
|
Checks
Context | Check | Description |
---|---|---|
ci/checkpatch | success | coding style OK |
Commit Message
Xueming Li
June 30, 2021, 6:34 a.m. UTC
When scanning fixes from current(HEAD) branch, local tags were included and reported as version. For example: $ git tag --contains <commit_id> --merged 20.11_backport_202010506 // user tag v20.11 v20.11.1 This patch matches DPDK officail version pattern in search, selects the most early tag. Official tag pattern: "v<major>.<minor>" Fixes: 752d8e097ec1 ("scripts: show fixes with release version of bug") Cc: Thomas Monjalon <thomas@monjalon.net> Cc: stable@dpdk.org Signed-off-by: Xueming Li <xuemingl@nvidia.com> Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> --- devtools/git-log-fixes.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Comments
30/06/2021 08:34, Xueming Li: > When scanning fixes from current(HEAD) branch, local tags were included > and reported as version. For example: > $ git tag --contains <commit_id> --merged > 20.11_backport_202010506 // user tag > v20.11 > v20.11.1 > > This patch matches DPDK officail version pattern in search, selects > the most early tag. Official tag pattern: "v<major>.<minor>" > > Fixes: 752d8e097ec1 ("scripts: show fixes with release version of bug") > Cc: Thomas Monjalon <thomas@monjalon.net> > Cc: stable@dpdk.org > > Signed-off-by: Xueming Li <xuemingl@nvidia.com> > Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> > --- > devtools/git-log-fixes.sh | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh > index 210c8dcf25..153ba5b438 100755 > --- a/devtools/git-log-fixes.sh > +++ b/devtools/git-log-fixes.sh > @@ -38,12 +38,13 @@ range="$*" > # get major release version of a commit > commit_version () # <hash> > { > + local VER="v*.*" Which tag is it supposed to match? What would not be matched? What about something like v19.11.8 ? What about the above example 20.11_backport_202010506? > # use current branch as history reference > local refbranch=$(git rev-parse --abbrev-ref HEAD) > - local tag=$( (git tag -l --contains $1 --merged $refbranch 2>&- || > + local tag=$( (git tag -l "$VER" --contains $1 --sort=creatordate --merged $refbranch 2>&- || Why adding "--sort=creatordate" ? It is not mentioned in the commit log. > # tag --merged option has been introduced in git 2.7.0 > # below is a fallback in case of old git version > - for t in $(git tag -l --contains $1) ; do > + for t in $(git tag -l "$VER" --contains $1) ; do > git branch $refbranch --contains $t | > sed "s,.\+,$t," > done) |
Hi, > -----Original Message----- > From: Thomas Monjalon <thomas@monjalon.net> > Sent: Sunday, August 8, 2021 7:15 PM > To: Xueming(Steven) Li <xuemingl@nvidia.com> > Cc: dev@dpdk.org; stable@dpdk.org; Christian Ehrhardt <christian.ehrhardt@canonical.com>; david.marchand@redhat.com; Luca > Boccassi <bluca@debian.org> > Subject: Re: [dpdk-stable] [PATCH v2 1/2] devtools: fix version pattern for fix search > > 30/06/2021 08:34, Xueming Li: > > When scanning fixes from current(HEAD) branch, local tags were > > included and reported as version. For example: > > $ git tag --contains <commit_id> --merged > > 20.11_backport_202010506 // user tag > > v20.11 > > v20.11.1 > > > > This patch matches DPDK officail version pattern in search, selects > > the most early tag. Official tag pattern: "v<major>.<minor>" > > > > Fixes: 752d8e097ec1 ("scripts: show fixes with release version of > > bug") > > Cc: Thomas Monjalon <thomas@monjalon.net> > > Cc: stable@dpdk.org > > > > Signed-off-by: Xueming Li <xuemingl@nvidia.com> > > Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> > > --- > > devtools/git-log-fixes.sh | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh > > index 210c8dcf25..153ba5b438 100755 > > --- a/devtools/git-log-fixes.sh > > +++ b/devtools/git-log-fixes.sh > > @@ -38,12 +38,13 @@ range="$*" > > # get major release version of a commit commit_version () # <hash> > > { > > + local VER="v*.*" > > Which tag is it supposed to match? What would not be matched? > What about something like v19.11.8 ? > What about the above example 20.11_backport_202010506? It matches any tag version like started with "v" and a "." in the middle. So v19.11.8 matches as at least one "." in the middle. 20.11_backport_202010506 can't match since it not started with "v" > > > # use current branch as history reference > > local refbranch=$(git rev-parse --abbrev-ref HEAD) > > - local tag=$( (git tag -l --contains $1 --merged $refbranch 2>&- || > > + local tag=$( (git tag -l "$VER" --contains $1 --sort=creatordate --merged $refbranch 2>&- || > > Why adding "--sort=creatordate" ? > It is not mentioned in the commit log. Mentioned a little bit: "select the most early tag" By default git output tag in alpha order, this makes v19.11 appears earlier than v2.x, that's wrong. > > > # tag --merged option has been introduced in git 2.7.0 > > # below is a fallback in case of old git version > > - for t in $(git tag -l --contains $1) ; do > > + for t in $(git tag -l "$VER" --contains $1) ; do > > git branch $refbranch --contains $t | > > sed "s,.\+,$t," > > done) | > > > > >
diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index 210c8dcf25..153ba5b438 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -38,12 +38,13 @@ range="$*" # 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 --contains $1 --merged $refbranch 2>&- || + 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 - for t in $(git tag -l --contains $1) ; do + for t in $(git tag -l "$VER" --contains $1) ; do git branch $refbranch --contains $t | sed "s,.\+,$t," done) |