From lujaniuk at openjdk.org  Wed Aug  2 11:43:15 2023
From: lujaniuk at openjdk.org (Ludvig Janiuk)
Date: Wed, 2 Aug 2023 11:43:15 GMT
Subject: RFR: 1983 Handle multiple include paths
Message-ID: <qn3G2R_M3uXTm6vqqF_2xJySt4AHsLOMt-RZ_d9xlgQ=.0f2bd0d2-dceb-4b34-8465-0e3a6761d6d8@github.com>

Add the --get-all flag to handle the case where a user has multiple values for include.path

-------------

Commit messages:
 - 1983 Handle multiple include paths

Changes: https://git.openjdk.org/skara/pull/1540/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1540&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1983
  Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/skara/pull/1540.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1540/head:pull/1540

PR: https://git.openjdk.org/skara/pull/1540

From zsong at openjdk.org  Wed Aug  2 16:58:33 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 2 Aug 2023 16:58:33 GMT
Subject: RFR: 1983 Handle multiple include paths
In-Reply-To: <qn3G2R_M3uXTm6vqqF_2xJySt4AHsLOMt-RZ_d9xlgQ=.0f2bd0d2-dceb-4b34-8465-0e3a6761d6d8@github.com>
References: <qn3G2R_M3uXTm6vqqF_2xJySt4AHsLOMt-RZ_d9xlgQ=.0f2bd0d2-dceb-4b34-8465-0e3a6761d6d8@github.com>
Message-ID: <M7q4PChlDGGGVHb23tfyARK-olE3c0hCvVKigZZHyiI=.24b5ff5f-6bd2-470a-a488-2a85d3f41184@github.com>

On Wed, 2 Aug 2023 11:39:22 GMT, Ludvig Janiuk <lujaniuk at openjdk.org> wrote:

> Add the --get-all flag to handle the case where a user has multiple values for include.path

Marked as reviewed by zsong (Reviewer).

-------------

PR Review: https://git.openjdk.org/skara/pull/1540#pullrequestreview-1559468123

From zsong at openjdk.org  Wed Aug  2 21:55:21 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 2 Aug 2023 21:55:21 GMT
Subject: RFR: 1984: SKARA bot couldn't handle jep command if the jep doesn't
 have JEP Number
Message-ID: <H7kxn3n10_wG26OOcRuzkmYMspXhuecUMOcBSo2OYpc=.5a44fd7c-64b9-4f28-800f-ec535c2ffd86@github.com>

A user issued command /jep JDK-8310626 in https://github.com/openjdk/jdk/pull/15103 and skara bot kept throwing exceptions because the JEP doesn't have a JEP number. 

@kevinrushforth suggested that it makes more sense to make skara bot be able to associate a PR with a JEP before it is a Candidate.

-------------

Commit messages:
 - SKARA-1984

Changes: https://git.openjdk.org/skara/pull/1541/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1541&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1984
  Stats: 63 lines in 3 files changed: 57 ins; 0 del; 6 mod
  Patch: https://git.openjdk.org/skara/pull/1541.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1541/head:pull/1541

PR: https://git.openjdk.org/skara/pull/1541

From kcr at openjdk.org  Wed Aug  2 22:01:07 2023
From: kcr at openjdk.org (Kevin Rushforth)
Date: Wed, 2 Aug 2023 22:01:07 GMT
Subject: RFR: 1984: SKARA bot couldn't handle jep command if the jep
 doesn't have JEP Number
In-Reply-To: <H7kxn3n10_wG26OOcRuzkmYMspXhuecUMOcBSo2OYpc=.5a44fd7c-64b9-4f28-800f-ec535c2ffd86@github.com>
References: <H7kxn3n10_wG26OOcRuzkmYMspXhuecUMOcBSo2OYpc=.5a44fd7c-64b9-4f28-800f-ec535c2ffd86@github.com>
Message-ID: <KaQB-vXqN9A0K3wlGYEEeajSA9MN0mH216bHBRPtA6w=.4bb15b4f-8376-4fab-9da5-ae0e31fee5e0@github.com>

On Wed, 2 Aug 2023 21:27:13 GMT, Zhao Song <zsong at openjdk.org> wrote:

> A user issued command /jep JDK-8310626 in https://github.com/openjdk/jdk/pull/15103 and skara bot kept throwing exceptions because the JEP doesn't have a JEP number. 
> 
> @kevinrushforth suggested that it makes more sense to make skara bot be able to associate a PR with a JEP before it is a Candidate.

Looks good. I left one minor comment about the message string, but I approved it anyway.

bots/pr/src/main/java/org/openjdk/skara/bots/pr/JEPCommand.java line 147:

> 145:             // The current issue status may be "Draft", "Submitted", "Candidate", "Proposed to Target", "Proposed to Drop" or "Closed without Delivered"
> 146:             if (jepNumber.equals("NotAllocated")) {
> 147:                 reply.println("This pull request will not be integrated until the [" + jbsIssue.id()

Minor: I would add the word "JEP" before the `jbsIssue.id()` here.

-------------

Marked as reviewed by kcr (Reviewer).

PR Review: https://git.openjdk.org/skara/pull/1541#pullrequestreview-1559898509
PR Review Comment: https://git.openjdk.org/skara/pull/1541#discussion_r1282456083

From zsong at openjdk.org  Wed Aug  2 22:01:07 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 2 Aug 2023 22:01:07 GMT
Subject: RFR: 1984: SKARA bot couldn't handle jep command if the jep
 doesn't have JEP Number
In-Reply-To: <KaQB-vXqN9A0K3wlGYEEeajSA9MN0mH216bHBRPtA6w=.4bb15b4f-8376-4fab-9da5-ae0e31fee5e0@github.com>
References: <H7kxn3n10_wG26OOcRuzkmYMspXhuecUMOcBSo2OYpc=.5a44fd7c-64b9-4f28-800f-ec535c2ffd86@github.com>
 <KaQB-vXqN9A0K3wlGYEEeajSA9MN0mH216bHBRPtA6w=.4bb15b4f-8376-4fab-9da5-ae0e31fee5e0@github.com>
Message-ID: <wKDjRxBBoZA6FxTcVgMttPTn5myxLH-hFmJdxtT5xok=.b74fb9bb-6abb-4ad4-8168-4b09575a699d@github.com>

On Wed, 2 Aug 2023 21:55:31 GMT, Kevin Rushforth <kcr at openjdk.org> wrote:

>> A user issued command /jep JDK-8310626 in https://github.com/openjdk/jdk/pull/15103 and skara bot kept throwing exceptions because the JEP doesn't have a JEP number. 
>> 
>> @kevinrushforth suggested that it makes more sense to make skara bot be able to associate a PR with a JEP before it is a Candidate.
>
> bots/pr/src/main/java/org/openjdk/skara/bots/pr/JEPCommand.java line 147:
> 
>> 145:             // The current issue status may be "Draft", "Submitted", "Candidate", "Proposed to Target", "Proposed to Drop" or "Closed without Delivered"
>> 146:             if (jepNumber.equals("NotAllocated")) {
>> 147:                 reply.println("This pull request will not be integrated until the [" + jbsIssue.id()
> 
> Minor: I would add the word "JEP" before the `jbsIssue.id()` here.

Do you mean  [JEP JDK-8310626][url] or JEP [JDK-8310626][url]?

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1541#discussion_r1282458074

From zsong at openjdk.org  Wed Aug  2 22:19:05 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 2 Aug 2023 22:19:05 GMT
Subject: RFR: 1984: SKARA bot couldn't handle jep command if the jep
 doesn't have JEP Number [v2]
In-Reply-To: <H7kxn3n10_wG26OOcRuzkmYMspXhuecUMOcBSo2OYpc=.5a44fd7c-64b9-4f28-800f-ec535c2ffd86@github.com>
References: <H7kxn3n10_wG26OOcRuzkmYMspXhuecUMOcBSo2OYpc=.5a44fd7c-64b9-4f28-800f-ec535c2ffd86@github.com>
Message-ID: <w8-yGHVDubEFbtdPPu1oGjq6KVljmGqRrF1gz6h5884=.70c562f1-ca83-4638-ba46-92510ac00b1d@github.com>

> A user issued command /jep JDK-8310626 in https://github.com/openjdk/jdk/pull/15103 and skara bot kept throwing exceptions because the JEP doesn't have a JEP number. 
> 
> @kevinrushforth suggested that it makes more sense to make skara bot be able to associate a PR with a JEP before it is a Candidate.

Zhao Song has updated the pull request incrementally with one additional commit since the last revision:

  update

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1541/files
  - new: https://git.openjdk.org/skara/pull/1541/files/d9e1ccbd..2d73a3d7

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1541&range=01
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1541&range=00-01

  Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/skara/pull/1541.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1541/head:pull/1541

PR: https://git.openjdk.org/skara/pull/1541

From zsong at openjdk.org  Wed Aug  2 22:34:59 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 2 Aug 2023 22:34:59 GMT
Subject: Integrated: 1984: SKARA bot couldn't handle jep command if the jep
 doesn't have JEP Number
In-Reply-To: <H7kxn3n10_wG26OOcRuzkmYMspXhuecUMOcBSo2OYpc=.5a44fd7c-64b9-4f28-800f-ec535c2ffd86@github.com>
References: <H7kxn3n10_wG26OOcRuzkmYMspXhuecUMOcBSo2OYpc=.5a44fd7c-64b9-4f28-800f-ec535c2ffd86@github.com>
Message-ID: <_RaWziBdbO1IInoznlbv5KtNYep7WA92Usn8LAf3RWE=.4007aefb-0df3-4f9f-b5fb-6d4881b5d66f@github.com>

On Wed, 2 Aug 2023 21:27:13 GMT, Zhao Song <zsong at openjdk.org> wrote:

> A user issued command /jep JDK-8310626 in https://github.com/openjdk/jdk/pull/15103 and skara bot kept throwing exceptions because the JEP doesn't have a JEP number. 
> 
> @kevinrushforth suggested that it makes more sense to make skara bot be able to associate a PR with a JEP before it is a Candidate.

This pull request has now been integrated.

Changeset: 57610580
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/576105808ccf1b000906a026d0a1148121db02b4
Stats:     63 lines in 3 files changed: 57 ins; 0 del; 6 mod

1984: SKARA bot couldn't handle jep command if the jep doesn't have JEP Number

Reviewed-by: kcr

-------------

PR: https://git.openjdk.org/skara/pull/1541

From zsong at openjdk.org  Wed Aug  2 22:34:58 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 2 Aug 2023 22:34:58 GMT
Subject: RFR: 1984: SKARA bot couldn't handle jep command if the jep
 doesn't have JEP Number [v2]
In-Reply-To: <w8-yGHVDubEFbtdPPu1oGjq6KVljmGqRrF1gz6h5884=.70c562f1-ca83-4638-ba46-92510ac00b1d@github.com>
References: <H7kxn3n10_wG26OOcRuzkmYMspXhuecUMOcBSo2OYpc=.5a44fd7c-64b9-4f28-800f-ec535c2ffd86@github.com>
 <w8-yGHVDubEFbtdPPu1oGjq6KVljmGqRrF1gz6h5884=.70c562f1-ca83-4638-ba46-92510ac00b1d@github.com>
Message-ID: <anIvsZOR0e0bcgjcCFXeD7vdfNMqmP9GmOShcVuQk5I=.b9f7527b-117b-4970-886a-db920862322a@github.com>

On Wed, 2 Aug 2023 22:19:05 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> A user issued command /jep JDK-8310626 in https://github.com/openjdk/jdk/pull/15103 and skara bot kept throwing exceptions because the JEP doesn't have a JEP number. 
>> 
>> @kevinrushforth suggested that it makes more sense to make skara bot be able to associate a PR with a JEP before it is a Candidate.
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   update

Thanks for the review!

-------------

PR Comment: https://git.openjdk.org/skara/pull/1541#issuecomment-1663056708

From zsong at openjdk.org  Wed Aug  2 23:50:51 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 2 Aug 2023 23:50:51 GMT
Subject: RFR: 1985: Format error of Issues in pull Request body
Message-ID: <SerVhANYvQK3HuZ3n_YDUfRxq8EB1xFWgfukikULIbE=.528c6a98-7ffe-40fa-bc64-623b0df18136@github.com>

Format error of Issues in Pull Request body, we need to add some line breaks.

-------------

Commit messages:
 - SKARA-1985

Changes: https://git.openjdk.org/skara/pull/1542/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1542&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1985
  Stats: 2 lines in 1 file changed: 2 ins; 0 del; 0 mod
  Patch: https://git.openjdk.org/skara/pull/1542.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1542/head:pull/1542

PR: https://git.openjdk.org/skara/pull/1542

From kcr at openjdk.org  Thu Aug  3 00:28:00 2023
From: kcr at openjdk.org (Kevin Rushforth)
Date: Thu, 3 Aug 2023 00:28:00 GMT
Subject: RFR: 1985: Format error of Issues in pull Request body
In-Reply-To: <SerVhANYvQK3HuZ3n_YDUfRxq8EB1xFWgfukikULIbE=.528c6a98-7ffe-40fa-bc64-623b0df18136@github.com>
References: <SerVhANYvQK3HuZ3n_YDUfRxq8EB1xFWgfukikULIbE=.528c6a98-7ffe-40fa-bc64-623b0df18136@github.com>
Message-ID: <DGJaRIvjJtBuL0vUjjA3bIqoa1CrLsAwHNA2O2yUWcE=.bc559444-1a85-4dbd-9f68-3a87922cdd82@github.com>

On Wed, 2 Aug 2023 23:44:42 GMT, Zhao Song <zsong at openjdk.org> wrote:

> Format error of Issues in Pull Request body, we need to add some line breaks.

Marked as reviewed by kcr (Reviewer).

-------------

PR Review: https://git.openjdk.org/skara/pull/1542#pullrequestreview-1559998659

From zsong at openjdk.org  Thu Aug  3 00:28:00 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 3 Aug 2023 00:28:00 GMT
Subject: Integrated: 1985: Format error of Issues in pull Request body
In-Reply-To: <SerVhANYvQK3HuZ3n_YDUfRxq8EB1xFWgfukikULIbE=.528c6a98-7ffe-40fa-bc64-623b0df18136@github.com>
References: <SerVhANYvQK3HuZ3n_YDUfRxq8EB1xFWgfukikULIbE=.528c6a98-7ffe-40fa-bc64-623b0df18136@github.com>
Message-ID: <U8xfYu0qB2YapfVfWfQ_Gf-HliKQTiZqhn05kwkJL84=.36cce8b0-fa5b-4ad0-8f0f-4f6a8ed205c5@github.com>

On Wed, 2 Aug 2023 23:44:42 GMT, Zhao Song <zsong at openjdk.org> wrote:

> Format error of Issues in Pull Request body, we need to add some line breaks.

This pull request has now been integrated.

Changeset: bc424dbc
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/bc424dbcd455b0d9eaa3c3bc2ebd7f552851a986
Stats:     2 lines in 1 file changed: 2 ins; 0 del; 0 mod

1985: Format error of Issues in pull Request body

Reviewed-by: kcr

-------------

PR: https://git.openjdk.org/skara/pull/1542

From lujaniuk at openjdk.org  Thu Aug  3 15:30:12 2023
From: lujaniuk at openjdk.org (Ludvig Janiuk)
Date: Thu, 3 Aug 2023 15:30:12 GMT
Subject: Integrated: 1983 Handle multiple include paths
In-Reply-To: <qn3G2R_M3uXTm6vqqF_2xJySt4AHsLOMt-RZ_d9xlgQ=.0f2bd0d2-dceb-4b34-8465-0e3a6761d6d8@github.com>
References: <qn3G2R_M3uXTm6vqqF_2xJySt4AHsLOMt-RZ_d9xlgQ=.0f2bd0d2-dceb-4b34-8465-0e3a6761d6d8@github.com>
Message-ID: <GbtHAFiftlMXjOI-iNwajZw4EOL2C3c4DZkghTdzh0M=.ad0f61c1-4151-48f2-b8a6-ffb7c59e32ca@github.com>

On Wed, 2 Aug 2023 11:39:22 GMT, Ludvig Janiuk <lujaniuk at openjdk.org> wrote:

> Add the --get-all flag to handle the case where a user has multiple values for include.path

This pull request has now been integrated.

Changeset: 9a5ed24b
Author:    Ludvig Janiuk <lujaniuk at openjdk.org>
Committer: Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/9a5ed24b9459ad3086497c8cdd88bb8e4c9f19c2
Stats:     1 line in 1 file changed: 0 ins; 0 del; 1 mod

1983: Handle multiple include paths

Reviewed-by: zsong

-------------

PR: https://git.openjdk.org/skara/pull/1540

From zsong at openjdk.org  Tue Aug  8 21:37:38 2023
From: zsong at openjdk.org (Zhao Song)
Date: Tue, 8 Aug 2023 21:37:38 GMT
Subject: RFR: 1981: Skara sometimes puts two copies of "BUGID: TITLE" in commit
 message
Message-ID: <pzEi56mB5r08hXx_7Qruu2Ke55d7BKYPZmnm9R8ZF6g=.c7ca1b53-8c7e-4903-9b0b-7fd00fdcfffd@github.com>

As Kevin said in the issue, skara bot sometimes puts two copies of "BUGID: TITLE" in commit message.

To solve this issue, in this patch, when skara bots adding additional issues, it will ignore the title issue.

-------------

Commit messages:
 - SKARA-1981

Changes: https://git.openjdk.org/skara/pull/1538/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1538&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1981
  Stats: 12 lines in 5 files changed: 5 ins; 3 del; 4 mod
  Patch: https://git.openjdk.org/skara/pull/1538.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1538/head:pull/1538

PR: https://git.openjdk.org/skara/pull/1538

From erikj at openjdk.org  Wed Aug  9 12:36:44 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Wed, 9 Aug 2023 12:36:44 GMT
Subject: RFR: 1981: Skara sometimes puts two copies of "BUGID: TITLE" in
 commit message
In-Reply-To: <pzEi56mB5r08hXx_7Qruu2Ke55d7BKYPZmnm9R8ZF6g=.c7ca1b53-8c7e-4903-9b0b-7fd00fdcfffd@github.com>
References: <pzEi56mB5r08hXx_7Qruu2Ke55d7BKYPZmnm9R8ZF6g=.c7ca1b53-8c7e-4903-9b0b-7fd00fdcfffd@github.com>
Message-ID: <z5_UfgGddM_NC_zcytBGgN3_-i8GWtlBR0j8HPoBDVE=.9e08f995-9af9-4066-a009-1fae6e06b035@github.com>

On Tue, 1 Aug 2023 19:54:58 GMT, Zhao Song <zsong at openjdk.org> wrote:

> As Kevin said in the issue, skara bot sometimes puts two copies of "BUGID: TITLE" in commit message.
> 
> To solve this issue, in this patch, when skara bots adding additional issues, it will ignore the title issue.

Marked as reviewed by erikj (Lead).

-------------

PR Review: https://git.openjdk.org/skara/pull/1538#pullrequestreview-1569448833

From zsong at openjdk.org  Wed Aug  9 16:48:40 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 9 Aug 2023 16:48:40 GMT
Subject: RFR: 1981: Skara sometimes puts two copies of "BUGID: TITLE" in
 commit message
In-Reply-To: <pzEi56mB5r08hXx_7Qruu2Ke55d7BKYPZmnm9R8ZF6g=.c7ca1b53-8c7e-4903-9b0b-7fd00fdcfffd@github.com>
References: <pzEi56mB5r08hXx_7Qruu2Ke55d7BKYPZmnm9R8ZF6g=.c7ca1b53-8c7e-4903-9b0b-7fd00fdcfffd@github.com>
Message-ID: <FaDwKMrPfNimubiqdAKkpkmA2LcUdXi1D3SX9330Zvw=.784ed7df-49c2-4f89-bbdd-e4308ab0ea22@github.com>

On Tue, 1 Aug 2023 19:54:58 GMT, Zhao Song <zsong at openjdk.org> wrote:

> As Kevin said in the issue, skara bot sometimes puts two copies of "BUGID: TITLE" in commit message.
> 
> To solve this issue, in this patch, when skara bots adding additional issues, it will ignore the title issue.

Thanks for the review!

-------------

PR Comment: https://git.openjdk.org/skara/pull/1538#issuecomment-1671783908

From zsong at openjdk.org  Wed Aug  9 16:48:40 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 9 Aug 2023 16:48:40 GMT
Subject: Integrated: 1981: Skara sometimes puts two copies of "BUGID: TITLE" in
 commit message
In-Reply-To: <pzEi56mB5r08hXx_7Qruu2Ke55d7BKYPZmnm9R8ZF6g=.c7ca1b53-8c7e-4903-9b0b-7fd00fdcfffd@github.com>
References: <pzEi56mB5r08hXx_7Qruu2Ke55d7BKYPZmnm9R8ZF6g=.c7ca1b53-8c7e-4903-9b0b-7fd00fdcfffd@github.com>
Message-ID: <rRVhcYLPVSMnuFirnTT380kLVKa24JyWjnwUkclGl5s=.6241c460-b47a-4ff5-8e33-c9a8305fe426@github.com>

On Tue, 1 Aug 2023 19:54:58 GMT, Zhao Song <zsong at openjdk.org> wrote:

> As Kevin said in the issue, skara bot sometimes puts two copies of "BUGID: TITLE" in commit message.
> 
> To solve this issue, in this patch, when skara bots adding additional issues, it will ignore the title issue.

This pull request has now been integrated.

Changeset: be28b1ca
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/be28b1cab2024cacaaef7dd9a9c698b456ffd05a
Stats:     12 lines in 5 files changed: 5 ins; 3 del; 4 mod

1981: Skara sometimes puts two copies of "BUGID: TITLE" in commit message

Reviewed-by: erikj

-------------

PR: https://git.openjdk.org/skara/pull/1538

From zsong at openjdk.org  Wed Aug  9 17:13:44 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 9 Aug 2023 17:13:44 GMT
Subject: RFR: 1979: MailingListNotifier will not send an email notification
 when the first branch of some repos is created
Message-ID: <Iy8W6xdbDUrD4P9dzCxiXiRQ7yS8aryTE9M5xymJU8s=.773566a5-d2b0-4003-804f-96f168c2702e@github.com>

A Leyden committer created a new branch (pregenerate-lambdas) and pushed to it, but skara bot didn't sent email notification to [leyden-dev at openjdk.org](mailto:leyden-dev at openjdk.org). 

After investigating, I found the reason is that in the configuration of NotifyBot, we configured branches as '!master'. Due to this configuration, 'master' branch would be ignored in knownRefs. Therefore, in method RepositoryWorkItem#handleNewRef, The NotifyBot would not be able to find a candidate and it will return immediately.

In this patch, defaultBranch would always be included in the candidate refs.

-------------

Commit messages:
 - SKARA-1979
 - SKARA-1979

Changes: https://git.openjdk.org/skara/pull/1539/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1539&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1979
  Stats: 17 lines in 1 file changed: 8 ins; 0 del; 9 mod
  Patch: https://git.openjdk.org/skara/pull/1539.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1539/head:pull/1539

PR: https://git.openjdk.org/skara/pull/1539

From erikj at openjdk.org  Wed Aug  9 18:47:54 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Wed, 9 Aug 2023 18:47:54 GMT
Subject: RFR: 1979: MailingListNotifier will not send an email notification
 when the first branch of some repos is created
In-Reply-To: <Iy8W6xdbDUrD4P9dzCxiXiRQ7yS8aryTE9M5xymJU8s=.773566a5-d2b0-4003-804f-96f168c2702e@github.com>
References: <Iy8W6xdbDUrD4P9dzCxiXiRQ7yS8aryTE9M5xymJU8s=.773566a5-d2b0-4003-804f-96f168c2702e@github.com>
Message-ID: <BIq8gqjhvait_MyhcGdh5H9eL2HdaHAne9ORodzOzgQ=.b5ee35ed-b8ca-47aa-8d7c-a0045caca4cf@github.com>

On Tue, 1 Aug 2023 21:10:11 GMT, Zhao Song <zsong at openjdk.org> wrote:

> A Leyden committer created a new branch (pregenerate-lambdas) and pushed to it, but skara bot didn't sent email notification to [leyden-dev at openjdk.org](mailto:leyden-dev at openjdk.org). 
> 
> After investigating, I found the reason is that in the configuration of NotifyBot, we configured branches as '!master'. Due to this configuration, 'master' branch would be ignored in knownRefs. Therefore, in method RepositoryWorkItem#handleNewRef, The NotifyBot would not be able to find a candidate and it will return immediately.
> 
> In this patch, defaultBranch would always be included in the candidate refs.

This is a nice catch. Looks good!

-------------

Marked as reviewed by erikj (Lead).

PR Review: https://git.openjdk.org/skara/pull/1539#pullrequestreview-1570327312

From zsong at openjdk.org  Wed Aug  9 20:05:55 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 9 Aug 2023 20:05:55 GMT
Subject: RFR: 1979: MailingListNotifier will not send an email notification
 when the first branch of some repos is created
In-Reply-To: <Iy8W6xdbDUrD4P9dzCxiXiRQ7yS8aryTE9M5xymJU8s=.773566a5-d2b0-4003-804f-96f168c2702e@github.com>
References: <Iy8W6xdbDUrD4P9dzCxiXiRQ7yS8aryTE9M5xymJU8s=.773566a5-d2b0-4003-804f-96f168c2702e@github.com>
Message-ID: <6slf_4Cpc59tsveHMh2DzNgUKVqcYFw262UIk5iwfa0=.176a806f-86ec-496f-baa4-3b9360e13e10@github.com>

On Tue, 1 Aug 2023 21:10:11 GMT, Zhao Song <zsong at openjdk.org> wrote:

> A Leyden committer created a new branch (pregenerate-lambdas) and pushed to it, but skara bot didn't sent email notification to [leyden-dev at openjdk.org](mailto:leyden-dev at openjdk.org). 
> 
> After investigating, I found the reason is that in the configuration of NotifyBot, we configured branches as '!master'. Due to this configuration, 'master' branch would be ignored in knownRefs. Therefore, in method RepositoryWorkItem#handleNewRef, The NotifyBot would not be able to find a candidate and it will return immediately.
> 
> In this patch, defaultBranch would always be included in the candidate refs.

Thanks for the review!

-------------

PR Comment: https://git.openjdk.org/skara/pull/1539#issuecomment-1672068445

From zsong at openjdk.org  Wed Aug  9 20:05:55 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 9 Aug 2023 20:05:55 GMT
Subject: Integrated: 1979: MailingListNotifier will not send an email
 notification when the first branch of some repos is created
In-Reply-To: <Iy8W6xdbDUrD4P9dzCxiXiRQ7yS8aryTE9M5xymJU8s=.773566a5-d2b0-4003-804f-96f168c2702e@github.com>
References: <Iy8W6xdbDUrD4P9dzCxiXiRQ7yS8aryTE9M5xymJU8s=.773566a5-d2b0-4003-804f-96f168c2702e@github.com>
Message-ID: <i34eSp_gYV8rpULgW28hhQ3nH7GSYImuYrYmc5iUUpI=.73665c7f-4689-47b5-a7c3-19b175736f75@github.com>

On Tue, 1 Aug 2023 21:10:11 GMT, Zhao Song <zsong at openjdk.org> wrote:

> A Leyden committer created a new branch (pregenerate-lambdas) and pushed to it, but skara bot didn't sent email notification to [leyden-dev at openjdk.org](mailto:leyden-dev at openjdk.org). 
> 
> After investigating, I found the reason is that in the configuration of NotifyBot, we configured branches as '!master'. Due to this configuration, 'master' branch would be ignored in knownRefs. Therefore, in method RepositoryWorkItem#handleNewRef, The NotifyBot would not be able to find a candidate and it will return immediately.
> 
> In this patch, defaultBranch would always be included in the candidate refs.

This pull request has now been integrated.

Changeset: ae584a67
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/ae584a67b854aa4ff35edff352d826ef73e821fc
Stats:     17 lines in 1 file changed: 8 ins; 0 del; 9 mod

1979: MailingListNotifier will not send an email notification when the first branch of some repos is created

Reviewed-by: erikj

-------------

PR: https://git.openjdk.org/skara/pull/1539

From erikj at openjdk.org  Wed Aug  9 20:39:09 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Wed, 9 Aug 2023 20:39:09 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects
In-Reply-To: <0zbdMxgfJd5QFcQhSq_YYYIMqhgXdmlDhId15Dv6paI=.968f35a7-8ed5-48ec-a884-7ac7f5beaa6e@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
 <1AioH3sPuTPZ78kj1S5IvNIlw_TouAG3knl8qEqgono=.46cc3394-9555-41d3-ab9c-eda10504e401@github.com>
 <SIUt1YtYJby5KFfm5CllaBm9pdkpjDLSOYY6guIpD7I=.40eb8fbe-f195-4607-ad1a-928228f785c1@github.com>
 <-4m8oumK55DajuDbPhFIz1I9n2P-K6elV6VoY6xVTlM=.470ebe58-9127-44c4-8900-ca7daf9acf90@github.com>
 <A6OWhy3zpLNxTjbm3YoB9z1mVrTtS5gfi-cAi0oIt_8=.cb9ea7e2-c2fc-4f4b-8a17-cfaa0c6535b3@github.com>
 <0zbdMxgfJd5QFcQhSq_YYYIMqhgXdmlDhId15Dv6paI=.968f35a7-8ed5-48ec-a884-7ac7f5beaa6e@github.com>
Message-ID: <JhpEYBclSj1wMM_RThkoXzl0PL2-2hWAkNvYHVzpvNE=.df509170-f0e3-4afb-bdcb-eecc99377e0e@github.com>

On Fri, 30 Jun 2023 17:58:57 GMT, Zhao Song <zsong at openjdk.org> wrote:

> And now I am thinking why we only post `approvalNeededComment` when a PR is ready with everything but approval? What about posting `approvalNeededComment` when approval is missing? In this way, user could see the instructions earlier and they would have the time to apply for approval.

I think we should refrain from posting it early because the formal approval process shouldn't start until the PR is reviewed. Posting the comment early might encourage users to post approval requests early, which will annoy the maintainers.

-------------

PR Comment: https://git.openjdk.org/skara/pull/1537#issuecomment-1672112905

From erikj at openjdk.org  Wed Aug  9 21:16:12 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Wed, 9 Aug 2023 21:16:12 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v4]
In-Reply-To: <INM4nX67E5AFF51haTjtCg4rQyhaMpnisaPN0cjqIMs=.5f0c75ea-65d7-4033-862a-f75dbc0ded17@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
 <INM4nX67E5AFF51haTjtCg4rQyhaMpnisaPN0cjqIMs=.5f0c75ea-65d7-4033-862a-f75dbc0ded17@github.com>
Message-ID: <NUmwhUM90DfzYD2Ulegwwut4bfDU4Db08sBCjU8hxWs=.96bbf30f-b531-4adc-ba17-bdc8450e529f@github.com>

On Wed, 5 Jul 2023 17:49:14 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> As Erik said in the description of this issue, currently, this issue only cares about tracking approval labels in the related bugs.
>> 
>> If a repository is set up with the "approval" configuration, pull requests in that repository will require the maintainer's approval in JBS. Otherwise, the pull request will not be considered ready. 
>> 
>> Erik has also provided a design outlining how to configure the "approval" for a repository.
>> 
>> 
>> The simple case, where the labels are the same for every branch in a repository: 
>> 
>> "approval": { 
>>   "request": "jdk17u-fix-request", 
>>   "approved": "jdk17u-fix-yes", 
>>   "rejected": "jdk17u-fix-no", 
>> } 
>> 
>> To reduce the need for changing multiple strings when copying a configuration for a new repository, there is an optional "prefix" field: 
>> 
>> "approval": { 
>>   "prefix": "jdk17u-fix-", 
>>   "request": "request", 
>>   "approved": "yes", 
>>   "rejected": "no", 
>> } 
>> 
>> When there are multiple branches with different labels, having the prefix set per branch can help reduce the size of the configuration significantly: 
>> 
>> "approval": { 
>>   "request": "-critical-request", 
>>   "approved": "-critical-approved", 
>>   "rejected": "-critical-rejected", 
>>   "branches": [ 
>>     "jdk20\.0\.1": { "prefix": "CPU23_04" } 
>>   ] 
>> }
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   add ApprovalNeededComment

bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1512:

> 1510:         if (existingUnapproved) {
> 1511:             messageBuilder.append("??  @").append(pr.author().username())
> 1512:                     .append(" There are still some issues that have not received maintainer approval.")

I would change the message to something like this: "This change has now been reviewed and requires maintainer approval.", where "approval" is a link to the documentation. The documentation link needs to be a configuration option so we can link to different process documentation for different repos.

bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1517:

> 1515:                     .append("[Requesting push approval for fixes](https://openjdk.org/projects/jdk-updates/approval.html)");
> 1516:         } else {
> 1517:             messageBuilder.append("@").append(pr.author().username()).append(" All the issues have already got the maintainer approval!");

When looking at this, I think I'm changing my mind a bit around this. I think we should just post the "approval needed" comment once and not edit it with progress. It's enough to have progress in the pr body.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1537#discussion_r1289179965
PR Review Comment: https://git.openjdk.org/skara/pull/1537#discussion_r1289203822

From zsong at openjdk.org  Thu Aug 10 20:01:59 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 10 Aug 2023 20:01:59 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v5]
In-Reply-To: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
Message-ID: <xhtPI1s3k34dTeKzPAP79rIGjtjygIedTWRwuspzD8Y=.d6b289f0-79bb-4379-bcf3-f8c5defc045d@github.com>

> As Erik said in the description of this issue, currently, this issue only cares about tracking approval labels in the related bugs.
> 
> If a repository is set up with the "approval" configuration, pull requests in that repository will require the maintainer's approval in JBS. Otherwise, the pull request will not be considered ready. 
> 
> Erik has also provided a design outlining how to configure the "approval" for a repository.
> 
> 
> The simple case, where the labels are the same for every branch in a repository: 
> 
> "approval": { 
>   "request": "jdk17u-fix-request", 
>   "approved": "jdk17u-fix-yes", 
>   "rejected": "jdk17u-fix-no", 
> } 
> 
> To reduce the need for changing multiple strings when copying a configuration for a new repository, there is an optional "prefix" field: 
> 
> "approval": { 
>   "prefix": "jdk17u-fix-", 
>   "request": "request", 
>   "approved": "yes", 
>   "rejected": "no", 
> } 
> 
> When there are multiple branches with different labels, having the prefix set per branch can help reduce the size of the configuration significantly: 
> 
> "approval": { 
>   "request": "-critical-request", 
>   "approved": "-critical-approved", 
>   "rejected": "-critical-rejected", 
>   "branches": [ 
>     "jdk20\.0\.1": { "prefix": "CPU23_04" } 
>   ] 
> }

Zhao Song has updated the pull request incrementally with three additional commits since the last revision:

 - fix test
 - fix test
 - update

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1537/files
  - new: https://git.openjdk.org/skara/pull/1537/files/bc652f24..e55acd54

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1537&range=04
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1537&range=03-04

  Stats: 61 lines in 6 files changed: 25 ins; 24 del; 12 mod
  Patch: https://git.openjdk.org/skara/pull/1537.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1537/head:pull/1537

PR: https://git.openjdk.org/skara/pull/1537

From erikj at openjdk.org  Fri Aug 11 13:22:01 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Fri, 11 Aug 2023 13:22:01 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v5]
In-Reply-To: <xhtPI1s3k34dTeKzPAP79rIGjtjygIedTWRwuspzD8Y=.d6b289f0-79bb-4379-bcf3-f8c5defc045d@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
 <xhtPI1s3k34dTeKzPAP79rIGjtjygIedTWRwuspzD8Y=.d6b289f0-79bb-4379-bcf3-f8c5defc045d@github.com>
Message-ID: <3z-eOejUDfWK9LX2Jp_V8VdJ99mpuD7SvXB8_zpZhwI=.cb8bc832-1e45-4152-9c7e-1b9718327dc5@github.com>

On Thu, 10 Aug 2023 20:01:59 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> As Erik said in the description of this issue, currently, this issue only cares about tracking approval labels in the related bugs.
>> 
>> If a repository is set up with the "approval" configuration, pull requests in that repository will require the maintainer's approval in JBS. Otherwise, the pull request will not be considered ready. 
>> 
>> Erik has also provided a design outlining how to configure the "approval" for a repository.
>> 
>> 
>> The simple case, where the labels are the same for every branch in a repository: 
>> 
>> "approval": { 
>>   "request": "jdk17u-fix-request", 
>>   "approved": "jdk17u-fix-yes", 
>>   "rejected": "jdk17u-fix-no", 
>> } 
>> 
>> To reduce the need for changing multiple strings when copying a configuration for a new repository, there is an optional "prefix" field: 
>> 
>> "approval": { 
>>   "prefix": "jdk17u-fix-", 
>>   "request": "request", 
>>   "approved": "yes", 
>>   "rejected": "no", 
>> } 
>> 
>> When there are multiple branches with different labels, having the prefix set per branch can help reduce the size of the configuration significantly: 
>> 
>> "approval": { 
>>   "request": "-critical-request", 
>>   "approved": "-critical-approved", 
>>   "rejected": "-critical-rejected", 
>>   "branches": [ 
>>     "jdk20\.0\.1": { "prefix": "CPU23_04" } 
>>   ] 
>> }
>
> Zhao Song has updated the pull request incrementally with three additional commits since the last revision:
> 
>  - fix test
>  - fix test
>  - update

bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1517:

> 1515:         }
> 1516:         String message = "??  @" + pr.author().username() +
> 1517:                 " This change has now been reviewed and requires maintainer [approval](" + approval.documentLink() + ")." +

I did some more thinking about how this should be formulated. I don't think we should mention the review state here either. 
Suggestion:

                " This change is now ready for maintainer [approval](" + approval.documentLink() + ")." +

bots/pr/src/test/java/org/openjdk/skara/bots/pr/ApprovalTests.java line 34:

> 32:     @Test
> 33:     void simple() {
> 34:         Approval approval = new Approval("", "jdk17u-fix-request", "jdk17u-fix-yes", "jdk17u-fix-no", "https://test.openjdk.org");

I recommend using something with `example.com` for test URL.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1537#discussion_r1291329414
PR Review Comment: https://git.openjdk.org/skara/pull/1537#discussion_r1291331283

From erikj at openjdk.org  Fri Aug 11 13:31:26 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Fri, 11 Aug 2023 13:31:26 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v5]
In-Reply-To: <3z-eOejUDfWK9LX2Jp_V8VdJ99mpuD7SvXB8_zpZhwI=.cb8bc832-1e45-4152-9c7e-1b9718327dc5@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
 <xhtPI1s3k34dTeKzPAP79rIGjtjygIedTWRwuspzD8Y=.d6b289f0-79bb-4379-bcf3-f8c5defc045d@github.com>
 <3z-eOejUDfWK9LX2Jp_V8VdJ99mpuD7SvXB8_zpZhwI=.cb8bc832-1e45-4152-9c7e-1b9718327dc5@github.com>
Message-ID: <qRkfmpQc9-5pvgR16VQRl_ilmNulr6q6M32WC7uzX94=.0e883ff1-c193-4c2c-b086-ed38bb781872@github.com>

On Fri, 11 Aug 2023 13:17:31 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Zhao Song has updated the pull request incrementally with three additional commits since the last revision:
>> 
>>  - fix test
>>  - fix test
>>  - update
>
> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1517:
> 
>> 1515:         }
>> 1516:         String message = "??  @" + pr.author().username() +
>> 1517:                 " This change has now been reviewed and requires maintainer [approval](" + approval.documentLink() + ")." +
> 
> I did some more thinking about how this should be formulated. I don't think we should mention the review state here either. 
> Suggestion:
> 
>                 " This change is now ready for maintainer [approval](" + approval.documentLink() + ")." +

Suggestion:

                " This change is now ready for you to apply for maintainer [approval](" + approval.documentLink() + ")." +

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1537#discussion_r1291341597

From zsong at openjdk.org  Fri Aug 11 16:31:32 2023
From: zsong at openjdk.org (Zhao Song)
Date: Fri, 11 Aug 2023 16:31:32 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v6]
In-Reply-To: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
Message-ID: <d-sLYA8zJ0uerA507fh8H3GGBE5vDt7WPrjzMoQCbWs=.83f2ee1d-cb4f-491c-a4ca-5b16405e2777@github.com>

> As Erik said in the description of this issue, currently, this issue only cares about tracking approval labels in the related bugs.
> 
> If a repository is set up with the "approval" configuration, pull requests in that repository will require the maintainer's approval in JBS. Otherwise, the pull request will not be considered ready. 
> 
> Erik has also provided a design outlining how to configure the "approval" for a repository.
> 
> 
> The simple case, where the labels are the same for every branch in a repository: 
> 
> "approval": { 
>   "request": "jdk17u-fix-request", 
>   "approved": "jdk17u-fix-yes", 
>   "rejected": "jdk17u-fix-no", 
> } 
> 
> To reduce the need for changing multiple strings when copying a configuration for a new repository, there is an optional "prefix" field: 
> 
> "approval": { 
>   "prefix": "jdk17u-fix-", 
>   "request": "request", 
>   "approved": "yes", 
>   "rejected": "no", 
> } 
> 
> When there are multiple branches with different labels, having the prefix set per branch can help reduce the size of the configuration significantly: 
> 
> "approval": { 
>   "request": "-critical-request", 
>   "approved": "-critical-approved", 
>   "rejected": "-critical-rejected", 
>   "branches": [ 
>     "jdk20\.0\.1": { "prefix": "CPU23_04" } 
>   ] 
> }

Zhao Song has updated the pull request incrementally with two additional commits since the last revision:

 - update
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1537/files
  - new: https://git.openjdk.org/skara/pull/1537/files/e55acd54..df99bfd0

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1537&range=05
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1537&range=04-05

  Stats: 11 lines in 4 files changed: 0 ins; 0 del; 11 mod
  Patch: https://git.openjdk.org/skara/pull/1537.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1537/head:pull/1537

PR: https://git.openjdk.org/skara/pull/1537

From zsong at openjdk.org  Fri Aug 11 16:31:33 2023
From: zsong at openjdk.org (Zhao Song)
Date: Fri, 11 Aug 2023 16:31:33 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v5]
In-Reply-To: <3z-eOejUDfWK9LX2Jp_V8VdJ99mpuD7SvXB8_zpZhwI=.cb8bc832-1e45-4152-9c7e-1b9718327dc5@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
 <xhtPI1s3k34dTeKzPAP79rIGjtjygIedTWRwuspzD8Y=.d6b289f0-79bb-4379-bcf3-f8c5defc045d@github.com>
 <3z-eOejUDfWK9LX2Jp_V8VdJ99mpuD7SvXB8_zpZhwI=.cb8bc832-1e45-4152-9c7e-1b9718327dc5@github.com>
Message-ID: <9T9F1Ixa3I40zIf48XRRcO-sx4VgmRuB3g-UkcJh-Bo=.bed4ea00-f5f1-493b-aef3-2a89b2bb5a06@github.com>

On Fri, 11 Aug 2023 13:19:21 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Zhao Song has updated the pull request incrementally with three additional commits since the last revision:
>> 
>>  - fix test
>>  - fix test
>>  - update
>
> bots/pr/src/test/java/org/openjdk/skara/bots/pr/ApprovalTests.java line 34:
> 
>> 32:     @Test
>> 33:     void simple() {
>> 34:         Approval approval = new Approval("", "jdk17u-fix-request", "jdk17u-fix-yes", "jdk17u-fix-no", "https://test.openjdk.org");
> 
> I recommend using something with `example.com` for test URL.

Sure, will fix it.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1537#discussion_r1291557127

From zsong at openjdk.org  Fri Aug 11 18:26:08 2023
From: zsong at openjdk.org (Zhao Song)
Date: Fri, 11 Aug 2023 18:26:08 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v6]
In-Reply-To: <d-sLYA8zJ0uerA507fh8H3GGBE5vDt7WPrjzMoQCbWs=.83f2ee1d-cb4f-491c-a4ca-5b16405e2777@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
 <d-sLYA8zJ0uerA507fh8H3GGBE5vDt7WPrjzMoQCbWs=.83f2ee1d-cb4f-491c-a4ca-5b16405e2777@github.com>
Message-ID: <GtxjkPPch8A5F7QpZkZc3l-1bH3SCU86GX985wy8-po=.1f0f6b86-173d-415a-9665-21deeba85a69@github.com>

On Fri, 11 Aug 2023 16:31:32 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> As Erik said in the description of this issue, currently, this issue only cares about tracking approval labels in the related bugs.
>> 
>> If a repository is set up with the "approval" configuration, pull requests in that repository will require the maintainer's approval in JBS. Otherwise, the pull request will not be considered ready. 
>> 
>> Erik has also provided a design outlining how to configure the "approval" for a repository.
>> 
>> 
>> The simple case, where the labels are the same for every branch in a repository: 
>> 
>> "approval": { 
>>   "request": "jdk17u-fix-request", 
>>   "approved": "jdk17u-fix-yes", 
>>   "rejected": "jdk17u-fix-no", 
>> } 
>> 
>> To reduce the need for changing multiple strings when copying a configuration for a new repository, there is an optional "prefix" field: 
>> 
>> "approval": { 
>>   "prefix": "jdk17u-fix-", 
>>   "request": "request", 
>>   "approved": "yes", 
>>   "rejected": "no", 
>> } 
>> 
>> When there are multiple branches with different labels, having the prefix set per branch can help reduce the size of the configuration significantly: 
>> 
>> "approval": { 
>>   "request": "-critical-request", 
>>   "approved": "-critical-approved", 
>>   "rejected": "-critical-rejected", 
>>   "branches": [ 
>>     "jdk20\.0\.1": { "prefix": "CPU23_04" } 
>>   ] 
>> }
>
> Zhao Song has updated the pull request incrementally with two additional commits since the last revision:
> 
>  - update
>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
>    
>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>

The GHA test failure is not related to this change. See: https://github.com/openjdk/skara/pull/1543

-------------

PR Comment: https://git.openjdk.org/skara/pull/1537#issuecomment-1675195912

From zsong at openjdk.org  Fri Aug 11 18:27:18 2023
From: zsong at openjdk.org (Zhao Song)
Date: Fri, 11 Aug 2023 18:27:18 GMT
Subject: RFR: 1990: Fix MailingListNotifierTests#testMailingListBranch
Message-ID: <QqkrD-_mB0jX3TXV4RT6XOtkA8RDBT0Y4V9DH0sTn3k=.81ca5e49-aae1-4694-8f0d-14ea6b742e79@github.com>

Due to [SKARA-1979](https://bugs.openjdk.org/browse/SKARA-1979), when generating a notification email for the first branch of a repository, all refs except pr/X branches are regarded as potential candidates. 

Therefore, this test sometimes fails because the master branch and testlock branch are identical, and it's uncertain which one will be selected as the base for the new branch.

-------------

Commit messages:
 - SKARA-1990

Changes: https://git.openjdk.org/skara/pull/1543/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1543&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1990
  Stats: 3 lines in 1 file changed: 2 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/skara/pull/1543.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1543/head:pull/1543

PR: https://git.openjdk.org/skara/pull/1543

From erikj at openjdk.org  Mon Aug 14 13:58:32 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Mon, 14 Aug 2023 13:58:32 GMT
Subject: RFR: 1990: Fix MailingListNotifierTests#testMailingListBranch
In-Reply-To: <QqkrD-_mB0jX3TXV4RT6XOtkA8RDBT0Y4V9DH0sTn3k=.81ca5e49-aae1-4694-8f0d-14ea6b742e79@github.com>
References: <QqkrD-_mB0jX3TXV4RT6XOtkA8RDBT0Y4V9DH0sTn3k=.81ca5e49-aae1-4694-8f0d-14ea6b742e79@github.com>
Message-ID: <8LapYSBiztgr9jLAFDVZEHtHnBgiGJ229El2eDab7Mg=.dac03886-9641-47bc-9bfc-75cd46033ad6@github.com>

On Fri, 11 Aug 2023 18:01:07 GMT, Zhao Song <zsong at openjdk.org> wrote:

> Due to [SKARA-1979](https://bugs.openjdk.org/browse/SKARA-1979), when generating a notification email for the first branch of a repository, all refs except pr/X branches are regarded as potential candidates. 
> 
> Therefore, this test sometimes fails because the master branch and testlock branch are identical, and it's uncertain which one will be selected as the base for the new branch.

Would it be possible to change the test so that we don't have two equivalent branches.

Marked as reviewed by erikj (Lead).

-------------

PR Review: https://git.openjdk.org/skara/pull/1543#pullrequestreview-1576899886
PR Review: https://git.openjdk.org/skara/pull/1543#pullrequestreview-1576900266

From erikj at openjdk.org  Mon Aug 14 14:00:29 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Mon, 14 Aug 2023 14:00:29 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v5]
In-Reply-To: <qRkfmpQc9-5pvgR16VQRl_ilmNulr6q6M32WC7uzX94=.0e883ff1-c193-4c2c-b086-ed38bb781872@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
 <xhtPI1s3k34dTeKzPAP79rIGjtjygIedTWRwuspzD8Y=.d6b289f0-79bb-4379-bcf3-f8c5defc045d@github.com>
 <3z-eOejUDfWK9LX2Jp_V8VdJ99mpuD7SvXB8_zpZhwI=.cb8bc832-1e45-4152-9c7e-1b9718327dc5@github.com>
 <qRkfmpQc9-5pvgR16VQRl_ilmNulr6q6M32WC7uzX94=.0e883ff1-c193-4c2c-b086-ed38bb781872@github.com>
Message-ID: <6cOhhpRz10nK7hy8T8X6lqzzHppIS6R4w8RbsQ1mil4=.959b0a1c-5a8b-4e83-9deb-6a6db5a0e62e@github.com>

On Fri, 11 Aug 2023 13:29:03 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1517:
>> 
>>> 1515:         }
>>> 1516:         String message = "??  @" + pr.author().username() +
>>> 1517:                 " This change has now been reviewed and requires maintainer [approval](" + approval.documentLink() + ")." +
>> 
>> I did some more thinking about how this should be formulated. I don't think we should mention the review state here either. 
>> Suggestion:
>> 
>>                 " This change is now ready for maintainer [approval](" + approval.documentLink() + ")." +
>
> Suggestion:
> 
>                 " This change is now ready for you to apply for maintainer [approval](" + approval.documentLink() + ")." +

Did you see my last suggestion here? I think we need to be clear that the ball is in the hands of the PR owner.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1537#discussion_r1293495753

From zsong at openjdk.org  Mon Aug 14 16:38:16 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 14 Aug 2023 16:38:16 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v5]
In-Reply-To: <6cOhhpRz10nK7hy8T8X6lqzzHppIS6R4w8RbsQ1mil4=.959b0a1c-5a8b-4e83-9deb-6a6db5a0e62e@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
 <xhtPI1s3k34dTeKzPAP79rIGjtjygIedTWRwuspzD8Y=.d6b289f0-79bb-4379-bcf3-f8c5defc045d@github.com>
 <3z-eOejUDfWK9LX2Jp_V8VdJ99mpuD7SvXB8_zpZhwI=.cb8bc832-1e45-4152-9c7e-1b9718327dc5@github.com>
 <qRkfmpQc9-5pvgR16VQRl_ilmNulr6q6M32WC7uzX94=.0e883ff1-c193-4c2c-b086-ed38bb781872@github.com>
 <6cOhhpRz10nK7hy8T8X6lqzzHppIS6R4w8RbsQ1mil4=.959b0a1c-5a8b-4e83-9deb-6a6db5a0e62e@github.com>
Message-ID: <0RijC_z6kqug2wUqXbyVX8beqmUTI3aJBfQpt1Ax9mU=.1a403280-7342-43ad-9029-b5d4a27e69cb@github.com>

On Mon, 14 Aug 2023 13:58:20 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Suggestion:
>> 
>>                 " This change is now ready for you to apply for maintainer [approval](" + approval.documentLink() + ")." +
>
> Did you see my last suggestion here? I think we need to be clear that the ball is in the hands of the PR owner.

Sorry, I missed it. Will fix it soon.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1537#discussion_r1293711858

From zsong at openjdk.org  Mon Aug 14 16:45:31 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 14 Aug 2023 16:45:31 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v7]
In-Reply-To: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
Message-ID: <l6PPDyxSko1jRYsNADTIFM0t3DXShn1TKCdqDS9DuLE=.4630a473-823b-481a-bc8f-204bc3d2cebd@github.com>

> As Erik said in the description of this issue, currently, this issue only cares about tracking approval labels in the related bugs.
> 
> If a repository is set up with the "approval" configuration, pull requests in that repository will require the maintainer's approval in JBS. Otherwise, the pull request will not be considered ready. 
> 
> Erik has also provided a design outlining how to configure the "approval" for a repository.
> 
> 
> The simple case, where the labels are the same for every branch in a repository: 
> 
> "approval": { 
>   "request": "jdk17u-fix-request", 
>   "approved": "jdk17u-fix-yes", 
>   "rejected": "jdk17u-fix-no", 
> } 
> 
> To reduce the need for changing multiple strings when copying a configuration for a new repository, there is an optional "prefix" field: 
> 
> "approval": { 
>   "prefix": "jdk17u-fix-", 
>   "request": "request", 
>   "approved": "yes", 
>   "rejected": "no", 
> } 
> 
> When there are multiple branches with different labels, having the prefix set per branch can help reduce the size of the configuration significantly: 
> 
> "approval": { 
>   "request": "-critical-request", 
>   "approved": "-critical-approved", 
>   "rejected": "-critical-rejected", 
>   "branches": [ 
>     "jdk20\.0\.1": { "prefix": "CPU23_04" } 
>   ] 
> }

Zhao Song has updated the pull request incrementally with one additional commit since the last revision:

  update

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1537/files
  - new: https://git.openjdk.org/skara/pull/1537/files/df99bfd0..25f66c77

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1537&range=06
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1537&range=05-06

  Stats: 3 lines in 2 files changed: 0 ins; 0 del; 3 mod
  Patch: https://git.openjdk.org/skara/pull/1537.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1537/head:pull/1537

PR: https://git.openjdk.org/skara/pull/1537

From zsong at openjdk.org  Mon Aug 14 16:59:23 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 14 Aug 2023 16:59:23 GMT
Subject: RFR: 1990: Fix MailingListNotifierTests#testMailingListBranch [v2]
In-Reply-To: <QqkrD-_mB0jX3TXV4RT6XOtkA8RDBT0Y4V9DH0sTn3k=.81ca5e49-aae1-4694-8f0d-14ea6b742e79@github.com>
References: <QqkrD-_mB0jX3TXV4RT6XOtkA8RDBT0Y4V9DH0sTn3k=.81ca5e49-aae1-4694-8f0d-14ea6b742e79@github.com>
Message-ID: <pm9O4_Zfrt8EyQ_O6nzta6FetUn4YJ2alpp79J1Syos=.cc841ab7-ce9d-4ab8-beda-b1d91feb8b6d@github.com>

> Due to [SKARA-1979](https://bugs.openjdk.org/browse/SKARA-1979), when generating a notification email for the first branch of a repository, all refs except pr/X branches are regarded as potential candidates. 
> 
> Therefore, this test sometimes fails because the master branch and testlock branch are identical, and it's uncertain which one will be selected as the base for the new branch.

Zhao Song has updated the pull request incrementally with two additional commits since the last revision:

 - update
 - update

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1543/files
  - new: https://git.openjdk.org/skara/pull/1543/files/e9b60877..27a81d8b

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1543&range=01
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1543&range=00-01

  Stats: 4 lines in 1 file changed: 1 ins; 2 del; 1 mod
  Patch: https://git.openjdk.org/skara/pull/1543.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1543/head:pull/1543

PR: https://git.openjdk.org/skara/pull/1543

From zsong at openjdk.org  Mon Aug 14 16:59:23 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 14 Aug 2023 16:59:23 GMT
Subject: RFR: 1990: Fix MailingListNotifierTests#testMailingListBranch [v2]
In-Reply-To: <8LapYSBiztgr9jLAFDVZEHtHnBgiGJ229El2eDab7Mg=.dac03886-9641-47bc-9bfc-75cd46033ad6@github.com>
References: <QqkrD-_mB0jX3TXV4RT6XOtkA8RDBT0Y4V9DH0sTn3k=.81ca5e49-aae1-4694-8f0d-14ea6b742e79@github.com>
 <8LapYSBiztgr9jLAFDVZEHtHnBgiGJ229El2eDab7Mg=.dac03886-9641-47bc-9bfc-75cd46033ad6@github.com>
Message-ID: <HHY0fuoVoEDEcKu93dPn7rQWnrkuEKoIVY_ciSKPORE=.a49824f9-35ec-4caa-a49a-028c34044217@github.com>

On Mon, 14 Aug 2023 13:56:01 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> Would it be possible to change the test so that we don't have two equivalent branches.

Yes, it's possible. Just need to append a commit to master branch.

-------------

PR Comment: https://git.openjdk.org/skara/pull/1543#issuecomment-1677701213

From erikj at openjdk.org  Mon Aug 14 17:16:04 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Mon, 14 Aug 2023 17:16:04 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v7]
In-Reply-To: <l6PPDyxSko1jRYsNADTIFM0t3DXShn1TKCdqDS9DuLE=.4630a473-823b-481a-bc8f-204bc3d2cebd@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
 <l6PPDyxSko1jRYsNADTIFM0t3DXShn1TKCdqDS9DuLE=.4630a473-823b-481a-bc8f-204bc3d2cebd@github.com>
Message-ID: <whUyJ_VjN2iPXUf5tPdNayTY2Uh7ofYyQqfdNxDhqog=.f55fd632-9e98-4e40-838e-4c5f3e7266e8@github.com>

On Mon, 14 Aug 2023 16:45:31 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> As Erik said in the description of this issue, currently, this issue only cares about tracking approval labels in the related bugs.
>> 
>> If a repository is set up with the "approval" configuration, pull requests in that repository will require the maintainer's approval in JBS. Otherwise, the pull request will not be considered ready. 
>> 
>> Erik has also provided a design outlining how to configure the "approval" for a repository.
>> 
>> 
>> The simple case, where the labels are the same for every branch in a repository: 
>> 
>> "approval": { 
>>   "request": "jdk17u-fix-request", 
>>   "approved": "jdk17u-fix-yes", 
>>   "rejected": "jdk17u-fix-no", 
>> } 
>> 
>> To reduce the need for changing multiple strings when copying a configuration for a new repository, there is an optional "prefix" field: 
>> 
>> "approval": { 
>>   "prefix": "jdk17u-fix-", 
>>   "request": "request", 
>>   "approved": "yes", 
>>   "rejected": "no", 
>> } 
>> 
>> When there are multiple branches with different labels, having the prefix set per branch can help reduce the size of the configuration significantly: 
>> 
>> "approval": { 
>>   "request": "-critical-request", 
>>   "approved": "-critical-approved", 
>>   "rejected": "-critical-rejected", 
>>   "branches": [ 
>>     "jdk20\.0\.1": { "prefix": "CPU23_04" } 
>>   ] 
>> }
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   update

Marked as reviewed by erikj (Lead).

-------------

PR Review: https://git.openjdk.org/skara/pull/1537#pullrequestreview-1577291975

From erikj at openjdk.org  Mon Aug 14 17:17:08 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Mon, 14 Aug 2023 17:17:08 GMT
Subject: RFR: 1990: Fix MailingListNotifierTests#testMailingListBranch [v2]
In-Reply-To: <pm9O4_Zfrt8EyQ_O6nzta6FetUn4YJ2alpp79J1Syos=.cc841ab7-ce9d-4ab8-beda-b1d91feb8b6d@github.com>
References: <QqkrD-_mB0jX3TXV4RT6XOtkA8RDBT0Y4V9DH0sTn3k=.81ca5e49-aae1-4694-8f0d-14ea6b742e79@github.com>
 <pm9O4_Zfrt8EyQ_O6nzta6FetUn4YJ2alpp79J1Syos=.cc841ab7-ce9d-4ab8-beda-b1d91feb8b6d@github.com>
Message-ID: <bUkG-0v3L6TG5OIiPwlESjmJArswsKovXmyyET0ItQA=.34e417e2-de3c-4035-95a9-b6cbd73167cd@github.com>

On Mon, 14 Aug 2023 16:59:23 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> Due to [SKARA-1979](https://bugs.openjdk.org/browse/SKARA-1979), when generating a notification email for the first branch of a repository, all refs except pr/X branches are regarded as potential candidates. 
>> 
>> Therefore, this test sometimes fails because the master branch and testlock branch are identical, and it's uncertain which one will be selected as the base for the new branch.
>
> Zhao Song has updated the pull request incrementally with two additional commits since the last revision:
> 
>  - update
>  - update

Marked as reviewed by erikj (Lead).

-------------

PR Review: https://git.openjdk.org/skara/pull/1543#pullrequestreview-1577293278

From zsong at openjdk.org  Mon Aug 14 17:19:51 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 14 Aug 2023 17:19:51 GMT
Subject: RFR: 1990: Fix MailingListNotifierTests#testMailingListBranch [v2]
In-Reply-To: <pm9O4_Zfrt8EyQ_O6nzta6FetUn4YJ2alpp79J1Syos=.cc841ab7-ce9d-4ab8-beda-b1d91feb8b6d@github.com>
References: <QqkrD-_mB0jX3TXV4RT6XOtkA8RDBT0Y4V9DH0sTn3k=.81ca5e49-aae1-4694-8f0d-14ea6b742e79@github.com>
 <pm9O4_Zfrt8EyQ_O6nzta6FetUn4YJ2alpp79J1Syos=.cc841ab7-ce9d-4ab8-beda-b1d91feb8b6d@github.com>
Message-ID: <S0n86E14fuvLCkL-VfI1z0TnabyQkg8pqd2iyboyASs=.25706e2c-4bd8-488b-8f71-b443bb7a60be@github.com>

On Mon, 14 Aug 2023 16:59:23 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> Due to [SKARA-1979](https://bugs.openjdk.org/browse/SKARA-1979), when generating a notification email for the first branch of a repository, all refs except pr/X branches are regarded as potential candidates. 
>> 
>> Therefore, this test sometimes fails because the master branch and testlock branch are identical, and it's uncertain which one will be selected as the base for the new branch.
>
> Zhao Song has updated the pull request incrementally with two additional commits since the last revision:
> 
>  - update
>  - update

Thanks for the review!

-------------

PR Comment: https://git.openjdk.org/skara/pull/1543#issuecomment-1677740351

From zsong at openjdk.org  Mon Aug 14 17:19:51 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 14 Aug 2023 17:19:51 GMT
Subject: Integrated: 1990: Fix MailingListNotifierTests#testMailingListBranch
In-Reply-To: <QqkrD-_mB0jX3TXV4RT6XOtkA8RDBT0Y4V9DH0sTn3k=.81ca5e49-aae1-4694-8f0d-14ea6b742e79@github.com>
References: <QqkrD-_mB0jX3TXV4RT6XOtkA8RDBT0Y4V9DH0sTn3k=.81ca5e49-aae1-4694-8f0d-14ea6b742e79@github.com>
Message-ID: <M7x6dVKMLEhqI3pQq1HqteZ8WPFnDswaAxGyzO7AnAE=.58702ff1-42ea-41d2-baf8-4ef0093d68a2@github.com>

On Fri, 11 Aug 2023 18:01:07 GMT, Zhao Song <zsong at openjdk.org> wrote:

> Due to [SKARA-1979](https://bugs.openjdk.org/browse/SKARA-1979), when generating a notification email for the first branch of a repository, all refs except pr/X branches are regarded as potential candidates. 
> 
> Therefore, this test sometimes fails because the master branch and testlock branch are identical, and it's uncertain which one will be selected as the base for the new branch.

This pull request has now been integrated.

Changeset: 5ebf0975
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/5ebf09753830b5fddae61f94b1b6e2a99a2b51eb
Stats:     1 line in 1 file changed: 1 ins; 0 del; 0 mod

1990: Fix MailingListNotifierTests#testMailingListBranch

Reviewed-by: erikj

-------------

PR: https://git.openjdk.org/skara/pull/1543

From zsong at openjdk.org  Mon Aug 14 17:20:26 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 14 Aug 2023 17:20:26 GMT
Subject: RFR: 1199: Enforce maintainer approval in JBS before allowing to
 integrate backports into updates projects [v7]
In-Reply-To: <l6PPDyxSko1jRYsNADTIFM0t3DXShn1TKCdqDS9DuLE=.4630a473-823b-481a-bc8f-204bc3d2cebd@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
 <l6PPDyxSko1jRYsNADTIFM0t3DXShn1TKCdqDS9DuLE=.4630a473-823b-481a-bc8f-204bc3d2cebd@github.com>
Message-ID: <5UHxuVrUCcMEIWqPMLcEvZbydNrkYvJeUTtEfJFFUnQ=.a3600565-f11e-4829-adbf-36502123e5e4@github.com>

On Mon, 14 Aug 2023 16:45:31 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> As Erik said in the description of this issue, currently, this issue only cares about tracking approval labels in the related bugs.
>> 
>> If a repository is set up with the "approval" configuration, pull requests in that repository will require the maintainer's approval in JBS. Otherwise, the pull request will not be considered ready. 
>> 
>> Erik has also provided a design outlining how to configure the "approval" for a repository.
>> 
>> 
>> The simple case, where the labels are the same for every branch in a repository: 
>> 
>> "approval": { 
>>   "request": "jdk17u-fix-request", 
>>   "approved": "jdk17u-fix-yes", 
>>   "rejected": "jdk17u-fix-no", 
>> } 
>> 
>> To reduce the need for changing multiple strings when copying a configuration for a new repository, there is an optional "prefix" field: 
>> 
>> "approval": { 
>>   "prefix": "jdk17u-fix-", 
>>   "request": "request", 
>>   "approved": "yes", 
>>   "rejected": "no", 
>> } 
>> 
>> When there are multiple branches with different labels, having the prefix set per branch can help reduce the size of the configuration significantly: 
>> 
>> "approval": { 
>>   "request": "-critical-request", 
>>   "approved": "-critical-approved", 
>>   "rejected": "-critical-rejected", 
>>   "branches": [ 
>>     "jdk20\.0\.1": { "prefix": "CPU23_04" } 
>>   ] 
>> }
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   update

Thanks for the review!

-------------

PR Comment: https://git.openjdk.org/skara/pull/1537#issuecomment-1677741143

From zsong at openjdk.org  Mon Aug 14 17:20:26 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 14 Aug 2023 17:20:26 GMT
Subject: Integrated: 1199: Enforce maintainer approval in JBS before allowing
 to integrate backports into updates projects
In-Reply-To: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
References: <12R_tIUizQijaH9F4FNvDZCSMU7h2ePygV58rXyvtso=.0da22dd7-1142-48bb-8d8a-4b2ea56c4b61@github.com>
Message-ID: <Ik5bWiqXx6IKX0aCTQWbvD4jqNkurC77TnW0a3nFy4o=.f8e2c99f-d352-48c5-a901-4f0769f829cf@github.com>

On Tue, 27 Jun 2023 21:37:35 GMT, Zhao Song <zsong at openjdk.org> wrote:

> As Erik said in the description of this issue, currently, this issue only cares about tracking approval labels in the related bugs.
> 
> If a repository is set up with the "approval" configuration, pull requests in that repository will require the maintainer's approval in JBS. Otherwise, the pull request will not be considered ready. 
> 
> Erik has also provided a design outlining how to configure the "approval" for a repository.
> 
> 
> The simple case, where the labels are the same for every branch in a repository: 
> 
> "approval": { 
>   "request": "jdk17u-fix-request", 
>   "approved": "jdk17u-fix-yes", 
>   "rejected": "jdk17u-fix-no", 
> } 
> 
> To reduce the need for changing multiple strings when copying a configuration for a new repository, there is an optional "prefix" field: 
> 
> "approval": { 
>   "prefix": "jdk17u-fix-", 
>   "request": "request", 
>   "approved": "yes", 
>   "rejected": "no", 
> } 
> 
> When there are multiple branches with different labels, having the prefix set per branch can help reduce the size of the configuration significantly: 
> 
> "approval": { 
>   "request": "-critical-request", 
>   "approved": "-critical-approved", 
>   "rejected": "-critical-rejected", 
>   "branches": [ 
>     "jdk20\.0\.1": { "prefix": "CPU23_04" } 
>   ] 
> }

This pull request has now been integrated.

Changeset: bfaf1781
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/bfaf1781130e426fd7a328804f92e4629331eec4
Stats:     399 lines in 9 files changed: 378 ins; 4 del; 17 mod

1199: Enforce maintainer approval in JBS before allowing to integrate backports into updates projects

Reviewed-by: erikj

-------------

PR: https://git.openjdk.org/skara/pull/1537

From zsong at openjdk.org  Wed Aug 16 01:19:10 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 16 Aug 2023 01:19:10 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request
Message-ID: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>

As Erik said in the issue, "In SKARA-1199, we added the optional ability for a PR to block integration until a certain approval label appears on all the associated bugs. To further improve the workflow, we would like to add a couple of PR commands that will make it possible to perform the whole maintainer approval workflow through the PR"

Therefore, in this patch, two pull request commands(`/approval` and `/approve`) are introduced.

1. Command `/approval`
Usage: `/approval [<id>] (request|cancel) [<text>]`
Examples: `/approval request my reason`, `/approval cancel`, 
                 `/approval JDK-123 request my reason`, `/approval 123 cancel`

Only the author of the pull request is allowed to issue this command. If the user requested approval, the text will be posted to the bug. The user will be able to update the text by requesting the approval again. Once maintainer processed the request(approved or rejected), the user will not be able to request or cancel the approval.

If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.

2. Command `/approve`
Usage: `/approve [<id>] (yes|no)`
Examples: `/approve yes`, `/approve no`, `/approve JDK-123 yes`, `/approve 123 no`

Only maintainers of the repo are allowed to issue this command. Maintainers can approve or reject the approval whether the request exists.

If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.

-------------

Commit messages:
 - fix test
 - update
 - SKARA-1949
 - merge master
 - Merge remote-tracking branch 'origin/master' into SKARA-1949
 - SKARA-1949
 - add ApprovalNeededComment
 - fix some problems
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
 - ... and 1 more: https://git.openjdk.org/skara/compare/bfaf1781...aab28673

Changes: https://git.openjdk.org/skara/pull/1544/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1544&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1949
  Stats: 454 lines in 12 files changed: 440 ins; 0 del; 14 mod
  Patch: https://git.openjdk.org/skara/pull/1544.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1544/head:pull/1544

PR: https://git.openjdk.org/skara/pull/1544

From erikj at openjdk.org  Wed Aug 16 12:42:54 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Wed, 16 Aug 2023 12:42:54 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request
In-Reply-To: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
Message-ID: <daqXVrXBrp2Spyg00jT7JWAIcIeH_8Wz2FbviThtalM=.3b01bf73-ad8c-433e-92c5-b2280fc06a95@github.com>

On Tue, 15 Aug 2023 22:35:04 GMT, Zhao Song <zsong at openjdk.org> wrote:

> Only maintainers of the repo are allowed to issue this command. Maintainers can approve or reject the approval whether the request exists.

I don't think we should allow approve without a request (unless the current maintainers agree they want it to work that way).

> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.

At least for the /approve command, running without an issue id should approve all associated issues that have approval requested. One of the main reasons for allowing approve from PR is to automatically handle multiple bugs.

-------------

PR Comment: https://git.openjdk.org/skara/pull/1544#issuecomment-1680531608

From erikj at openjdk.org  Wed Aug 16 14:13:18 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Wed, 16 Aug 2023 14:13:18 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request
In-Reply-To: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
Message-ID: <1iGhO8Ek05gKH1KY0uzK_wEUOYHAiA3JsLqkmNjokGw=.55ec5380-e85f-4a96-a3dc-b697a8f63e83@github.com>

On Tue, 15 Aug 2023 22:35:04 GMT, Zhao Song <zsong at openjdk.org> wrote:

> As Erik said in the issue, "In SKARA-1199, we added the optional ability for a PR to block integration until a certain approval label appears on all the associated bugs. To further improve the workflow, we would like to add a couple of PR commands that will make it possible to perform the whole maintainer approval workflow through the PR"
> 
> Therefore, in this patch, two pull request commands(`/approval` and `/approve`) are introduced.
> 
> 1. Command `/approval`
> Usage: `/approval [<id>] (request|cancel) [<text>]`
> Examples: `/approval request my reason`, `/approval cancel`, 
>                  `/approval JDK-123 request my reason`, `/approval 123 cancel`
> 
> Only the author of the pull request is allowed to issue this command. If the user requested approval, the text will be posted to the bug. The user will be able to update the text by requesting the approval again. Once maintainer processed the request(approved or rejected), the user will not be able to request or cancel the approval.
> 
> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.
> 
> 2. Command `/approve`
> Usage: `/approve [<id>] (yes|no)`
> Examples: `/approve yes`, `/approve no`, `/approve JDK-123 yes`, `/approve 123 no`
> 
> Only maintainers of the repo are allowed to issue this command. Maintainers can approve or reject the approval whether the request exists.
> 
> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 60:

> 58:         var targetRef = pr.targetRef();
> 59:         if (approval == null || !approval.needsApproval(targetRef)) {
> 60:             reply.println("No need to apply for maintainer approval!");

Bots aren't using `!` in their communication style. I also think we can make this even clearer. 

If `approval == null`: "Changes in this repository do not require maintainer approval."
if `!approval.needsApproval(targetRef))`: "Changes to branch " + pr.targetRef() + " do not require maintainer approval."

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 81:

> 79: 
> 80:         if (issue.project().isPresent() && !issue.project().get().equalsIgnoreCase(issueProject.name())) {
> 81:             reply.print("Can only request approval for issues in " + issueProject.name() + "!");

Suggestion:

            reply.print("Approval can only be request for issues in the " + issueProject.name() + " project.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 87:

> 85:         var issueTrackerIssueOpt = issueProject.issue(issue.shortId());
> 86:         if (issueTrackerIssueOpt.isEmpty()) {
> 87:             reply.print("Can not find " + issue.id() + " in " + issueProject.name() + ".");

Suggestion:

            reply.print("Can not find " + issue.id() + " in the " + issueProject.name() + " project.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 98:

> 96:         var existingComment = comments.stream()
> 97:                 .filter(comment -> comment.author().equals(issueProject.issueTracker().currentUser()))
> 98:                 .filter(comment -> comment.body().contains(prefix))

Maybe narrow the filter to `startsWith(prefix)`?

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 104:

> 102:         if (option.equals("cancel")) {
> 103:             if (labels.contains(approvedLabel) || labels.contains(rejectedLabel)) {
> 104:                 reply.print("The request has been processed by maintainer! Could not cancel the request now.");

Suggestion:

                reply.print("The request has already been handled by a maintainer and can no longer be canceled.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 108:

> 106:                 issueTrackerIssue.removeLabel(requestLabel);
> 107:                 existingComment.ifPresent(issueTrackerIssue::removeComment);
> 108:                 reply.print("The request has already been cancelled successfully!");

Suggestion:

                reply.print("The approval request has been cancelled successfully.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 112:

> 110:         } else if (option.equals("request")) {
> 111:             if (labels.contains(approvedLabel)) {
> 112:                 reply.print("The request has been approved by maintainer!");

Suggestion:

                reply.print("Approval has already been requested and approved.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 114:

> 112:                 reply.print("The request has been approved by maintainer!");
> 113:             } else if (labels.contains(rejectedLabel)) {
> 114:                 reply.print("The request has been rejected by maintainer!");

Suggestion:

                reply.print("Approval has already been requested and rejected.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 116:

> 114:                 reply.print("The request has been rejected by maintainer!");
> 115:             } else {
> 116:                 issueTrackerIssue.addLabel(requestLabel);

Adding the label should be done after the comment is added.

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 117:

> 115:             } else {
> 116:                 issueTrackerIssue.addLabel(requestLabel);
> 117:                 var messageToPost = prefix + ":Maintainer Approval Request from " + command.user().fullName() + "\n" + message.trim();

Suggestion:

                var messageToPost = prefix + " Approval Request from " + command.user().fullName() + "\n" + message.trim();

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 121:

> 119:                     if (!existingComment.get().body().equals(messageToPost)) {
> 120:                         issueTrackerIssue.updateComment(existingComment.get().id(), messageToPost);
> 121:                         reply.print("The maintainer approval request has been updated successfully! Please wait for maintainers to process this request.");

Suggestion:

                        reply.print("The approval request has been updated successfully.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 122:

> 120:                         issueTrackerIssue.updateComment(existingComment.get().id(), messageToPost);
> 121:                         reply.print("The maintainer approval request has been updated successfully! Please wait for maintainers to process this request.");
> 122:                     } else{

Suggestion:

                    } else {

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 123:

> 121:                         reply.print("The maintainer approval request has been updated successfully! Please wait for maintainers to process this request.");
> 122:                     } else{
> 123:                         reply.print("The maintainer approval request is already up to date. Please wait for maintainers to process this request.");

Suggestion:

                        reply.print("The approval request was already up to date.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 127:

> 125:                 } else {
> 126:                     issueTrackerIssue.addComment(messageToPost);
> 127:                     reply.print("The maintainer approval request has been created successfully! Please wait for maintainers to process this request.");

Suggestion:

                    reply.print("The approval request has been created successfully.");


it would be neat to link to the created comment in each of these messages. We could move `commentUrl(Comment)` to `Issue`. Then the word `request` can be made into a link.

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 149:

> 147:                 return Optional.empty();
> 148:             } else {
> 149:                 reply.print("There are multiple issues associated with this pull request. Please specify an issue ID in your command.");

Suggestion:

                reply.print("There are multiple issues associated with this pull request, you need to request approval for each one individually.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 155:

> 153:         Issue issue = new Issue(issueId, null);
> 154:         if (!issues.contains(issue.shortId())) {
> 155:             reply.print("Can only request approval for issues that this pr solves.");

Suggestion:

            reply.print("Approval can only be requested for issues that this pull request solves.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java line 53:

> 51:     public void handle(PullRequestBot bot, PullRequest pr, CensusInstance censusInstance, ScratchArea scratchArea, CommandInvocation command, List<Comment> allComments, PrintWriter reply) {
> 52:         if (!bot.integrators().contains(command.user().username())) {
> 53:             reply.println("Only integrators of this repo are allowed to issue the `/approve` command.");

Suggestion:

            reply.println("Only integrators for this repository are allowed to issue the `/approve` command.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java line 61:

> 59:             reply.println("This target branch doesn't need maintainer approval.");
> 60:             return;
> 61:         }

Same comment as for ApprovalCommand.

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java line 78:

> 76: 
> 77:         if (issue.project().isPresent() && !issue.project().get().equalsIgnoreCase(issueProject.name())) {
> 78:             reply.print("Can only approve issues in " + issueProject.name() + "!");

Suggestion:

            reply.print("Can only approve issues in the " + issueProject.name() + " project.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java line 84:

> 82:         var issueTrackerIssueOpt = issueProject.issue(issue.shortId());
> 83:         if (issueTrackerIssueOpt.isEmpty()) {
> 84:             reply.print("Can not find " + issue.id() + " in " + issueProject.name() + ".");

Suggestion:

            reply.print("Can not find " + issue.id() + " in the " + issueProject.name() + " project.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java line 94:

> 92:             issueTrackerIssue.removeLabel(rejectedLabel);
> 93:             issueTrackerIssue.addLabel(approvedLabel);
> 94:             reply.print("The maintainer approval request has been approved!");

Suggestion:

            reply.print("The approval request has been approved.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java line 98:

> 96:             issueTrackerIssue.removeLabel(approvedLabel);
> 97:             issueTrackerIssue.addLabel(rejectedLabel);
> 98:             reply.print("The maintainer approval request has been rejected!");

Suggestion:

            reply.print("The approval request has been rejected.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1527:

> 1525:         String message = "??  @" + pr.author().username() +
> 1526:                 " This change is now ready for you to apply for maintainer [approval](" + approval.documentLink() + ").\n" +
> 1527:                 "To learn how to apply for approval using the Skara command, please refer to this [link](" + approval.commandLink() + ")." +

No need for a configurable link for the command documentation. See the mergeReadyComment for appropriate style. I would suggest the following:
Suggestion:

                " This change is now ready for you to apply for maintainer [approval](" + approval.documentLink() + "). " +
                "This can be done directly in each associated issue or by using the " +
                "[/approval](https://wiki.openjdk.org/display/SKARA/Pull+Request+Commands#PullRequestCommands-/approval) " + 
                "command" +

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295877549
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295926108
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295975508
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295952939
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295939507
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295942837
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295943968
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295944602
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295945966
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295950651
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295961493
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295970257
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295963233
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295963717
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295888716
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295892368
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295894223
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295971578
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295973999
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295975003
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295976486
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295976801
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1295860313

From zsong at openjdk.org  Wed Aug 16 16:42:53 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 16 Aug 2023 16:42:53 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request
In-Reply-To: <daqXVrXBrp2Spyg00jT7JWAIcIeH_8Wz2FbviThtalM=.3b01bf73-ad8c-433e-92c5-b2280fc06a95@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
 <daqXVrXBrp2Spyg00jT7JWAIcIeH_8Wz2FbviThtalM=.3b01bf73-ad8c-433e-92c5-b2280fc06a95@github.com>
Message-ID: <21ZyBBNaQmPcc7b_5Unof26daxS7BiP9sCHekSnCs0c=.3c15905f-25d6-46f4-a158-46231fbcf476@github.com>

On Wed, 16 Aug 2023 12:40:48 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> > Only maintainers of the repo are allowed to issue this command. Maintainers can approve or reject the approval whether the request exists.
> 
> I don't think we should allow approve without a request (unless the current maintainers agree they want it to work that way).
> 
> > If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.
> 
> At least for the /approve command, running without an issue id should approve all associated issues that have approval requested. One of the main reasons for allowing approve from PR is to automatically handle multiple bugs.

Will fix the issues you mentioned. Also thanks for improving the messages.

-------------

PR Comment: https://git.openjdk.org/skara/pull/1544#issuecomment-1680936944

From zsong at openjdk.org  Wed Aug 16 21:08:10 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 16 Aug 2023 21:08:10 GMT
Subject: RFR: 1995: The logic for getting repository name and branch name in
 the backport pr command is inconsistent
Message-ID: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>

In the backport pull request command, the process of getting the repository name and branch name differs between cancelling a backport request and creating a backport request. 

In this patch, I made the logic consistent.

-------------

Commit messages:
 - SKARA-1995

Changes: https://git.openjdk.org/skara/pull/1545/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1545&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1995
  Stats: 21 lines in 1 file changed: 10 ins; 1 del; 10 mod
  Patch: https://git.openjdk.org/skara/pull/1545.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1545/head:pull/1545

PR: https://git.openjdk.org/skara/pull/1545

From rybak.a.v at gmail.com  Wed Aug 16 21:26:40 2023
From: rybak.a.v at gmail.com (Andrei Rybak)
Date: Wed, 16 Aug 2023 23:26:40 +0200
Subject: gitattributes: make diffs easier to read
Message-ID: <90a9a216-d35a-0b2c-b0ef-a8af520bccd4@gmail.com>

Hello skara-dev mailing list,

I would like to propose a change to the root .gitattributes file in the
main-line JDK repository, which would make Git produce diffs, which are
slightly nicer to read.  The proposed change is to add:

     *.java  diff=java
     *.c     diff=cpp
     *.h     diff=cpp
     *.cpp   diff=cpp
     *.hpp   diff=cpp
     *.md    diff=markdown
     *.sh    diff=bash
     *.html  diff=html
     *.css   diff=css

to the file.  This list of file extensions and corresponding values for
attribute "diff" was chosen based on the currently available built in
patterns for custom hunk-headers.  For details about the "diff" attribute
and the list of built in patterns see section "Generating diff text" of
`git help gitattributes`, also available online.[1]

As far as I can tell, the only other time .gitattributes files were
edited in the main-line JDK repository is JDK-8241768.[2]  I CC'd people
involved in the development of that issue.  Mailing list skara-dev seemed
like the most appropriate place to "Socialize your change".[3]  Please do
let me know if another mailing list is better suited for this proposal.

The proposed change is also available on GitHub, with an example of
how these hunk-headers will look like in the commit message.[4]

[1] https://git-scm.com/docs/gitattributes#_generating_diff_text
[2] issue:  https://bugs.openjdk.org/browse/JDK-8241768
     commit: https://git.openjdk.org/jdk/commit/49a9d49dbdb1d17aa4e6b808de6249be543961ea
[3] https://openjdk.org/guide/#socialize-your-change
[4] https://github.com/openjdk/jdk/compare/master...rybak:openjdk:gitattributes-diff

From zsong at openjdk.org  Thu Aug 17 03:03:28 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 03:03:28 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request [v2]
In-Reply-To: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
Message-ID: <tvqizAwjwLHW7skF1kyOKadNi9vZwo7r2uvlfZ92WGk=.da592d7e-bd01-4254-9aca-398ee50bf519@github.com>

> As Erik said in the issue, "In SKARA-1199, we added the optional ability for a PR to block integration until a certain approval label appears on all the associated bugs. To further improve the workflow, we would like to add a couple of PR commands that will make it possible to perform the whole maintainer approval workflow through the PR"
> 
> Therefore, in this patch, two pull request commands(`/approval` and `/approve`) are introduced.
> 
> 1. Command `/approval`
> Usage: `/approval [<id>] (request|cancel) [<text>]`
> Examples: `/approval request my reason`, `/approval cancel`, 
>                  `/approval JDK-123 request my reason`, `/approval 123 cancel`
> 
> Only the author of the pull request is allowed to issue this command. If the user requested approval, the text will be posted to the bug. The user will be able to update the text by requesting the approval again. Once maintainer processed the request(approved or rejected), the user will not be able to request or cancel the approval.
> 
> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.
> 
> 2. Command `/approve`
> Usage: `/approve [<id>] (yes|no)`
> Examples: `/approve yes`, `/approve no`, `/approve JDK-123 yes`, `/approve 123 no`
> 
> Only maintainers of the repo are allowed to issue this command. Maintainers can not approve or reject the approval if the request doesn't exist.
> 
> If the user doesn't specify the issue id in the command, then all the approval request in issues associated with pull request will be handled.

Zhao Song has updated the pull request incrementally with 21 additional commits since the last revision:

 - update
 - fix test
 - reviewComment
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
 - ... and 11 more: https://git.openjdk.org/skara/compare/aab28673...e488acc6

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1544/files
  - new: https://git.openjdk.org/skara/pull/1544/files/aab28673..e488acc6

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1544&range=01
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1544&range=00-01

  Stats: 261 lines in 13 files changed: 184 ins; 11 del; 66 mod
  Patch: https://git.openjdk.org/skara/pull/1544.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1544/head:pull/1544

PR: https://git.openjdk.org/skara/pull/1544

From erik.joelsson at oracle.com  Thu Aug 17 13:55:34 2023
From: erik.joelsson at oracle.com (erik.joelsson at oracle.com)
Date: Thu, 17 Aug 2023 06:55:34 -0700
Subject: gitattributes: make diffs easier to read
In-Reply-To: <90a9a216-d35a-0b2c-b0ef-a8af520bccd4@gmail.com>
References: <90a9a216-d35a-0b2c-b0ef-a8af520bccd4@gmail.com>
Message-ID: <faa7f9a0-bdb0-9499-da79-538138fde02b@oracle.com>

Hello Andrei,

This seems like a reasonable addition to .gitattributes. As far as I'm 
concerned, you can go ahead and create a PR.

/Erik

On 8/16/23 14:26, Andrei Rybak wrote:
> Hello skara-dev mailing list,
>
> I would like to propose a change to the root .gitattributes file in the
> main-line JDK repository, which would make Git produce diffs, which are
> slightly nicer to read.? The proposed change is to add:
>
> ??? *.java? diff=java
> ??? *.c???? diff=cpp
> ??? *.h???? diff=cpp
> ??? *.cpp?? diff=cpp
> ??? *.hpp?? diff=cpp
> ??? *.md??? diff=markdown
> ??? *.sh??? diff=bash
> ??? *.html? diff=html
> ??? *.css?? diff=css
>
> to the file.? This list of file extensions and corresponding values for
> attribute "diff" was chosen based on the currently available built in
> patterns for custom hunk-headers.? For details about the "diff" attribute
> and the list of built in patterns see section "Generating diff text" of
> `git help gitattributes`, also available online.[1]
>
> As far as I can tell, the only other time .gitattributes files were
> edited in the main-line JDK repository is JDK-8241768.[2]? I CC'd people
> involved in the development of that issue.? Mailing list skara-dev seemed
> like the most appropriate place to "Socialize your change".[3] Please do
> let me know if another mailing list is better suited for this proposal.
>
> The proposed change is also available on GitHub, with an example of
> how these hunk-headers will look like in the commit message.[4]
>
> [1] https://git-scm.com/docs/gitattributes#_generating_diff_text
> [2] issue:? https://bugs.openjdk.org/browse/JDK-8241768
> ??? commit: 
> https://git.openjdk.org/jdk/commit/49a9d49dbdb1d17aa4e6b808de6249be543961ea
> [3] https://openjdk.org/guide/#socialize-your-change
> [4] 
> https://github.com/openjdk/jdk/compare/master...rybak:openjdk:gitattributes-diff

From erikj at openjdk.org  Thu Aug 17 15:21:12 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 17 Aug 2023 15:21:12 GMT
Subject: RFR: 1995: The logic for getting repository name and branch name
 in the backport pr command is inconsistent
In-Reply-To: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
References: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
Message-ID: <L8JpQLO5arx8WUchJWOeW1GSGvynLWT4jmNpWEdx3gA=.9cea8132-18b1-4c6c-ba44-51ea591c1bae@github.com>

On Wed, 16 Aug 2023 20:32:34 GMT, Zhao Song <zsong at openjdk.org> wrote:

> In the backport pull request command, the process of getting the repository name and branch name differs between cancelling a backport request and creating a backport request. 
> 
> In this patch, I made the logic consistent.

bots/pr/src/main/java/org/openjdk/skara/bots/pr/BackportCommand.java line 185:

> 183:     }
> 184: 
> 185:     private Branch getTargetBranch(String targetBranchName, HostedRepository targetRepo, PrintWriter reply) {

I don't like how the string `"master"` is now repeated in three places. Could we move that check back here? We could add the parts index as a parameter to this method and supply the full array.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1545#discussion_r1297377137

From zsong at openjdk.org  Thu Aug 17 16:01:00 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 16:01:00 GMT
Subject: RFR: 1995: The logic for getting repository name and branch name
 in the backport pr command is inconsistent
In-Reply-To: <L8JpQLO5arx8WUchJWOeW1GSGvynLWT4jmNpWEdx3gA=.9cea8132-18b1-4c6c-ba44-51ea591c1bae@github.com>
References: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
 <L8JpQLO5arx8WUchJWOeW1GSGvynLWT4jmNpWEdx3gA=.9cea8132-18b1-4c6c-ba44-51ea591c1bae@github.com>
Message-ID: <Ts0pBcmChBpV6NMVkx_knKhIspP8qap6UJkL5_SWGA8=.40418004-947d-4bf7-9cd1-07c44fb56618@github.com>

On Thu, 17 Aug 2023 15:18:54 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> In the backport pull request command, the process of getting the repository name and branch name differs between cancelling a backport request and creating a backport request. 
>> 
>> In this patch, I made the logic consistent.
>
> bots/pr/src/main/java/org/openjdk/skara/bots/pr/BackportCommand.java line 185:
> 
>> 183:     }
>> 184: 
>> 185:     private Branch getTargetBranch(String targetBranchName, HostedRepository targetRepo, PrintWriter reply) {
> 
> I don't like how the string `"master"` is now repeated in three places. Could we move that check back here? We could add the parts index as a parameter to this method and supply the full array.

Sure. It's a good idea.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1545#discussion_r1297431458

From zsong at openjdk.org  Thu Aug 17 16:17:11 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 16:17:11 GMT
Subject: RFR: 1995: The logic for getting repository name and branch name
 in the backport pr command is inconsistent [v2]
In-Reply-To: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
References: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
Message-ID: <_21TVj4edIJ7pUeg0I5zsdrJo8gd4S9yQ5Yod3T7sZ4=.f46d231e-a714-4c70-a36e-b7d8c8d30613@github.com>

> In the backport pull request command, the process of getting the repository name and branch name differs between cancelling a backport request and creating a backport request. 
> 
> In this patch, I made the logic consistent.

Zhao Song has updated the pull request incrementally with one additional commit since the last revision:

  update

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1545/files
  - new: https://git.openjdk.org/skara/pull/1545/files/deadb096..182fb51f

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1545&range=01
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1545&range=00-01

  Stats: 6 lines in 1 file changed: 2 ins; 0 del; 4 mod
  Patch: https://git.openjdk.org/skara/pull/1545.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1545/head:pull/1545

PR: https://git.openjdk.org/skara/pull/1545

From erikj at openjdk.org  Thu Aug 17 16:40:35 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 17 Aug 2023 16:40:35 GMT
Subject: RFR: 1995: The logic for getting repository name and branch name
 in the backport pr command is inconsistent [v2]
In-Reply-To: <_21TVj4edIJ7pUeg0I5zsdrJo8gd4S9yQ5Yod3T7sZ4=.f46d231e-a714-4c70-a36e-b7d8c8d30613@github.com>
References: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
 <_21TVj4edIJ7pUeg0I5zsdrJo8gd4S9yQ5Yod3T7sZ4=.f46d231e-a714-4c70-a36e-b7d8c8d30613@github.com>
Message-ID: <duhaYPY0JhB85_d2l9iReS0ndclkeVmKMoCauOowCQM=.7929d5f1-99fd-44d2-92db-8d26d5e4d4da@github.com>

On Thu, 17 Aug 2023 16:17:11 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> In the backport pull request command, the process of getting the repository name and branch name differs between cancelling a backport request and creating a backport request. 
>> 
>> In this patch, I made the logic consistent.
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   update

Marked as reviewed by erikj (Lead).

-------------

PR Review: https://git.openjdk.org/skara/pull/1545#pullrequestreview-1583025274

From zsong at openjdk.org  Thu Aug 17 16:45:47 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 16:45:47 GMT
Subject: RFR: 1995: The logic for getting repository name and branch name
 in the backport pr command is inconsistent [v3]
In-Reply-To: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
References: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
Message-ID: <LVKtccz2-wf1XY4J8Gz14nGWfOOI8zZe7Df6FuCRstY=.712682cf-d100-47eb-9cab-b0d35f77da94@github.com>

> In the backport pull request command, the process of getting the repository name and branch name differs between cancelling a backport request and creating a backport request. 
> 
> In this patch, I made the logic consistent.

Zhao Song has updated the pull request incrementally with one additional commit since the last revision:

  fix import

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1545/files
  - new: https://git.openjdk.org/skara/pull/1545/files/182fb51f..0a4bfa3e

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1545&range=02
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1545&range=01-02

  Stats: 1 line in 1 file changed: 0 ins; 1 del; 0 mod
  Patch: https://git.openjdk.org/skara/pull/1545.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1545/head:pull/1545

PR: https://git.openjdk.org/skara/pull/1545

From erikj at openjdk.org  Thu Aug 17 16:49:37 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 17 Aug 2023 16:49:37 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request [v2]
In-Reply-To: <tvqizAwjwLHW7skF1kyOKadNi9vZwo7r2uvlfZ92WGk=.da592d7e-bd01-4254-9aca-398ee50bf519@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
 <tvqizAwjwLHW7skF1kyOKadNi9vZwo7r2uvlfZ92WGk=.da592d7e-bd01-4254-9aca-398ee50bf519@github.com>
Message-ID: <qcQdK7Qpp-N4jixFzQsczQLTKLAiIMouDNF-NAe-ssg=.281b6dfa-c6f8-4b3c-9959-985144d9dce5@github.com>

On Thu, 17 Aug 2023 03:03:28 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> As Erik said in the issue, "In SKARA-1199, we added the optional ability for a PR to block integration until a certain approval label appears on all the associated bugs. To further improve the workflow, we would like to add a couple of PR commands that will make it possible to perform the whole maintainer approval workflow through the PR"
>> 
>> Therefore, in this patch, two pull request commands(`/approval` and `/approve`) are introduced.
>> 
>> 1. Command `/approval`
>> Usage: `/approval [<id>] (request|cancel) [<text>]`
>> Examples: `/approval request my reason`, `/approval cancel`, 
>>                  `/approval JDK-123 request my reason`, `/approval 123 cancel`
>> 
>> Only the author of the pull request is allowed to issue this command. If the user requested approval, the text will be posted to the bug. The user will be able to update the text by requesting the approval again. Once maintainer processed the request(approved or rejected), the user will not be able to request or cancel the approval.
>> 
>> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.
>> 
>> 2. Command `/approve`
>> Usage: `/approve [<id>] (yes|no)`
>> Examples: `/approve yes`, `/approve no`, `/approve JDK-123 yes`, `/approve 123 no`
>> 
>> Only maintainers of the repo are allowed to issue this command. Maintainers can not approve or reject the approval if the request doesn't exist.
>> 
>> If the user doesn't specify the issue id in the command, then all the approval request in issues associated with pull request will be handled.
>
> Zhao Song has updated the pull request incrementally with 21 additional commits since the last revision:
> 
>  - update
>  - fix test
>  - reviewComment
>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
>    
>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
>    
>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java
>    
>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
>    
>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
>    
>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java
>    
>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java
>    
>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>  - ... and 11 more: https://git.openjdk.org/skara/compare/aab28673...e488acc6

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 85:

> 83: 
> 84:         if (issue.project().isPresent() && !issue.project().get().equalsIgnoreCase(issueProject.name())) {
> 85:             reply.println("Approval can only be request for issues in the " + issueProject.name() + " project.");

Suggestion:

            reply.println("Approval can only be requested for issues in the " + issueProject.name() + " project.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 126:

> 124:                         reply.println("The approval [request](" + issueTrackerIssue.commentUrl(comment) + ") has been updated successfully.");
> 125:                     } else {
> 126:                         reply.println("The approval request was already up to date.");

Should link here too.

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java line 135:

> 133:                 ret.add(issue);
> 134:             } else {
> 135:                 reply.println("You can only handle approval request in issues that this pull request solves.");

Suggestion:

                reply.println("You can only handle approval request for issues that this pull request solves.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1529:

> 1527:                 "This can be done directly in each associated issue or by using the " +
> 1528:                 "[/approval](https://wiki.openjdk.org/display/SKARA/Pull+Request+Commands#PullRequestCommands-/approval) " +
> 1529:                 "command" +

Suggestion:

                "command." +

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1297477417
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1297479242
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1297483418
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1297484755

From erikj at openjdk.org  Thu Aug 17 16:50:16 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 17 Aug 2023 16:50:16 GMT
Subject: RFR: 1995: The logic for getting repository name and branch name
 in the backport pr command is inconsistent [v3]
In-Reply-To: <LVKtccz2-wf1XY4J8Gz14nGWfOOI8zZe7Df6FuCRstY=.712682cf-d100-47eb-9cab-b0d35f77da94@github.com>
References: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
 <LVKtccz2-wf1XY4J8Gz14nGWfOOI8zZe7Df6FuCRstY=.712682cf-d100-47eb-9cab-b0d35f77da94@github.com>
Message-ID: <OkE55RTDFSKheGrZz6GwUCieegmDM6wBJ34zLZU0XWE=.238452ff-5576-4a28-a7d3-895a54a255f8@github.com>

On Thu, 17 Aug 2023 16:45:47 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> In the backport pull request command, the process of getting the repository name and branch name differs between cancelling a backport request and creating a backport request. 
>> 
>> In this patch, I made the logic consistent.
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   fix import

Marked as reviewed by erikj (Lead).

-------------

PR Review: https://git.openjdk.org/skara/pull/1545#pullrequestreview-1583040134

From zsong at openjdk.org  Thu Aug 17 16:56:42 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 16:56:42 GMT
Subject: RFR: 1995: The logic for getting repository name and branch name
 in the backport pr command is inconsistent [v3]
In-Reply-To: <LVKtccz2-wf1XY4J8Gz14nGWfOOI8zZe7Df6FuCRstY=.712682cf-d100-47eb-9cab-b0d35f77da94@github.com>
References: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
 <LVKtccz2-wf1XY4J8Gz14nGWfOOI8zZe7Df6FuCRstY=.712682cf-d100-47eb-9cab-b0d35f77da94@github.com>
Message-ID: <yzV19oLsMqfNgRKPVmf3670P7Tw7mTfk9sw8rIeZcwI=.0034f1f0-f31e-4b0e-a67f-e44574798486@github.com>

On Thu, 17 Aug 2023 16:45:47 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> In the backport pull request command, the process of getting the repository name and branch name differs between cancelling a backport request and creating a backport request. 
>> 
>> In this patch, I made the logic consistent.
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   fix import

Thanks for the review!

-------------

PR Comment: https://git.openjdk.org/skara/pull/1545#issuecomment-1682634033

From zsong at openjdk.org  Thu Aug 17 16:56:42 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 16:56:42 GMT
Subject: Integrated: 1995: The logic for getting repository name and branch
 name in the backport pr command is inconsistent
In-Reply-To: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
References: <JKJogtRtJVksGDpCnwOSwwPBgsvzm-OVk26WMI5M4OU=.4b6ed42f-98d2-4853-8ddb-1b654e047795@github.com>
Message-ID: <5zPTMTiCbzo75aTMPdVlxQdFWGQMJGnRQd9NLCiK32Q=.b444e025-1756-4209-8fcd-665c23964962@github.com>

On Wed, 16 Aug 2023 20:32:34 GMT, Zhao Song <zsong at openjdk.org> wrote:

> In the backport pull request command, the process of getting the repository name and branch name differs between cancelling a backport request and creating a backport request. 
> 
> In this patch, I made the logic consistent.

This pull request has now been integrated.

Changeset: 924a0a0e
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/924a0a0e5ba2ac1c390a20a6355ce9f6157784d5
Stats:     21 lines in 1 file changed: 10 ins; 0 del; 11 mod

1995: The logic for getting repository name and branch name in the backport pr command is inconsistent

Reviewed-by: erikj

-------------

PR: https://git.openjdk.org/skara/pull/1545

From zsong at openjdk.org  Thu Aug 17 16:59:44 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 16:59:44 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request [v3]
In-Reply-To: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
Message-ID: <TO-TTSj7V1qhPthaIFmy659AHtSNL0_Kww7MMYk4TPg=.260ef0bb-8ed5-4ef2-acfa-7f87390d4d84@github.com>

> As Erik said in the issue, "In SKARA-1199, we added the optional ability for a PR to block integration until a certain approval label appears on all the associated bugs. To further improve the workflow, we would like to add a couple of PR commands that will make it possible to perform the whole maintainer approval workflow through the PR"
> 
> Therefore, in this patch, two pull request commands(`/approval` and `/approve`) are introduced.
> 
> 1. Command `/approval`
> Usage: `/approval [<id>] (request|cancel) [<text>]`
> Examples: `/approval request my reason`, `/approval cancel`, 
>                  `/approval JDK-123 request my reason`, `/approval 123 cancel`
> 
> Only the author of the pull request is allowed to issue this command. If the user requested approval, the text will be posted to the bug. The user will be able to update the text by requesting the approval again. Once maintainer processed the request(approved or rejected), the user will not be able to request or cancel the approval.
> 
> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.
> 
> 2. Command `/approve`
> Usage: `/approve [<id>] (yes|no)`
> Examples: `/approve yes`, `/approve no`, `/approve JDK-123 yes`, `/approve 123 no`
> 
> Only maintainers of the repo are allowed to issue this command. Maintainers can not approve or reject the approval if the request doesn't exist.
> 
> If the user doesn't specify the issue id in the command, then all the approval request in issues associated with pull request will be handled.

Zhao Song has updated the pull request incrementally with three additional commits since the last revision:

 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1544/files
  - new: https://git.openjdk.org/skara/pull/1544/files/e488acc6..74316513

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1544&range=02
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1544&range=01-02

  Stats: 3 lines in 3 files changed: 0 ins; 0 del; 3 mod
  Patch: https://git.openjdk.org/skara/pull/1544.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1544/head:pull/1544

PR: https://git.openjdk.org/skara/pull/1544

From zsong at openjdk.org  Thu Aug 17 16:59:45 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 16:59:45 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request [v2]
In-Reply-To: <qcQdK7Qpp-N4jixFzQsczQLTKLAiIMouDNF-NAe-ssg=.281b6dfa-c6f8-4b3c-9959-985144d9dce5@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
 <tvqizAwjwLHW7skF1kyOKadNi9vZwo7r2uvlfZ92WGk=.da592d7e-bd01-4254-9aca-398ee50bf519@github.com>
 <qcQdK7Qpp-N4jixFzQsczQLTKLAiIMouDNF-NAe-ssg=.281b6dfa-c6f8-4b3c-9959-985144d9dce5@github.com>
Message-ID: <Du9Ko07heK-fc42NtIFDCoWC0Iiu0-uGnkDsF2CZV2U=.aba700cb-832c-4234-ac11-4d34998283b3@github.com>

On Thu, 17 Aug 2023 16:41:28 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Zhao Song has updated the pull request incrementally with 21 additional commits since the last revision:
>> 
>>  - update
>>  - fix test
>>  - reviewComment
>>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
>>    
>>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
>>    
>>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java
>>    
>>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
>>    
>>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
>>    
>>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java
>>    
>>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java
>>    
>>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>
>>  - ... and 11 more: https://git.openjdk.org/skara/compare/aab28673...e488acc6
>
> bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApprovalCommand.java line 126:
> 
>> 124:                         reply.println("The approval [request](" + issueTrackerIssue.commentUrl(comment) + ") has been updated successfully.");
>> 125:                     } else {
>> 126:                         reply.println("The approval request was already up to date.");
> 
> Should link here too.

Sure

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1297493265

From rybak.a.v at gmail.com  Thu Aug 17 17:57:27 2023
From: rybak.a.v at gmail.com (Andrei Rybak)
Date: Thu, 17 Aug 2023 19:57:27 +0200
Subject: gitattributes: make diffs easier to read
In-Reply-To: <faa7f9a0-bdb0-9499-da79-538138fde02b@oracle.com>
References: <90a9a216-d35a-0b2c-b0ef-a8af520bccd4@gmail.com>
 <faa7f9a0-bdb0-9499-da79-538138fde02b@oracle.com>
Message-ID: <47b92482-4e40-b899-cc27-2156ab667a19@gmail.com>

On 17/08/2023 15:55, erik.joelsson at oracle.com wrote:
> Hello Andrei,
> 
> This seems like a reasonable addition to .gitattributes. As far as I'm 
> concerned, you can go ahead and create a PR.
PR has been created: https://github.com/openjdk/jdk/pull/15334

It would seem that I now need a sponsor to create a tracking issue in JBS
to proceed.

From zsong at openjdk.org  Thu Aug 17 18:37:09 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 18:37:09 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request [v4]
In-Reply-To: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
Message-ID: <4UqgEB6N9Y3-GXNRYhFsgW6YWAkBfYqtUsDVwzDKNdY=.a5ae1f6b-81f4-4ca7-8d69-8890d430c214@github.com>

> As Erik said in the issue, "In SKARA-1199, we added the optional ability for a PR to block integration until a certain approval label appears on all the associated bugs. To further improve the workflow, we would like to add a couple of PR commands that will make it possible to perform the whole maintainer approval workflow through the PR"
> 
> Therefore, in this patch, two pull request commands(`/approval` and `/approve`) are introduced.
> 
> 1. Command `/approval`
> Usage: `/approval [<id>] (request|cancel) [<text>]`
> Examples: `/approval request my reason`, `/approval cancel`, 
>                  `/approval JDK-123 request my reason`, `/approval 123 cancel`
> 
> Only the author of the pull request is allowed to issue this command. If the user requested approval, the text will be posted to the bug. The user will be able to update the text by requesting the approval again. Once maintainer processed the request(approved or rejected), the user will not be able to request or cancel the approval.
> 
> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.
> 
> 2. Command `/approve`
> Usage: `/approve [<id>] (yes|no)`
> Examples: `/approve yes`, `/approve no`, `/approve JDK-123 yes`, `/approve 123 no`
> 
> Only maintainers of the repo are allowed to issue this command. Maintainers can not approve or reject the approval if the request doesn't exist.
> 
> If the user doesn't specify the issue id in the command, then all the approval request in issues associated with pull request will be handled.

Zhao Song has updated the pull request incrementally with two additional commits since the last revision:

 - update
 - update

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1544/files
  - new: https://git.openjdk.org/skara/pull/1544/files/74316513..5105d7dd

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1544&range=03
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1544&range=02-03

  Stats: 20 lines in 4 files changed: 9 ins; 6 del; 5 mod
  Patch: https://git.openjdk.org/skara/pull/1544.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1544/head:pull/1544

PR: https://git.openjdk.org/skara/pull/1544

From erikj at openjdk.org  Thu Aug 17 19:59:16 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 17 Aug 2023 19:59:16 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request [v4]
In-Reply-To: <4UqgEB6N9Y3-GXNRYhFsgW6YWAkBfYqtUsDVwzDKNdY=.a5ae1f6b-81f4-4ca7-8d69-8890d430c214@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
 <4UqgEB6N9Y3-GXNRYhFsgW6YWAkBfYqtUsDVwzDKNdY=.a5ae1f6b-81f4-4ca7-8d69-8890d430c214@github.com>
Message-ID: <SNzEFRoj7ZWNfrpHg5IiBTGHg4BUjJ7gpKlz5gTVS7c=.3c22a9ae-5b6f-40c3-9682-1fc85154815c@github.com>

On Thu, 17 Aug 2023 18:37:09 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> As Erik said in the issue, "In SKARA-1199, we added the optional ability for a PR to block integration until a certain approval label appears on all the associated bugs. To further improve the workflow, we would like to add a couple of PR commands that will make it possible to perform the whole maintainer approval workflow through the PR"
>> 
>> Therefore, in this patch, two pull request commands(`/approval` and `/approve`) are introduced.
>> 
>> 1. Command `/approval`
>> Usage: `/approval [<id>] (request|cancel) [<text>]`
>> Examples: `/approval request my reason`, `/approval cancel`, 
>>                  `/approval JDK-123 request my reason`, `/approval 123 cancel`
>> 
>> Only the author of the pull request is allowed to issue this command. If the user requested approval, the text will be posted to the bug. The user will be able to update the text by requesting the approval again. Once maintainer processed the request(approved or rejected), the user will not be able to request or cancel the approval.
>> 
>> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.
>> 
>> 2. Command `/approve`
>> Usage: `/approve [<id>] (yes|no)`
>> Examples: `/approve yes`, `/approve no`, `/approve JDK-123 yes`, `/approve 123 no`
>> 
>> Only maintainers of the repo are allowed to issue this command. Maintainers can not approve or reject the approval if the request doesn't exist.
>> 
>> If the user doesn't specify the issue id in the command, then all the approval request in issues associated with pull request will be handled.
>
> Zhao Song has updated the pull request incrementally with two additional commits since the last revision:
> 
>  - update
>  - update

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java line 135:

> 133:                 ret.add(issue);
> 134:             } else {
> 135:                 reply.println("You can only handle approval request for issues that this pull request solves.");

Sorry, I missed this earlier.

Suggestion:

                reply.println("You can only handle approval requests for issues that this pull request solves.");

bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 682:

> 680:             progressBody.append("\n");
> 681: 
> 682:             var existingRequested = false;

This variable name confuses me. I would suggest `requestPresent`.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1297676177
PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1297677691

From zsong at openjdk.org  Thu Aug 17 20:08:00 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 20:08:00 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request [v5]
In-Reply-To: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
Message-ID: <EmdbUmRhadP314ifGc17CBd-J8aljZ460YZO05FNVcw=.f25944cd-a63b-4cf1-9a7d-31785b825cfa@github.com>

> As Erik said in the issue, "In SKARA-1199, we added the optional ability for a PR to block integration until a certain approval label appears on all the associated bugs. To further improve the workflow, we would like to add a couple of PR commands that will make it possible to perform the whole maintainer approval workflow through the PR"
> 
> Therefore, in this patch, two pull request commands(`/approval` and `/approve`) are introduced.
> 
> 1. Command `/approval`
> Usage: `/approval [<id>] (request|cancel) [<text>]`
> Examples: `/approval request my reason`, `/approval cancel`, 
>                  `/approval JDK-123 request my reason`, `/approval 123 cancel`
> 
> Only the author of the pull request is allowed to issue this command. If the user requested approval, the text will be posted to the bug. The user will be able to update the text by requesting the approval again. Once maintainer processed the request(approved or rejected), the user will not be able to request or cancel the approval.
> 
> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.
> 
> 2. Command `/approve`
> Usage: `/approve [<id>] (yes|no)`
> Examples: `/approve yes`, `/approve no`, `/approve JDK-123 yes`, `/approve 123 no`
> 
> Only maintainers of the repo are allowed to issue this command. Maintainers can not approve or reject the approval if the request doesn't exist.
> 
> If the user doesn't specify the issue id in the command, then all the approval request in issues associated with pull request will be handled.

Zhao Song has updated the pull request incrementally with two additional commits since the last revision:

 - update
 - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
   
   Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1544/files
  - new: https://git.openjdk.org/skara/pull/1544/files/5105d7dd..453418a3

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1544&range=04
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1544&range=03-04

  Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod
  Patch: https://git.openjdk.org/skara/pull/1544.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1544/head:pull/1544

PR: https://git.openjdk.org/skara/pull/1544

From zsong at openjdk.org  Thu Aug 17 20:08:01 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 20:08:01 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request [v4]
In-Reply-To: <SNzEFRoj7ZWNfrpHg5IiBTGHg4BUjJ7gpKlz5gTVS7c=.3c22a9ae-5b6f-40c3-9682-1fc85154815c@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
 <4UqgEB6N9Y3-GXNRYhFsgW6YWAkBfYqtUsDVwzDKNdY=.a5ae1f6b-81f4-4ca7-8d69-8890d430c214@github.com>
 <SNzEFRoj7ZWNfrpHg5IiBTGHg4BUjJ7gpKlz5gTVS7c=.3c22a9ae-5b6f-40c3-9682-1fc85154815c@github.com>
Message-ID: <GbtKxzWC6fkGqCekB2xjhsuCbFdUcfHgJKYVXPpCpco=.1d59889a-c683-4ac6-8947-89a86b38b661@github.com>

On Thu, 17 Aug 2023 19:56:42 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Zhao Song has updated the pull request incrementally with two additional commits since the last revision:
>> 
>>  - update
>>  - update
>
> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 682:
> 
>> 680:             progressBody.append("\n");
>> 681: 
>> 682:             var existingRequested = false;
> 
> This variable name confuses me. I would suggest `requestPresent`.

Sure

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1544#discussion_r1297680032

From erikj at openjdk.org  Thu Aug 17 21:31:31 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 17 Aug 2023 21:31:31 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request [v5]
In-Reply-To: <EmdbUmRhadP314ifGc17CBd-J8aljZ460YZO05FNVcw=.f25944cd-a63b-4cf1-9a7d-31785b825cfa@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
 <EmdbUmRhadP314ifGc17CBd-J8aljZ460YZO05FNVcw=.f25944cd-a63b-4cf1-9a7d-31785b825cfa@github.com>
Message-ID: <be8Cd8qWE0SRcADso693bUCCh4Wh8mJTAdfUbEHrdbo=.3e98cf7a-c7d8-47dc-8c6d-98ed1e022544@github.com>

On Thu, 17 Aug 2023 20:08:00 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> As Erik said in the issue, "In SKARA-1199, we added the optional ability for a PR to block integration until a certain approval label appears on all the associated bugs. To further improve the workflow, we would like to add a couple of PR commands that will make it possible to perform the whole maintainer approval workflow through the PR"
>> 
>> Therefore, in this patch, two pull request commands(`/approval` and `/approve`) are introduced.
>> 
>> 1. Command `/approval`
>> Usage: `/approval [<id>] (request|cancel) [<text>]`
>> Examples: `/approval request my reason`, `/approval cancel`, 
>>                  `/approval JDK-123 request my reason`, `/approval 123 cancel`
>> 
>> Only the author of the pull request is allowed to issue this command. If the user requested approval, the text will be posted to the bug. The user will be able to update the text by requesting the approval again. Once maintainer processed the request(approved or rejected), the user will not be able to request or cancel the approval.
>> 
>> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.
>> 
>> 2. Command `/approve`
>> Usage: `/approve [<id>] (yes|no)`
>> Examples: `/approve yes`, `/approve no`, `/approve JDK-123 yes`, `/approve 123 no`
>> 
>> Only maintainers of the repo are allowed to issue this command. Maintainers can not approve or reject the approval if the request doesn't exist.
>> 
>> If the user doesn't specify the issue id in the command, then all the approval request in issues associated with pull request will be handled.
>
> Zhao Song has updated the pull request incrementally with two additional commits since the last revision:
> 
>  - update
>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
>    
>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>

Marked as reviewed by erikj (Lead).

-------------

PR Review: https://git.openjdk.org/skara/pull/1544#pullrequestreview-1583523745

From zsong at openjdk.org  Thu Aug 17 21:51:56 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 21:51:56 GMT
Subject: RFR: 1949: Handle maintainer approval from pull request [v5]
In-Reply-To: <EmdbUmRhadP314ifGc17CBd-J8aljZ460YZO05FNVcw=.f25944cd-a63b-4cf1-9a7d-31785b825cfa@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
 <EmdbUmRhadP314ifGc17CBd-J8aljZ460YZO05FNVcw=.f25944cd-a63b-4cf1-9a7d-31785b825cfa@github.com>
Message-ID: <f1EB7RTJDht9vrIv6vq9jHlTakFfNU60zxw_oNufMEA=.799a975f-3c27-4c27-8def-25ee6bdba4f7@github.com>

On Thu, 17 Aug 2023 20:08:00 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> As Erik said in the issue, "In SKARA-1199, we added the optional ability for a PR to block integration until a certain approval label appears on all the associated bugs. To further improve the workflow, we would like to add a couple of PR commands that will make it possible to perform the whole maintainer approval workflow through the PR"
>> 
>> Therefore, in this patch, two pull request commands(`/approval` and `/approve`) are introduced.
>> 
>> 1. Command `/approval`
>> Usage: `/approval [<id>] (request|cancel) [<text>]`
>> Examples: `/approval request my reason`, `/approval cancel`, 
>>                  `/approval JDK-123 request my reason`, `/approval 123 cancel`
>> 
>> Only the author of the pull request is allowed to issue this command. If the user requested approval, the text will be posted to the bug. The user will be able to update the text by requesting the approval again. Once maintainer processed the request(approved or rejected), the user will not be able to request or cancel the approval.
>> 
>> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.
>> 
>> 2. Command `/approve`
>> Usage: `/approve [<id>] (yes|no)`
>> Examples: `/approve yes`, `/approve no`, `/approve JDK-123 yes`, `/approve 123 no`
>> 
>> Only maintainers of the repo are allowed to issue this command. Maintainers can not approve or reject the approval if the request doesn't exist.
>> 
>> If the user doesn't specify the issue id in the command, then all the approval request in issues associated with pull request will be handled.
>
> Zhao Song has updated the pull request incrementally with two additional commits since the last revision:
> 
>  - update
>  - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ApproveCommand.java
>    
>    Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com>

Thanks for the review!

-------------

PR Comment: https://git.openjdk.org/skara/pull/1544#issuecomment-1683024428

From zsong at openjdk.org  Thu Aug 17 21:51:56 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 17 Aug 2023 21:51:56 GMT
Subject: Integrated: 1949: Handle maintainer approval from pull request
In-Reply-To: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
References: <p81q-8lCDxkeEu0bl8QRRrqIJNQjKSSU13V9Vppob_I=.969e558d-50fc-4e36-a471-be9c22cba1eb@github.com>
Message-ID: <6-j9ZWYkwtI6yrt-15I6EgvbF81RN3aB9b37RWzTxTg=.caa208ab-5f99-43ad-9a3e-0ec2239c3ed3@github.com>

On Tue, 15 Aug 2023 22:35:04 GMT, Zhao Song <zsong at openjdk.org> wrote:

> As Erik said in the issue, "In SKARA-1199, we added the optional ability for a PR to block integration until a certain approval label appears on all the associated bugs. To further improve the workflow, we would like to add a couple of PR commands that will make it possible to perform the whole maintainer approval workflow through the PR"
> 
> Therefore, in this patch, two pull request commands(`/approval` and `/approve`) are introduced.
> 
> 1. Command `/approval`
> Usage: `/approval [<id>] (request|cancel) [<text>]`
> Examples: `/approval request my reason`, `/approval cancel`, 
>                  `/approval JDK-123 request my reason`, `/approval 123 cancel`
> 
> Only the author of the pull request is allowed to issue this command. If the user requested approval, the text will be posted to the bug. The user will be able to update the text by requesting the approval again. Once maintainer processed the request(approved or rejected), the user will not be able to request or cancel the approval.
> 
> If there is only one issue associated with the pr, the user will not need to specify the issue id. If there are more than one issues associated with the pr, the user should specify the issue id in the command.
> 
> 2. Command `/approve`
> Usage: `/approve [<id>] (yes|no)`
> Examples: `/approve yes`, `/approve no`, `/approve JDK-123 yes`, `/approve 123 no`
> 
> Only maintainers of the repo are allowed to issue this command. Maintainers can not approve or reject the approval if the request doesn't exist.
> 
> If the user doesn't specify the issue id in the command, then all the approval request in issues associated with pull request will be handled.

This pull request has now been integrated.

Changeset: aed310bf
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/aed310bfdc5df8e3bcc623758fbfdb7d9e971ee2
Stats:     632 lines in 13 files changed: 618 ins; 2 del; 12 mod

1949: Handle maintainer approval from pull request

Reviewed-by: erikj

-------------

PR: https://git.openjdk.org/skara/pull/1544

From zsong at openjdk.org  Mon Aug 21 19:58:07 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 21 Aug 2023 19:58:07 GMT
Subject: RFR: 1999: Only post ApprovalNeededComment after pr is otherwise ready
 for integration
Message-ID: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>

In [SKARA-1199](https://bugs.openjdk.org/browse/SKARA-1199), I made a bug about posting approvalNeededComment. 

Before the bot posting ApprovalNeededComment, we need to make sure this pr could pass all the checks.

-------------

Commit messages:
 - SKARA-1999

Changes: https://git.openjdk.org/skara/pull/1546/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1546&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1999
  Stats: 3 lines in 3 files changed: 2 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/skara/pull/1546.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1546/head:pull/1546

PR: https://git.openjdk.org/skara/pull/1546

From zsong at openjdk.org  Mon Aug 21 20:29:37 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 21 Aug 2023 20:29:37 GMT
Subject: RFR: 1999: Only post ApprovalNeededComment after pr is otherwise
 ready for integration [v2]
In-Reply-To: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>
References: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>
Message-ID: <gJtQGmGn1Eb2QxJ5oISFbdVX-R8bf3jhq7M9YaMEnr8=.7cb04e60-381c-4bb5-9a72-3bc1d2af3547@github.com>

> In [SKARA-1199](https://bugs.openjdk.org/browse/SKARA-1199), I made a bug about posting approvalNeededComment. 
> 
> Before the bot posting ApprovalNeededComment, we need to make sure this pr could pass all the checks.

Zhao Song has updated the pull request incrementally with one additional commit since the last revision:

  fix another problem

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1546/files
  - new: https://git.openjdk.org/skara/pull/1546/files/63f915f1..c6a87205

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1546&range=01
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1546&range=00-01

  Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod
  Patch: https://git.openjdk.org/skara/pull/1546.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1546/head:pull/1546

PR: https://git.openjdk.org/skara/pull/1546

From erikj at openjdk.org  Mon Aug 21 21:45:01 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Mon, 21 Aug 2023 21:45:01 GMT
Subject: RFR: 1999: Only post ApprovalNeededComment after pr is otherwise
 ready for integration [v2]
In-Reply-To: <gJtQGmGn1Eb2QxJ5oISFbdVX-R8bf3jhq7M9YaMEnr8=.7cb04e60-381c-4bb5-9a72-3bc1d2af3547@github.com>
References: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>
 <gJtQGmGn1Eb2QxJ5oISFbdVX-R8bf3jhq7M9YaMEnr8=.7cb04e60-381c-4bb5-9a72-3bc1d2af3547@github.com>
Message-ID: <40GHzKTCE6fH27gdqrBbtPoTE24qN3HvvefU6ZJ-iLM=.8018d717-2545-454a-8daa-e3df23ed1658@github.com>

On Mon, 21 Aug 2023 20:29:37 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> In [SKARA-1199](https://bugs.openjdk.org/browse/SKARA-1199), I made a bug about posting approvalNeededComment. 
>> 
>> Before the bot posting ApprovalNeededComment, we need to make sure this pr could pass all the checks.
>> 
>> This PR also solves an issue in /approve command. If the command issuer is not an integrator, then the bot should return immediately.
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   fix another problem

bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1335:

> 1333:             }
> 1334: 
> 1335:             if (approvalNeeded() && visitor.messages().isEmpty()) {

Is this enough? Shouldn't we check `readyForReview` as well. What about the other things in the list for `readyForIntegration`?

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1546#discussion_r1300677904

From zsong at openjdk.org  Mon Aug 21 22:22:13 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 21 Aug 2023 22:22:13 GMT
Subject: RFR: 1999: Only post ApprovalNeededComment after pr is otherwise
 ready for integration [v2]
In-Reply-To: <40GHzKTCE6fH27gdqrBbtPoTE24qN3HvvefU6ZJ-iLM=.8018d717-2545-454a-8daa-e3df23ed1658@github.com>
References: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>
 <gJtQGmGn1Eb2QxJ5oISFbdVX-R8bf3jhq7M9YaMEnr8=.7cb04e60-381c-4bb5-9a72-3bc1d2af3547@github.com>
 <40GHzKTCE6fH27gdqrBbtPoTE24qN3HvvefU6ZJ-iLM=.8018d717-2545-454a-8daa-e3df23ed1658@github.com>
Message-ID: <PN-909QJ5JheH0nqHu1mOv_z_kyIuWEW-RUa8BoQJ5s=.4b232559-1ccc-4706-8eff-97ff548516d0@github.com>

On Mon, 21 Aug 2023 21:42:48 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   fix another problem
>
> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1335:
> 
>> 1333:             }
>> 1334: 
>> 1335:             if (approvalNeeded() && visitor.messages().isEmpty()) {
> 
> Is this enough? Shouldn't we check `readyForReview` as well. What about the other things in the list for `readyForIntegration`?

You are right. I will fix the problem soon. Thank you.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1546#discussion_r1300707125

From zsong at openjdk.org  Mon Aug 21 23:22:44 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 21 Aug 2023 23:22:44 GMT
Subject: RFR: 1999: Only post ApprovalNeededComment after pr is otherwise
 ready for integration [v3]
In-Reply-To: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>
References: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>
Message-ID: <Ml5LAqjN5WBonxW0z3PE41blhJ3Wrm9oK-zN4ek9yjs=.defd32b7-76e4-410f-a784-189cdc69826c@github.com>

> In [SKARA-1199](https://bugs.openjdk.org/browse/SKARA-1199), I made a bug about posting approvalNeededComment. 
> 
> Before the bot posting ApprovalNeededComment, we need to make sure this pr could pass all the checks.
> 
> This PR also solves an issue in /approve command. If the command issuer is not an integrator, then the bot should return immediately.

Zhao Song has updated the pull request incrementally with one additional commit since the last revision:

  update

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1546/files
  - new: https://git.openjdk.org/skara/pull/1546/files/c6a87205..d6a5cbdc

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1546&range=02
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1546&range=01-02

  Stats: 23 lines in 1 file changed: 7 ins; 12 del; 4 mod
  Patch: https://git.openjdk.org/skara/pull/1546.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1546/head:pull/1546

PR: https://git.openjdk.org/skara/pull/1546

From zsong at openjdk.org  Mon Aug 21 23:22:45 2023
From: zsong at openjdk.org (Zhao Song)
Date: Mon, 21 Aug 2023 23:22:45 GMT
Subject: RFR: 1999: Only post ApprovalNeededComment after pr is otherwise
 ready for integration [v2]
In-Reply-To: <PN-909QJ5JheH0nqHu1mOv_z_kyIuWEW-RUa8BoQJ5s=.4b232559-1ccc-4706-8eff-97ff548516d0@github.com>
References: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>
 <gJtQGmGn1Eb2QxJ5oISFbdVX-R8bf3jhq7M9YaMEnr8=.7cb04e60-381c-4bb5-9a72-3bc1d2af3547@github.com>
 <40GHzKTCE6fH27gdqrBbtPoTE24qN3HvvefU6ZJ-iLM=.8018d717-2545-454a-8daa-e3df23ed1658@github.com>
 <PN-909QJ5JheH0nqHu1mOv_z_kyIuWEW-RUa8BoQJ5s=.4b232559-1ccc-4706-8eff-97ff548516d0@github.com>
Message-ID: <HGhVj-XL4v3VHqGbSuANrpsXHi0-bRF94RLUcXvvhNE=.d03ab5c2-26ef-41ca-a4b8-095e2c573546@github.com>

On Mon, 21 Aug 2023 22:20:00 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1335:
>> 
>>> 1333:             }
>>> 1334: 
>>> 1335:             if (approvalNeeded() && visitor.messages().isEmpty()) {
>> 
>> Is this enough? Shouldn't we check `readyForReview` as well. What about the other things in the list for `readyForIntegration`?
>
> You are right. I will fix the problem soon. Thank you.

I also refactored the code about `readyForIntegration`.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1546#discussion_r1300740409

From erikj at openjdk.org  Tue Aug 22 13:19:20 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Tue, 22 Aug 2023 13:19:20 GMT
Subject: RFR: 1999: Only post ApprovalNeededComment after pr is otherwise
 ready for integration [v3]
In-Reply-To: <Ml5LAqjN5WBonxW0z3PE41blhJ3Wrm9oK-zN4ek9yjs=.defd32b7-76e4-410f-a784-189cdc69826c@github.com>
References: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>
 <Ml5LAqjN5WBonxW0z3PE41blhJ3Wrm9oK-zN4ek9yjs=.defd32b7-76e4-410f-a784-189cdc69826c@github.com>
Message-ID: <gyhevAo1vEbbNPFXi9F9L6xMZMrzxJp7XBca-RTDakY=.989b2a99-1e81-4549-8b25-1e1385211fa0@github.com>

On Mon, 21 Aug 2023 23:22:44 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> In [SKARA-1199](https://bugs.openjdk.org/browse/SKARA-1199), I made a bug about posting approvalNeededComment. 
>> 
>> Before the bot posting ApprovalNeededComment, we need to make sure this pr could pass all the checks.
>> 
>> This PR also solves an issue in /approve command. If the command issuer is not an integrator, then the bot should return immediately.
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   update

Marked as reviewed by erikj (Lead).

-------------

PR Review: https://git.openjdk.org/skara/pull/1546#pullrequestreview-1589423463

From zsong at openjdk.org  Tue Aug 22 16:11:07 2023
From: zsong at openjdk.org (Zhao Song)
Date: Tue, 22 Aug 2023 16:11:07 GMT
Subject: RFR: 1999: Only post ApprovalNeededComment after pr is otherwise
 ready for integration [v3]
In-Reply-To: <Ml5LAqjN5WBonxW0z3PE41blhJ3Wrm9oK-zN4ek9yjs=.defd32b7-76e4-410f-a784-189cdc69826c@github.com>
References: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>
 <Ml5LAqjN5WBonxW0z3PE41blhJ3Wrm9oK-zN4ek9yjs=.defd32b7-76e4-410f-a784-189cdc69826c@github.com>
Message-ID: <LX_OEFejrgQgqBAQAtqAREriflNRFYihEXcgeDSkshU=.1027eae5-8837-4fa2-9266-31d0307e4457@github.com>

On Mon, 21 Aug 2023 23:22:44 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> In [SKARA-1199](https://bugs.openjdk.org/browse/SKARA-1199), I made a bug about posting approvalNeededComment. 
>> 
>> Before the bot posting ApprovalNeededComment, we need to make sure this pr could pass all the checks.
>> 
>> This PR also solves an issue in /approve command. If the command issuer is not an integrator, then the bot should return immediately.
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   update

Thanks for the review!

-------------

PR Comment: https://git.openjdk.org/skara/pull/1546#issuecomment-1688503605

From zsong at openjdk.org  Tue Aug 22 16:11:08 2023
From: zsong at openjdk.org (Zhao Song)
Date: Tue, 22 Aug 2023 16:11:08 GMT
Subject: Integrated: 1999: Only post ApprovalNeededComment after pr is
 otherwise ready for integration
In-Reply-To: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>
References: <0zYrUY5jsRdDsXVg4k5xxCBgc13O_MmwHjqbamAcCxM=.ebead677-ce83-4dcf-8fb2-2881dcc69340@github.com>
Message-ID: <JhDy_1VphjDJdRWFwN_dVc-ZqfMNTDPgf5feIAuKXYI=.f1fefb92-f7b5-4a30-9b39-3dc2cec9ade4@github.com>

On Mon, 21 Aug 2023 19:49:51 GMT, Zhao Song <zsong at openjdk.org> wrote:

> In [SKARA-1199](https://bugs.openjdk.org/browse/SKARA-1199), I made a bug about posting approvalNeededComment. 
> 
> Before the bot posting ApprovalNeededComment, we need to make sure this pr could pass all the checks.
> 
> This PR also solves an issue in /approve command. If the command issuer is not an integrator, then the bot should return immediately.

This pull request has now been integrated.

Changeset: c31c8b4d
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/c31c8b4dd7ac2debe1ee09bd042ad66c41ebf874
Stats:     26 lines in 4 files changed: 10 ins; 12 del; 4 mod

1999: Only post ApprovalNeededComment after pr is otherwise ready for integration

Reviewed-by: erikj

-------------

PR: https://git.openjdk.org/skara/pull/1546

From zsong at openjdk.org  Tue Aug 22 17:52:35 2023
From: zsong at openjdk.org (Zhao Song)
Date: Tue, 22 Aug 2023 17:52:35 GMT
Subject: RFR: 1994: Reply from /reviewer credit can be clearer
Message-ID: <5l5aXsGT5LMJefkBHxtLRtnAp50CLyVevVH34Th3vzs=.a91913d6-0ded-477c-ba3b-06bb79457e26@github.com>

This patch improved the bot's reply in some cases when the pr author issues '/reviewer <user>' command.

When the pr author is trying to credit an user with '/reviewer <user>' command,

If the user already approved this pr, Skara bot should reply "Reviewer <user> has already made an authenticated review of this PR, and does not need to be credited manually." 

If the user already reviewed this pr(but not approved), Skara bot should reply "Reviewer <user> has already made an authenticated review of this PR, but did not approve it. Manually crediting them is not allowed."

-------------

Commit messages:
 - add test
 - SKARA-1994

Changes: https://git.openjdk.org/skara/pull/1547/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1547&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1994
  Stats: 26 lines in 2 files changed: 25 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/skara/pull/1547.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1547/head:pull/1547

PR: https://git.openjdk.org/skara/pull/1547

From zsong at openjdk.org  Tue Aug 22 21:20:55 2023
From: zsong at openjdk.org (Zhao Song)
Date: Tue, 22 Aug 2023 21:20:55 GMT
Subject: RFR: 2000: Escape user handles in bug titles in pr body
Message-ID: <2lx4x2EJ5SB4vxYYY-wIuoK-uuNCAQPpZeY0VDGwUnk=.76480db1-782a-430e-a92d-3a658fb1d6de@github.com>

In this patch, the bot would escape `@` in the issue title in pr body.

I tried to escape `@` with `&#64;`, but failed, the text would still mention the link.

So according to this [page](https://github.com/github/markup/issues/1168#issuecomment-494946168), I escape `@` with `@`.

-------------

Commit messages:
 - SKARA-2000

Changes: https://git.openjdk.org/skara/pull/1548/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1548&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-2000
  Stats: 2 lines in 1 file changed: 1 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/skara/pull/1548.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1548/head:pull/1548

PR: https://git.openjdk.org/skara/pull/1548

From zsong at openjdk.org  Tue Aug 22 21:20:55 2023
From: zsong at openjdk.org (Zhao Song)
Date: Tue, 22 Aug 2023 21:20:55 GMT
Subject: RFR: 2000: Escape user handles in bug titles in pr body
In-Reply-To: <2lx4x2EJ5SB4vxYYY-wIuoK-uuNCAQPpZeY0VDGwUnk=.76480db1-782a-430e-a92d-3a658fb1d6de@github.com>
References: <2lx4x2EJ5SB4vxYYY-wIuoK-uuNCAQPpZeY0VDGwUnk=.76480db1-782a-430e-a92d-3a658fb1d6de@github.com>
Message-ID: <UjgbvTzxoxg313zpTFnjR1vV6vTZS01AwmPnIEYmO0Y=.c60dd3de-f2e7-4378-9fc5-e5e8cede928f@github.com>

On Tue, 22 Aug 2023 21:14:48 GMT, Zhao Song <zsong at openjdk.org> wrote:

> In this patch, the bot would escape `@` in the issue title in pr body.
> 
> I tried to escape `@` with `&#64;`, but failed, the text would still mention the link.
> 
> So according to this [page](https://github.com/github/markup/issues/1168#issuecomment-494946168), I escape `@` with `@`.

`&#64;zhaosongzs` &#64;zhaosongzs
vs 
`@zhaosongzs` @zhaosongzs

-------------

PR Comment: https://git.openjdk.org/skara/pull/1548#issuecomment-1688942971

From prappo at openjdk.org  Tue Aug 22 21:44:13 2023
From: prappo at openjdk.org (Pavel Rappo)
Date: Tue, 22 Aug 2023 21:44:13 GMT
Subject: RFR: 2000: Escape user handles in bug titles in pr body
In-Reply-To: <2lx4x2EJ5SB4vxYYY-wIuoK-uuNCAQPpZeY0VDGwUnk=.76480db1-782a-430e-a92d-3a658fb1d6de@github.com>
References: <2lx4x2EJ5SB4vxYYY-wIuoK-uuNCAQPpZeY0VDGwUnk=.76480db1-782a-430e-a92d-3a658fb1d6de@github.com>
Message-ID: <Ww_K1aGx9GxtITFDB0BTUkl7w8DWhlQGjwR3_hqw6H4=.d9488a2a-02c5-45da-b24c-fc7ce83a2d05@github.com>

On Tue, 22 Aug 2023 21:14:48 GMT, Zhao Song <zsong at openjdk.org> wrote:

> In this patch, the bot would escape `@` in the issue title in pr body.
> 
> I tried to escape `@` with `&#64;`, but failed, the text would still mention the link.
> 
> So according to this [page](https://github.com/github/markup/issues/1168#issuecomment-494946168), I escape `@` with `@`.

Not a Skara reviewer, but the change looks good. It's sad to see that HTML entities, `&#64;` or `&commat;`, whose work is to help avoid unneeded interpretation, do not work in this case.

-------------

Marked as reviewed by prappo (no project role).

PR Review: https://git.openjdk.org/skara/pull/1548#pullrequestreview-1590385706

From erikj at openjdk.org  Tue Aug 22 23:28:24 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Tue, 22 Aug 2023 23:28:24 GMT
Subject: RFR: 2002: GitToHgConverter fails on merge with ancestor
Message-ID: <_DE6G5qoqsUestRawk_6M5NVp603-mqO8ChNEIIAwxE=.22bd5e81-02f6-4064-990f-6d22f891d5d7@github.com>

Sometimes through weird circumstances we can end up with Git repositories where merges between a commit and an ancestor to that commit. Converting such a commit to Mercurial can be tricky, and in one case we are currently failing.

The GitToHgConverter is already trying to solve this issue, but only detects the ancestor relationship in one direction between the commits to be merged, and not the other. Specifically if the first parent is an ancestor of the second parent, the conversion will identify the situation and apply the workaround. But, if instead the second parent is an ancestor of first parent, it's not detected. The first case is quite commonly achieved by merging a branch into the current branch using --no-ff, but the second seems rarer. The same workaround should apply fine in both cases however.

To verify this behavior I implemented two new tests, one for each of the possible ancestor relationships. The first test already passed, but the second was fixed by this change.

The FF.Auto case isn't tested, and is unlikely to ever be used, but I believe my change there makes it more correct than it was before.

-------------

Commit messages:
 - SKARA-2002

Changes: https://git.openjdk.org/skara/pull/1549/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1549&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-2002
  Stats: 78 lines in 2 files changed: 77 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/skara/pull/1549.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1549/head:pull/1549

PR: https://git.openjdk.org/skara/pull/1549

From zsong at openjdk.org  Wed Aug 23 01:04:27 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 23 Aug 2023 01:04:27 GMT
Subject: RFR: 2002: GitToHgConverter fails on merge with ancestor
In-Reply-To: <_DE6G5qoqsUestRawk_6M5NVp603-mqO8ChNEIIAwxE=.22bd5e81-02f6-4064-990f-6d22f891d5d7@github.com>
References: <_DE6G5qoqsUestRawk_6M5NVp603-mqO8ChNEIIAwxE=.22bd5e81-02f6-4064-990f-6d22f891d5d7@github.com>
Message-ID: <uRMkpSgIk8x9lmaDMFEj1Zz-RKvIfA5dCevGITVno3k=.8d3225c5-28ca-4611-97c7-d997d812b8d6@github.com>

On Tue, 22 Aug 2023 23:24:46 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> Sometimes through weird circumstances we can end up with Git repositories where merges between a commit and an ancestor to that commit. Converting such a commit to Mercurial can be tricky, and in one case we are currently failing.
> 
> The GitToHgConverter is already trying to solve this issue, but only detects the ancestor relationship in one direction between the commits to be merged, and not the other. Specifically if the first parent is an ancestor of the second parent, the conversion will identify the situation and apply the workaround. But, if instead the second parent is an ancestor of first parent, it's not detected. The first case is quite commonly achieved by merging a branch into the current branch using --no-ff, but the second seems rarer. The same workaround should apply fine in both cases however.
> 
> To verify this behavior I implemented two new tests, one for each of the possible ancestor relationships. The first test already passed, but the second was fixed by this change.
> 
> The FF.Auto case isn't tested, and is unlikely to ever be used, but I believe my change there makes it more correct than it was before.

Looks good!

-------------

Marked as reviewed by zsong (Reviewer).

PR Review: https://git.openjdk.org/skara/pull/1549#pullrequestreview-1590552939

From erikj at openjdk.org  Wed Aug 23 13:44:04 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Wed, 23 Aug 2023 13:44:04 GMT
Subject: Integrated: 2002: GitToHgConverter fails on merge with ancestor
In-Reply-To: <_DE6G5qoqsUestRawk_6M5NVp603-mqO8ChNEIIAwxE=.22bd5e81-02f6-4064-990f-6d22f891d5d7@github.com>
References: <_DE6G5qoqsUestRawk_6M5NVp603-mqO8ChNEIIAwxE=.22bd5e81-02f6-4064-990f-6d22f891d5d7@github.com>
Message-ID: <sI_z_qW-krbJZ3zfE0dGM5hgbE0E1XAszvytJdQrL-w=.c638685e-4ab5-4933-8cd4-5484e7a4c3ea@github.com>

On Tue, 22 Aug 2023 23:24:46 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> Sometimes through weird circumstances we can end up with Git repositories where merges between a commit and an ancestor to that commit. Converting such a commit to Mercurial can be tricky, and in one case we are currently failing.
> 
> The GitToHgConverter is already trying to solve this issue, but only detects the ancestor relationship in one direction between the commits to be merged, and not the other. Specifically if the first parent is an ancestor of the second parent, the conversion will identify the situation and apply the workaround. But, if instead the second parent is an ancestor of first parent, it's not detected. The first case is quite commonly achieved by merging a branch into the current branch using --no-ff, but the second seems rarer. The same workaround should apply fine in both cases however.
> 
> To verify this behavior I implemented two new tests, one for each of the possible ancestor relationships. The first test already passed, but the second was fixed by this change.
> 
> The FF.Auto case isn't tested, and is unlikely to ever be used, but I believe my change there makes it more correct than it was before.

This pull request has now been integrated.

Changeset: 67d9f091
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/67d9f09103f46d751b833f25237ca9b4ea35e839
Stats:     78 lines in 2 files changed: 77 ins; 0 del; 1 mod

2002: GitToHgConverter fails on merge with ancestor

Reviewed-by: zsong

-------------

PR: https://git.openjdk.org/skara/pull/1549

From erikj at openjdk.org  Wed Aug 23 13:55:29 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Wed, 23 Aug 2023 13:55:29 GMT
Subject: RFR: 2000: Escape user handles in bug titles in pr body
In-Reply-To: <2lx4x2EJ5SB4vxYYY-wIuoK-uuNCAQPpZeY0VDGwUnk=.76480db1-782a-430e-a92d-3a658fb1d6de@github.com>
References: <2lx4x2EJ5SB4vxYYY-wIuoK-uuNCAQPpZeY0VDGwUnk=.76480db1-782a-430e-a92d-3a658fb1d6de@github.com>
Message-ID: <5ov1pDzdWhmm_VkUXXF3JrNKPU_Vts6nlMnyOPo_RwU=.85622f12-3ca5-4cdd-accf-a41523b0261c@github.com>

On Tue, 22 Aug 2023 21:14:48 GMT, Zhao Song <zsong at openjdk.org> wrote:

> In this patch, the bot would escape `@` in the issue title in pr body.
> 
> I tried to escape `@` with `&#64;`, but failed, the text would still mention the link.
> 
> So according to this [page](https://github.com/github/markup/issues/1168#issuecomment-494946168), I escape `@` with `@`.

That's a creative solution. Nice that you found something that works.

-------------

Marked as reviewed by erikj (Lead).

PR Review: https://git.openjdk.org/skara/pull/1548#pullrequestreview-1591663145

From erikj at openjdk.org  Wed Aug 23 13:58:54 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Wed, 23 Aug 2023 13:58:54 GMT
Subject: RFR: 1994: Reply from /reviewer credit can be clearer
In-Reply-To: <5l5aXsGT5LMJefkBHxtLRtnAp50CLyVevVH34Th3vzs=.a91913d6-0ded-477c-ba3b-06bb79457e26@github.com>
References: <5l5aXsGT5LMJefkBHxtLRtnAp50CLyVevVH34Th3vzs=.a91913d6-0ded-477c-ba3b-06bb79457e26@github.com>
Message-ID: <MfB6i3CEZJij6R7A5tnLTyG98gw_m3hDk8ZVcGEJrVc=.6d2b2b89-9ee0-4723-a2cb-960876b8f68c@github.com>

On Tue, 22 Aug 2023 17:38:30 GMT, Zhao Song <zsong at openjdk.org> wrote:

> This patch improved the bot's reply in some cases when the pr author issues '/reviewer <user>' command.
> 
> When the pr author is trying to credit an user with '/reviewer <user>' command,
> 
> If the user already approved this pr, Skara bot should reply "Reviewer <user> has already made an authenticated review of this PR, and does not need to be credited manually." 
> 
> If the user already reviewed this pr(but not approved), Skara bot should reply "Reviewer <user> has already made an authenticated review of this PR, but did not approve it. Manually crediting them is not allowed."

Marked as reviewed by erikj (Lead).

-------------

PR Review: https://git.openjdk.org/skara/pull/1547#pullrequestreview-1591671142

From zsong at openjdk.org  Wed Aug 23 15:38:36 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 23 Aug 2023 15:38:36 GMT
Subject: RFR: 1994: Reply from /reviewer credit can be clearer
In-Reply-To: <5l5aXsGT5LMJefkBHxtLRtnAp50CLyVevVH34Th3vzs=.a91913d6-0ded-477c-ba3b-06bb79457e26@github.com>
References: <5l5aXsGT5LMJefkBHxtLRtnAp50CLyVevVH34Th3vzs=.a91913d6-0ded-477c-ba3b-06bb79457e26@github.com>
Message-ID: <9g39Od-9eo598fQNGgUgGNxlM2yVpgOCWDUsgAMRK0M=.6db30549-85cc-4ad8-bd44-4044af90adf8@github.com>

On Tue, 22 Aug 2023 17:38:30 GMT, Zhao Song <zsong at openjdk.org> wrote:

> This patch improved the bot's reply in some cases when the pr author issues '/reviewer <user>' command.
> 
> When the pr author is trying to credit an user with '/reviewer <user>' command,
> 
> If the user already approved this pr, Skara bot should reply "Reviewer <user> has already made an authenticated review of this PR, and does not need to be credited manually." 
> 
> If the user already reviewed this pr(but not approved), Skara bot should reply "Reviewer <user> has already made an authenticated review of this PR, but did not approve it. Manually crediting them is not allowed."

Thanks for the review!

-------------

PR Comment: https://git.openjdk.org/skara/pull/1547#issuecomment-1690184762

From zsong at openjdk.org  Wed Aug 23 15:38:36 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 23 Aug 2023 15:38:36 GMT
Subject: Integrated: 1994: Reply from /reviewer credit can be clearer
In-Reply-To: <5l5aXsGT5LMJefkBHxtLRtnAp50CLyVevVH34Th3vzs=.a91913d6-0ded-477c-ba3b-06bb79457e26@github.com>
References: <5l5aXsGT5LMJefkBHxtLRtnAp50CLyVevVH34Th3vzs=.a91913d6-0ded-477c-ba3b-06bb79457e26@github.com>
Message-ID: <_AGMFifGAv1lOivr4NAyC7eSnmtSjxQRsNEDfRcr5ow=.0c50d689-2041-4c20-b2ec-ecc620a81028@github.com>

On Tue, 22 Aug 2023 17:38:30 GMT, Zhao Song <zsong at openjdk.org> wrote:

> This patch improved the bot's reply in some cases when the pr author issues '/reviewer <user>' command.
> 
> When the pr author is trying to credit an user with '/reviewer <user>' command,
> 
> If the user already approved this pr, Skara bot should reply "Reviewer <user> has already made an authenticated review of this PR, and does not need to be credited manually." 
> 
> If the user already reviewed this pr(but not approved), Skara bot should reply "Reviewer <user> has already made an authenticated review of this PR, but did not approve it. Manually crediting them is not allowed."

This pull request has now been integrated.

Changeset: 30fda5b3
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/30fda5b389426b6bb17160e83f9873e29514e9ff
Stats:     26 lines in 2 files changed: 25 ins; 0 del; 1 mod

1994: Reply from /reviewer credit can be clearer

Reviewed-by: erikj

-------------

PR: https://git.openjdk.org/skara/pull/1547

From zsong at openjdk.org  Wed Aug 23 15:39:10 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 23 Aug 2023 15:39:10 GMT
Subject: RFR: 2000: Escape user handles in bug titles in pr body
In-Reply-To: <2lx4x2EJ5SB4vxYYY-wIuoK-uuNCAQPpZeY0VDGwUnk=.76480db1-782a-430e-a92d-3a658fb1d6de@github.com>
References: <2lx4x2EJ5SB4vxYYY-wIuoK-uuNCAQPpZeY0VDGwUnk=.76480db1-782a-430e-a92d-3a658fb1d6de@github.com>
Message-ID: <Pf9rz2l4tf8vNjs1uvLKGsTfreZSUgt1SbYqulsVBJg=.35e01daa-febe-43c0-bd9d-4ef40134a3d9@github.com>

On Tue, 22 Aug 2023 21:14:48 GMT, Zhao Song <zsong at openjdk.org> wrote:

> In this patch, the bot would escape `@` in the issue title in pr body.
> 
> I tried to escape `@` with `&#64;`, but failed, the text would still mention the link.
> 
> So according to this [page](https://github.com/github/markup/issues/1168#issuecomment-494946168), I escape `@` with `@`.

Thanks for the review!

-------------

PR Comment: https://git.openjdk.org/skara/pull/1548#issuecomment-1690185871

From zsong at openjdk.org  Wed Aug 23 15:39:10 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 23 Aug 2023 15:39:10 GMT
Subject: Integrated: 2000: Escape user handles in bug titles in pr body
In-Reply-To: <2lx4x2EJ5SB4vxYYY-wIuoK-uuNCAQPpZeY0VDGwUnk=.76480db1-782a-430e-a92d-3a658fb1d6de@github.com>
References: <2lx4x2EJ5SB4vxYYY-wIuoK-uuNCAQPpZeY0VDGwUnk=.76480db1-782a-430e-a92d-3a658fb1d6de@github.com>
Message-ID: <_qE2mXUlBAgxlV6lz3oQ7fuIIlmWl46mni3VV79RAic=.124021e7-76f4-4f33-acd4-9d64241a84da@github.com>

On Tue, 22 Aug 2023 21:14:48 GMT, Zhao Song <zsong at openjdk.org> wrote:

> In this patch, the bot would escape `@` in the issue title in pr body.
> 
> I tried to escape `@` with `&#64;`, but failed, the text would still mention the link.
> 
> So according to this [page](https://github.com/github/markup/issues/1168#issuecomment-494946168), I escape `@` with `@`.

This pull request has now been integrated.

Changeset: 5eb862ef
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/5eb862ef7c1d7913208d34e7a8d202f225d88120
Stats:     2 lines in 1 file changed: 1 ins; 0 del; 1 mod

2000: Escape user handles in bug titles in pr body

Reviewed-by: prappo, erikj

-------------

PR: https://git.openjdk.org/skara/pull/1548

From zsong at openjdk.org  Thu Aug 24 16:23:10 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 24 Aug 2023 16:23:10 GMT
Subject: RFR: 2004: Field 'groups' in Class GitLabHost should be 'List'
Message-ID: <NTur-1xchv2fq3nZ_dekYVViRucutlSdiM5KvW0U3h8=.77a71c01-4350-4f98-901b-a1fd9b02113f@github.com>

Currently, the type of field 'groups' in GitLabHost is a set. However, we would like the bot has some preference for some groups, so this field should be able to keep the order. 

The solution is to change the type this field to List.

-------------

Commit messages:
 - SKARA-2004

Changes: https://git.openjdk.org/skara/pull/1550/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1550&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-2004
  Stats: 25 lines in 4 files changed: 2 ins; 1 del; 22 mod
  Patch: https://git.openjdk.org/skara/pull/1550.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1550/head:pull/1550

PR: https://git.openjdk.org/skara/pull/1550

From zsong at openjdk.org  Thu Aug 24 17:26:20 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 24 Aug 2023 17:26:20 GMT
Subject: RFR: 2004: Field 'groups' in Class GitLabHost should be 'List'
 [v2]
In-Reply-To: <NTur-1xchv2fq3nZ_dekYVViRucutlSdiM5KvW0U3h8=.77a71c01-4350-4f98-901b-a1fd9b02113f@github.com>
References: <NTur-1xchv2fq3nZ_dekYVViRucutlSdiM5KvW0U3h8=.77a71c01-4350-4f98-901b-a1fd9b02113f@github.com>
Message-ID: <LKQEQAKPHA5YrFYWQn8kJQuXGqkpeMini8LE4XpYdX0=.d9667f1f-72a7-44e2-a713-88c28d4efc8c@github.com>

> Currently, the type of field 'groups' in GitLabHost is a set. However, we would like the bot has some preference for some groups, so this field should be able to keep the order. 
> 
> The solution is to change the type this field to List.

Zhao Song has updated the pull request incrementally with one additional commit since the last revision:

  update

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1550/files
  - new: https://git.openjdk.org/skara/pull/1550/files/c6a06814..be3181d5

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1550&range=01
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1550&range=00-01

  Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/skara/pull/1550.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1550/head:pull/1550

PR: https://git.openjdk.org/skara/pull/1550

From erikj at openjdk.org  Thu Aug 24 17:26:22 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 24 Aug 2023 17:26:22 GMT
Subject: RFR: 2004: Field 'groups' in Class GitLabHost should be 'List'
 [v2]
In-Reply-To: <LKQEQAKPHA5YrFYWQn8kJQuXGqkpeMini8LE4XpYdX0=.d9667f1f-72a7-44e2-a713-88c28d4efc8c@github.com>
References: <NTur-1xchv2fq3nZ_dekYVViRucutlSdiM5KvW0U3h8=.77a71c01-4350-4f98-901b-a1fd9b02113f@github.com>
 <LKQEQAKPHA5YrFYWQn8kJQuXGqkpeMini8LE4XpYdX0=.d9667f1f-72a7-44e2-a713-88c28d4efc8c@github.com>
Message-ID: <omnpYb_abcByeLARLdhGXBGBQPXE9gN3D9IvEhabQzE=.3942f341-1697-4065-9032-fdb615bb7454@github.com>

On Thu, 24 Aug 2023 17:21:32 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> Currently, the type of field 'groups' in GitLabHost is a set. However, we would like the bot has some preference for some groups, so this field should be able to keep the order. 
>> 
>> The solution is to change the type this field to List.
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   update

Marked as reviewed by erikj (Lead).

forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabForgeFactory.java line 53:

> 51:             name = configuration.get("name").asString();
> 52:         }
> 53:         List<String> groups = new ArrayList<>();

I would suggest using `List.of()` since we aren't updating this list.

-------------

PR Review: https://git.openjdk.org/skara/pull/1550#pullrequestreview-1594097323
PR Review Comment: https://git.openjdk.org/skara/pull/1550#discussion_r1304641453

From zsong at openjdk.org  Thu Aug 24 17:26:22 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 24 Aug 2023 17:26:22 GMT
Subject: RFR: 2004: Field 'groups' in Class GitLabHost should be 'List'
 [v2]
In-Reply-To: <omnpYb_abcByeLARLdhGXBGBQPXE9gN3D9IvEhabQzE=.3942f341-1697-4065-9032-fdb615bb7454@github.com>
References: <NTur-1xchv2fq3nZ_dekYVViRucutlSdiM5KvW0U3h8=.77a71c01-4350-4f98-901b-a1fd9b02113f@github.com>
 <LKQEQAKPHA5YrFYWQn8kJQuXGqkpeMini8LE4XpYdX0=.d9667f1f-72a7-44e2-a713-88c28d4efc8c@github.com>
 <omnpYb_abcByeLARLdhGXBGBQPXE9gN3D9IvEhabQzE=.3942f341-1697-4065-9032-fdb615bb7454@github.com>
Message-ID: <8IBKFWgBGhy2Ho3wf3lKu3-58tZDQOwmF2ERJKqYJo0=.c703b6d8-737b-4349-ae03-6a0dd021e015@github.com>

On Thu, 24 Aug 2023 17:17:33 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   update
>
> forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabForgeFactory.java line 53:
> 
>> 51:             name = configuration.get("name").asString();
>> 52:         }
>> 53:         List<String> groups = new ArrayList<>();
> 
> I would suggest using `List.of()` since we aren't updating this list.

Sure. It's better.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1550#discussion_r1304645549

From erikj at openjdk.org  Thu Aug 24 17:40:54 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 24 Aug 2023 17:40:54 GMT
Subject: RFR: 2004: Field 'groups' in Class GitLabHost should be 'List'
 [v2]
In-Reply-To: <LKQEQAKPHA5YrFYWQn8kJQuXGqkpeMini8LE4XpYdX0=.d9667f1f-72a7-44e2-a713-88c28d4efc8c@github.com>
References: <NTur-1xchv2fq3nZ_dekYVViRucutlSdiM5KvW0U3h8=.77a71c01-4350-4f98-901b-a1fd9b02113f@github.com>
 <LKQEQAKPHA5YrFYWQn8kJQuXGqkpeMini8LE4XpYdX0=.d9667f1f-72a7-44e2-a713-88c28d4efc8c@github.com>
Message-ID: <cAqSjJNVmu_QyXZCUoODF54FZNQ6N-JDxlQkh68EcoM=.c5fe4649-5191-42a6-abd3-bee0bb872ae8@github.com>

On Thu, 24 Aug 2023 17:26:20 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> Currently, the type of field 'groups' in GitLabHost is a set. However, we would like the bot has some preference for some groups, so this field should be able to keep the order. 
>> 
>> The solution is to change the type this field to List.
>
> Zhao Song has updated the pull request incrementally with one additional commit since the last revision:
> 
>   update

Marked as reviewed by erikj (Lead).

-------------

PR Review: https://git.openjdk.org/skara/pull/1550#pullrequestreview-1594133123

From zsong at openjdk.org  Thu Aug 24 17:44:19 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 24 Aug 2023 17:44:19 GMT
Subject: Integrated: 2004: Field 'groups' in Class GitLabHost should be 'List'
In-Reply-To: <NTur-1xchv2fq3nZ_dekYVViRucutlSdiM5KvW0U3h8=.77a71c01-4350-4f98-901b-a1fd9b02113f@github.com>
References: <NTur-1xchv2fq3nZ_dekYVViRucutlSdiM5KvW0U3h8=.77a71c01-4350-4f98-901b-a1fd9b02113f@github.com>
Message-ID: <Qh5GgYUWBERFwuF7Jo17W7suMw77Aqhh65Q-6mcF9RU=.74155db1-a00c-4bac-9e07-8e584672e9aa@github.com>

On Thu, 24 Aug 2023 16:10:19 GMT, Zhao Song <zsong at openjdk.org> wrote:

> Currently, the type of field 'groups' in GitLabHost is a set. However, we would like the bot has some preference for some groups, so this field should be able to keep the order. 
> 
> The solution is to change the type this field to List.

This pull request has now been integrated.

Changeset: 844337a9
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/844337a9944d615ad3b24c73189ab10ab06a7afa
Stats:     25 lines in 4 files changed: 2 ins; 1 del; 22 mod

2004: Field 'groups' in Class GitLabHost should be 'List'

Reviewed-by: erikj

-------------

PR: https://git.openjdk.org/skara/pull/1550

From erikj at openjdk.org  Wed Aug 30 19:44:00 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Wed, 30 Aug 2023 19:44:00 GMT
Subject: RFR: 2010: Handle both ignoreopt and matchprefix together in
 IssueNotifier
Message-ID: <WGngydqeTxDpNpq5HTLHv9G576gP6iuYyO1oAHB53l8=.00450c64-072f-4b9d-8474-ec73ebe32c6f@github.com>

The two configuration options for tags in the IssueNotifier, "ignoreopt" and "matchprefix" do not work together if "matchprefix" is set to false (which is the default value). We need to configure a repository where the tag format and the fixVersion differ in both prefix and "opt" suffix. This patch fixes this by reordering the logic in `tagVersionMatchesFixVersion`. I added a test to verify this specific situation. I believe the existing tests should cover all other current usecases.

-------------

Commit messages:
 - SKARA-2010

Changes: https://git.openjdk.org/skara/pull/1551/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1551&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-2010
  Stats: 68 lines in 2 files changed: 51 ins; 10 del; 7 mod
  Patch: https://git.openjdk.org/skara/pull/1551.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1551/head:pull/1551

PR: https://git.openjdk.org/skara/pull/1551

From zsong at openjdk.org  Wed Aug 30 22:43:18 2023
From: zsong at openjdk.org (Zhao Song)
Date: Wed, 30 Aug 2023 22:43:18 GMT
Subject: RFR: 2010: Handle both ignoreopt and matchprefix together in
 IssueNotifier
In-Reply-To: <WGngydqeTxDpNpq5HTLHv9G576gP6iuYyO1oAHB53l8=.00450c64-072f-4b9d-8474-ec73ebe32c6f@github.com>
References: <WGngydqeTxDpNpq5HTLHv9G576gP6iuYyO1oAHB53l8=.00450c64-072f-4b9d-8474-ec73ebe32c6f@github.com>
Message-ID: <RKpbg0J-wpffiTWN_wwSucQnaZ7sId7JJA2A7mMwidI=.b91f20fe-13ce-4c35-98e3-13a6938fb134@github.com>

On Wed, 30 Aug 2023 19:39:47 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> The two configuration options for tags in the IssueNotifier, "ignoreopt" and "matchprefix" do not work together if "matchprefix" is set to false (which is the default value). We need to configure a repository where the tag format and the fixVersion differ in both prefix and "opt" suffix. This patch fixes this by reordering the logic in `tagVersionMatchesFixVersion`. I added a test to verify this specific situation. I believe the existing tests should cover all other current usecases.

Looks good!

-------------

Marked as reviewed by zsong (Reviewer).

PR Review: https://git.openjdk.org/skara/pull/1551#pullrequestreview-1603593230

From duke at openjdk.org  Thu Aug 31 11:23:33 2023
From: duke at openjdk.org (altrisi)
Date: Thu, 31 Aug 2023 11:23:33 GMT
Subject: RFR: GHA: Resolve deprecation warnings
Message-ID: <q0LrJXo2pKnq5wqDqjRlREnevJh520NpzduZ571H8Es=.a17b1cfa-2da0-4429-8cd2-b66a68007548@github.com>

This PR resolves deprecation warnings in the GHA workflow by updating dependencies and replacing the deprecated `set-output` with `GITHUB_OUTPUT`.

v2 to v3 major in `checkout` just updated the node version.

Github Script v3->v6 also needed a small code change (`github.repos`->`github.rest.repos`), following the documentation.

GHA workflows still pass with these changes.

Note that I don't have a JBS account to be able to make an issue for this PR.

-------------

Commit messages:
 - Update GHScript to v6
 - Skara GHA: Resolve deprecation warnings

Changes: https://git.openjdk.org/skara/pull/1552/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1552&range=00
  Stats: 12 lines in 1 file changed: 0 ins; 0 del; 12 mod
  Patch: https://git.openjdk.org/skara/pull/1552.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1552/head:pull/1552

PR: https://git.openjdk.org/skara/pull/1552

From erikj at openjdk.org  Thu Aug 31 13:57:24 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 31 Aug 2023 13:57:24 GMT
Subject: RFR: GHA: Resolve deprecation warnings
In-Reply-To: <q0LrJXo2pKnq5wqDqjRlREnevJh520NpzduZ571H8Es=.a17b1cfa-2da0-4429-8cd2-b66a68007548@github.com>
References: <q0LrJXo2pKnq5wqDqjRlREnevJh520NpzduZ571H8Es=.a17b1cfa-2da0-4429-8cd2-b66a68007548@github.com>
Message-ID: <MvC_EeDpZ6fB_Ob34TxWNKPE1APJ27WWPLx7HysGrzk=.b735b2c6-9e54-43c6-a222-ff21dabab129@github.com>

On Thu, 31 Aug 2023 11:19:33 GMT, altrisi <duke at openjdk.org> wrote:

> This PR resolves deprecation warnings in the GHA workflow by updating dependencies and replacing the deprecated `set-output` with `GITHUB_OUTPUT`.
> 
> v2 to v3 major in `checkout` just updated the node version.
> 
> Github Script v3->v6 also needed a small code change (`github.repos`->`github.rest.repos`), following the documentation.
> 
> GHA workflows still pass with these changes.
> 
> Note that I don't have a JBS account to be able to make an issue for this PR.

I think this looks reasonable. I note that these are the action versions used by the JDK repository, so seems reasonable to update. I will create a JBS issue.

https://bugs.openjdk.org/browse/SKARA-2011

-------------

Marked as reviewed by erikj (Lead).

PR Review: https://git.openjdk.org/skara/pull/1552#pullrequestreview-1604816790
PR Comment: https://git.openjdk.org/skara/pull/1552#issuecomment-1701086220

From erikj at openjdk.org  Thu Aug 31 14:15:11 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 31 Aug 2023 14:15:11 GMT
Subject: RFR: 2010: Handle both ignoreopt and matchprefix together in
 IssueNotifier
In-Reply-To: <WGngydqeTxDpNpq5HTLHv9G576gP6iuYyO1oAHB53l8=.00450c64-072f-4b9d-8474-ec73ebe32c6f@github.com>
References: <WGngydqeTxDpNpq5HTLHv9G576gP6iuYyO1oAHB53l8=.00450c64-072f-4b9d-8474-ec73ebe32c6f@github.com>
Message-ID: <JE9yslGAxxuh0TpKZIbucxoeH1oFrNrlEnYXLdrhM8g=.af92de26-3f8f-4cad-a488-af8c7dc7f7fb@github.com>

On Wed, 30 Aug 2023 19:39:47 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> The two configuration options for tags in the IssueNotifier, "ignoreopt" and "matchprefix" do not work together if "matchprefix" is set to false (which is the default value). We need to configure a repository where the tag format and the fixVersion differ in both prefix and "opt" suffix. This patch fixes this by reordering the logic in `tagVersionMatchesFixVersion`. I added a test to verify this specific situation. I believe the existing tests should cover all other current usecases.

Thanks!

-------------

PR Comment: https://git.openjdk.org/skara/pull/1551#issuecomment-1701133518

From erikj at openjdk.org  Thu Aug 31 14:15:11 2023
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 31 Aug 2023 14:15:11 GMT
Subject: Integrated: 2010: Handle both ignoreopt and matchprefix together in
 IssueNotifier
In-Reply-To: <WGngydqeTxDpNpq5HTLHv9G576gP6iuYyO1oAHB53l8=.00450c64-072f-4b9d-8474-ec73ebe32c6f@github.com>
References: <WGngydqeTxDpNpq5HTLHv9G576gP6iuYyO1oAHB53l8=.00450c64-072f-4b9d-8474-ec73ebe32c6f@github.com>
Message-ID: <SUCPq3Z7Uwo4MCYIhXDx2_RIfump0mJ_tJz60PhIPbs=.0dee3e4d-fef2-4552-b15c-5cd8f1376d79@github.com>

On Wed, 30 Aug 2023 19:39:47 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> The two configuration options for tags in the IssueNotifier, "ignoreopt" and "matchprefix" do not work together if "matchprefix" is set to false (which is the default value). We need to configure a repository where the tag format and the fixVersion differ in both prefix and "opt" suffix. This patch fixes this by reordering the logic in `tagVersionMatchesFixVersion`. I added a test to verify this specific situation. I believe the existing tests should cover all other current usecases.

This pull request has now been integrated.

Changeset: 1f6e3de8
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/1f6e3de8e6a4f53852caa4b8bc7ee820fd47ae55
Stats:     68 lines in 2 files changed: 51 ins; 10 del; 7 mod

2010: Handle both ignoreopt and matchprefix together in IssueNotifier

Reviewed-by: zsong

-------------

PR: https://git.openjdk.org/skara/pull/1551

From zsong at openjdk.org  Thu Aug 31 22:50:47 2023
From: zsong at openjdk.org (Zhao Song)
Date: Thu, 31 Aug 2023 22:50:47 GMT
Subject: RFR: 1997: Allow the creator of a PR to set the commit author
Message-ID: <GpY2ep_iBbg14Iv1aSfJTnvU3WnD8G2P47ulYHpOzYc=.30bad807-0b20-4861-b4bc-1ec3e5518429@github.com>

In this pr, we will introduce a new pull request command `/author`.

If an author wants to contribute a change to a repository, but he doesn't have access, then someone with the access will be able to help him with this command.

Usage: `/author [set|remove] [@user | openjdk-user | Full Name <email at address>]`
Examples: 
`/author set @openjdk-bot`
`/author @openjdk-bot`
`/author set J. Duke <duke at openjdk.org>`
`/author remove @openjdk-bot`
`/author remove`

Note: only Committers of the repository would be allowed to issue /author command.

-------------

Commit messages:
 - update
 - update
 - SKARA-1997

Changes: https://git.openjdk.org/skara/pull/1553/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1553&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1997
  Stats: 358 lines in 7 files changed: 355 ins; 0 del; 3 mod
  Patch: https://git.openjdk.org/skara/pull/1553.diff
  Fetch: git fetch https://git.openjdk.org/skara.git pull/1553/head:pull/1553

PR: https://git.openjdk.org/skara/pull/1553