From rwestberg at openjdk.java.net Wed Jan 8 09:13:55 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 8 Jan 2020 09:13:55 GMT Subject: RFR: 215: Verify webrev links before considering publication successful Message-ID: <_oz2bKmaQLG-Df9iGPVluasiBn0LopL4WupGSBtayiw=.e548e649-9611-4790-b54a-dcbbe7d4b58d@github.com> Hi all, Please review this change which ensures that webrev links can be successfully reached before returning from the publication step. Best regards, Robin ------------- Commits: - 16f41bac: Verify webrev links before considering publication successful Changes: https://git.openjdk.java.net/skara/pull/345/files Webrev: https://webrevs.openjdk.java.net/skara/345/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-215 Stats: 168 lines in 6 files changed: 127 ins; 1 del; 40 mod Patch: https://git.openjdk.java.net/skara/pull/345.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/345/head:pull/345 PR: https://git.openjdk.java.net/skara/pull/345 From rwestberg at openjdk.java.net Fri Jan 10 13:35:16 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 10 Jan 2020 13:35:16 GMT Subject: RFR: 222: Implement backport issue creation Message-ID: Hi all, Please review this initial implementation of updating the fixVersion of issues (possibly creating a backport issue) when they are resolved by a commit, following the existing rules of the current hg updater. Best regards, Robin ------------- Commits: - fa409811: Initial implementation Changes: https://git.openjdk.java.net/skara/pull/346/files Webrev: https://webrevs.openjdk.java.net/skara/346/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-222 Stats: 895 lines in 22 files changed: 724 ins; 112 del; 59 mod Patch: https://git.openjdk.java.net/skara/pull/346.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/346/head:pull/346 PR: https://git.openjdk.java.net/skara/pull/346 From rwestberg at openjdk.java.net Fri Jan 10 13:39:05 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 10 Jan 2020 13:39:05 GMT Subject: [Rev 01] RFR: 222: Implement backport issue creation In-Reply-To: References: Message-ID: > Hi all, > > Please review this initial implementation of updating the fixVersion of issues (possibly creating a backport issue) when they are resolved by a commit, following the existing rules of the current hg updater. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - 36231cc0: Fix missing import Changes: - all: https://git.openjdk.java.net/skara/pull/346/files - new: https://git.openjdk.java.net/skara/pull/346/files/fa409811..36231cc0 Webrevs: - full: https://webrevs.openjdk.java.net/skara/346/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/346/webrev.00-01 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/346.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/346/head:pull/346 PR: https://git.openjdk.java.net/skara/pull/346 From ehelin at openjdk.java.net Mon Jan 13 07:44:18 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 13 Jan 2020 07:44:18 GMT Subject: RFR: 215: Verify webrev links before considering publication successful In-Reply-To: <_oz2bKmaQLG-Df9iGPVluasiBn0LopL4WupGSBtayiw=.e548e649-9611-4790-b54a-dcbbe7d4b58d@github.com> References: <_oz2bKmaQLG-Df9iGPVluasiBn0LopL4WupGSBtayiw=.e548e649-9611-4790-b54a-dcbbe7d4b58d@github.com> Message-ID: On Wed, 8 Jan 2020 09:12:27 GMT, Robin Westberg wrote: > Hi all, > > Please review this change which ensures that webrev links can be successfully reached before returning from the publication step. > > Best regards, > Robin Looks good, just a small suggestion on narrowing the range of successful HTTP status codes ?? bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java line 162: > 161: var response = client.send(request, HttpResponse.BodyHandlers.ofString()); > 162: if (response.statusCode() < 400) { > 163: // Success! Suggestion: if (respons.statusCode() >= 200 && response.statusCode() < 400) { ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/345 From ehelin at openjdk.java.net Mon Jan 13 08:05:58 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 13 Jan 2020 08:05:58 GMT Subject: [Rev 01] RFR: 222: Implement backport issue creation In-Reply-To: References: Message-ID: On Mon, 13 Jan 2020 08:05:56 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this initial implementation of updating the fixVersion of issues (possibly creating a backport issue) when they are resolved by a commit, following the existing rules of the current hg updater. >> >> Best regards, >> Robin > > The pull request has been updated with 1 additional commit. Very nice work Robin ?? Just a few minor comments and suggestions. bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java line 133: > 132: /** > 133: * Return True if fixVersionList is empty or contains only scratch values. > 134: */ Suggestion: * Return true if fixVersionList is empty or contains only scratch values. bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java line 113: > 112: /** > 113: * Return True if the issue's fixVersionList is a match for fixVersion, using "-pool" or "-open". > 114: * Suggestion: * Return true if the issue's fixVersionList is a match for fixVersion, using "-pool" or "-open". bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java line 157: > 156: /** > 157: * Return issue or one of its backports that applies to fixver. > 158: * Suggestion: * Return issue or one of its backports that applies to fixVersion. bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java line 162: > 161: * If the main issue has a matching -pool fixVersion, use it. > 162: * If an existing Backport has a matching -pool fixVersion, use it. > 163: * If the main issue has a "scratch" fixVersion, use it. Perhaps add: * If the main issue has a matching -open fixVersion, use it. * If an existing Backport has a matching -open fixVersion, use it. bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java line 267: > 266: if (requestedVersion != null) { > 267: for (var oldVersion : issue.fixVersions()) { > 268: issue.removeFixVersion(oldVersion); Perhaps add a comment that the old fix versions can only "scratch" versions? ------------- PR: https://git.openjdk.java.net/skara/pull/346 From rwestberg at openjdk.java.net Mon Jan 13 08:32:07 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 08:32:07 GMT Subject: RFR: 215: Verify webrev links before considering publication successful In-Reply-To: References: <_oz2bKmaQLG-Df9iGPVluasiBn0LopL4WupGSBtayiw=.e548e649-9611-4790-b54a-dcbbe7d4b58d@github.com> Message-ID: <71fJlSwu9zipVvk98f-LazJK_XcU6GoBhFdbyVV2Leo=.1c11b222-1d72-41ee-9ff9-38c56ad53275@github.com> On Mon, 13 Jan 2020 07:41:24 GMT, Erik Helin wrote: >> Hi all, >> >> Please review this change which ensures that webrev links can be successfully reached before returning from the publication step. >> >> Best regards, >> Robin > > bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java line 162: > >> 161: var response = client.send(request, HttpResponse.BodyHandlers.ofString()); >> 162: if (response.statusCode() < 400) { >> 163: // Success! > > Suggestion: > > if (respons.statusCode() >= 200 && response.statusCode() < 400) { I don't think < 200's propagate outside of the http client implementation, so should be reasonably safe. ------------- PR: https://git.openjdk.java.net/skara/pull/345 From rwestberg at openjdk.java.net Mon Jan 13 08:32:18 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 08:32:18 GMT Subject: RFR: 215: Verify webrev links before considering publication successful In-Reply-To: References: <_oz2bKmaQLG-Df9iGPVluasiBn0LopL4WupGSBtayiw=.e548e649-9611-4790-b54a-dcbbe7d4b58d@github.com> Message-ID: On Mon, 13 Jan 2020 07:44:04 GMT, Erik Helin wrote: >> Hi all, >> >> Please review this change which ensures that webrev links can be successfully reached before returning from the publication step. >> >> Best regards, >> Robin > > Looks good, just a small suggestion on narrowing the range of successful HTTP status codes ?? Thanks for reviewing! ------------- PR: https://git.openjdk.java.net/skara/pull/345 From rwestberg at openjdk.java.net Mon Jan 13 08:32:35 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 08:32:35 GMT Subject: [Integrated] RFR: 215: Verify webrev links before considering publication successful In-Reply-To: <_oz2bKmaQLG-Df9iGPVluasiBn0LopL4WupGSBtayiw=.e548e649-9611-4790-b54a-dcbbe7d4b58d@github.com> References: <_oz2bKmaQLG-Df9iGPVluasiBn0LopL4WupGSBtayiw=.e548e649-9611-4790-b54a-dcbbe7d4b58d@github.com> Message-ID: Changeset: 3c8b6bcb Author: Robin Westberg Date: 2020-01-13 08:32:13 +0000 URL: https://git.openjdk.java.net/skara/commit/3c8b6bcb 215: Verify webrev links before considering publication successful Reviewed-by: ehelin ! bots/mlbridge/src/main/java/module-info.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListArchiveReaderBotTests.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/WebrevStorageTests.java + test/src/main/java/org/openjdk/skara/test/TestWebrevServer.java From rwestberg at openjdk.java.net Mon Jan 13 08:59:26 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 08:59:26 GMT Subject: [Rev 02] RFR: 222: Implement backport issue creation In-Reply-To: References: Message-ID: > Hi all, > > Please review this initial implementation of updating the fixVersion of issues (possibly creating a backport issue) when they are resolved by a commit, following the existing rules of the current hg updater. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - 2700979b: Updated after review Changes: - all: https://git.openjdk.java.net/skara/pull/346/files - new: https://git.openjdk.java.net/skara/pull/346/files/36231cc0..2700979b Webrevs: - full: https://webrevs.openjdk.java.net/skara/346/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/346/webrev.01-02 Stats: 6 lines in 1 file changed: 1 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/346.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/346/head:pull/346 PR: https://git.openjdk.java.net/skara/pull/346 From rwestberg at openjdk.java.net Mon Jan 13 10:03:16 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 10:03:16 GMT Subject: RFR: Allow unsafe features when importing Message-ID: Hi all, Please review this change that adds a new required flag for running git fast-import, required after the latest git security fixes. Best regards, Robin ------------- Commits: - 4fa9a39a: Allow unsafe features when importing Changes: https://git.openjdk.java.net/skara/pull/347/files Webrev: https://webrevs.openjdk.java.net/skara/347/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/347.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/347/head:pull/347 PR: https://git.openjdk.java.net/skara/pull/347 From ehelin at openjdk.java.net Mon Jan 13 10:44:47 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 13 Jan 2020 10:44:47 GMT Subject: [Rev 02] RFR: 222: Implement backport issue creation In-Reply-To: References: Message-ID: On Mon, 13 Jan 2020 10:44:47 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this initial implementation of updating the fixVersion of issues (possibly creating a backport issue) when they are resolved by a commit, following the existing rules of the current hg updater. >> >> Best regards, >> Robin > > The pull request has been updated with 1 additional commit. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/346 From ehelin at openjdk.java.net Mon Jan 13 10:47:28 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 13 Jan 2020 10:47:28 GMT Subject: RFR: Allow unsafe features when importing In-Reply-To: References: Message-ID: On Mon, 13 Jan 2020 09:52:43 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that adds a new required flag for running git fast-import, required after the latest git security fixes. > > Best regards, > Robin What about older `git` versions that might not support the flag `--allow-unsafe-features`? ------------- PR: https://git.openjdk.java.net/skara/pull/347 From ehelin at openjdk.java.net Mon Jan 13 11:09:45 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 13 Jan 2020 11:09:45 GMT Subject: RFR: 216: git-pr: show response to test and integrate commands Message-ID: Hi all, please review this patch that adds support for showing feedback after a user has issued the `git pr integrate` or `git pr test` commands. Thanks, Erik ## Testing - [x] Manually tested `git pr test` and verified output ------------- Commits: - 841350cd: skara-216 Changes: https://git.openjdk.java.net/skara/pull/348/files Webrev: https://webrevs.openjdk.java.net/skara/348/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-216 Stats: 83 lines in 1 file changed: 75 ins; 5 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/348.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/348/head:pull/348 PR: https://git.openjdk.java.net/skara/pull/348 From rwestberg at openjdk.java.net Mon Jan 13 12:55:57 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 12:55:57 GMT Subject: RFR: Allow unsafe features when importing In-Reply-To: References: Message-ID: On Mon, 13 Jan 2020 10:47:14 GMT, Erik Helin wrote: >> Hi all, >> >> Please review this change that adds a new required flag for running git fast-import, required after the latest git security fixes. >> >> Best regards, >> Robin > > What about older `git` versions that might not support the flag `--allow-unsafe-features`? Don't really see any advantage in supporting versions containing multiple CVE's for the hgbridge I guess :) ------------- PR: https://git.openjdk.java.net/skara/pull/347 From rwestberg at openjdk.java.net Mon Jan 13 13:52:19 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 13:52:19 GMT Subject: RFR: 216: git-pr: show response to test and integrate commands In-Reply-To: References: Message-ID: On Mon, 13 Jan 2020 11:08:51 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds support for showing feedback after a user has > issued the `git pr integrate` or `git pr test` commands. > > Thanks, > Erik > > ## Testing > - [x] Manually tested `git pr test` and verified output Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/348 From ehelin at openjdk.java.net Mon Jan 13 13:56:42 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 13 Jan 2020 13:56:42 GMT Subject: [Integrated] RFR: 216: git-pr: show response to test and integrate commands In-Reply-To: References: Message-ID: <8623a8d1-3860-44c5-9cc8-625f18a00808@openjdk.org> Changeset: af856f50 Author: Erik Helin Date: 2020-01-13 13:56:24 +0000 URL: https://git.openjdk.java.net/skara/commit/af856f50 216: git-pr: show response to test and integrate commands Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitPr.java From rwestberg at openjdk.java.net Mon Jan 13 14:02:00 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 14:02:00 GMT Subject: [Rev 01] RFR: Allow unsafe features when importing In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that adds a new required flag for running git fast-import, required after the latest git security fixes. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - a270d596: Update dockerfiles Changes: - all: https://git.openjdk.java.net/skara/pull/347/files - new: https://git.openjdk.java.net/skara/pull/347/files/4fa9a39a..a270d596 Webrevs: - full: https://webrevs.openjdk.java.net/skara/347/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/347/webrev.00-01 Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/347.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/347/head:pull/347 PR: https://git.openjdk.java.net/skara/pull/347 From rwestberg at openjdk.java.net Mon Jan 13 14:16:31 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 14:16:31 GMT Subject: [Integrated] RFR: 222: Implement backport issue creation In-Reply-To: References: Message-ID: <951a8e29-cc68-476d-a715-999b3b526ea6@openjdk.org> Changeset: 7d878e7d Author: Robin Westberg Date: 2020-01-13 14:16:12 +0000 URL: https://git.openjdk.java.net/skara/commit/7d878e7d 222: Implement backport issue creation Reviewed-by: ehelin ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdaterTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SolvesTests.java ! bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryPullRequest.java ! forge/src/main/java/org/openjdk/skara/forge/github/GitHubPullRequest.java ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabMergeRequest.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/Issue.java + issuetracker/src/main/java/org/openjdk/skara/issuetracker/IssueLinkBuilder.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/IssueProject.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/Link.java - issuetracker/src/main/java/org/openjdk/skara/issuetracker/LinkBuilder.java + issuetracker/src/main/java/org/openjdk/skara/issuetracker/WebLinkBuilder.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraIssue.java + issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraLinkType.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraProject.java ! issuetracker/src/test/java/org/openjdk/skara/issuetracker/IssueTrackerTests.java ! test/src/main/java/org/openjdk/skara/test/HostCredentials.java ! test/src/main/java/org/openjdk/skara/test/IssueData.java ! test/src/main/java/org/openjdk/skara/test/TestHost.java ! test/src/main/java/org/openjdk/skara/test/TestIssue.java ! test/src/main/java/org/openjdk/skara/test/TestIssueProject.java From ehelin at openjdk.java.net Mon Jan 13 14:56:28 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 13 Jan 2020 14:56:28 GMT Subject: [Rev 01] RFR: Allow unsafe features when importing In-Reply-To: References: Message-ID: On Mon, 13 Jan 2020 14:56:27 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that adds a new required flag for running git fast-import, required after the latest git security fixes. >> >> Best regards, >> Robin > > The pull request has been updated with 1 additional commit. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/347 From ehelin at openjdk.java.net Mon Jan 13 14:56:46 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 13 Jan 2020 14:56:46 GMT Subject: [Rev 01] RFR: Allow unsafe features when importing In-Reply-To: References: Message-ID: On Mon, 13 Jan 2020 14:56:16 GMT, Erik Helin wrote: >> The pull request has been updated with 1 additional commit. > > Looks good! > Don't really see any advantage in supporting versions containing multiple CVE's for the hgbridge I guess :) No, I agree. Thanks, Erik ------------- PR: https://git.openjdk.java.net/skara/pull/347 From ehelin at openjdk.java.net Mon Jan 13 14:58:30 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 13 Jan 2020 14:58:30 GMT Subject: RFR: 224: Add --no-draft flag to `git pr list` Message-ID: Hi all, please review this patch that adds the flag `--no-draft` to `git pr list`. Thanks, Erik ## Testing - [x] Manual testing of `git pr list` ------------- Commits: - 39c6c7c1: skara-224 Changes: https://git.openjdk.java.net/skara/pull/349/files Webrev: https://webrevs.openjdk.java.net/skara/349/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-224 Stats: 10 lines in 1 file changed: 9 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/349.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/349/head:pull/349 PR: https://git.openjdk.java.net/skara/pull/349 From rwestberg at openjdk.java.net Mon Jan 13 15:17:27 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 15:17:27 GMT Subject: [Integrated] RFR: Allow unsafe features when importing In-Reply-To: References: Message-ID: Changeset: 9c67b6da Author: Robin Westberg Date: 2020-01-13 15:17:14 +0000 URL: https://git.openjdk.java.net/skara/commit/9c67b6da Allow unsafe features when importing Reviewed-by: ehelin ! bots.dockerfile ! test.dockerfile ! vcs/src/main/java/org/openjdk/skara/vcs/openjdk/convert/HgToGitConverter.java From rwestberg at openjdk.java.net Mon Jan 13 15:17:49 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 15:17:49 GMT Subject: RFR: 224: Add --no-draft flag to `git pr list` In-Reply-To: References: Message-ID: On Mon, 13 Jan 2020 14:57:43 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the flag `--no-draft` to `git pr list`. > > Thanks, > Erik > > ## Testing > - [x] Manual testing of `git pr list` Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/349 From ehelin at openjdk.java.net Mon Jan 13 15:20:04 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 13 Jan 2020 15:20:04 GMT Subject: [Integrated] RFR: 224: Add --no-draft flag to `git pr list` In-Reply-To: References: Message-ID: <3a9460b5-5b9d-4fac-92eb-31f1b238aabd@openjdk.org> Changeset: 72c93f08 Author: Erik Helin Date: 2020-01-13 15:19:45 +0000 URL: https://git.openjdk.java.net/skara/commit/72c93f08 224: Add --no-draft flag to `git pr list` Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitPr.java From ehelin at openjdk.java.net Mon Jan 13 15:49:42 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 13 Jan 2020 15:49:42 GMT Subject: RFR: 227: Increase timeout on getting feedback for /test and /integrate Message-ID: Hi all, please review this small patch that increases the timeouts for the `/test` and `/integrate` when the `git pr` CLI tool is awaiting the bots to come back with a reply. Thanks, Erik ------------- Commits: - f90fd1ac: skara-227 Changes: https://git.openjdk.java.net/skara/pull/350/files Webrev: https://webrevs.openjdk.java.net/skara/350/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-227 Stats: 4 lines in 1 file changed: 0 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/350.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/350/head:pull/350 PR: https://git.openjdk.java.net/skara/pull/350 From rwestberg at openjdk.java.net Mon Jan 13 15:50:21 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 13 Jan 2020 15:50:21 GMT Subject: RFR: 227: Increase timeout on getting feedback for /test and /integrate In-Reply-To: References: Message-ID: On Mon, 13 Jan 2020 15:49:01 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that increases the timeouts for the `/test` and > `/integrate` when the `git pr` CLI tool is awaiting the bots to come back with a > reply. > > Thanks, > Erik Looks reasonable! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/350 From ehelin at openjdk.java.net Tue Jan 14 13:17:13 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 14 Jan 2020 13:17:13 GMT Subject: [Integrated] RFR: 227: Increase timeout on getting feedback for /test and /integrate In-Reply-To: References: Message-ID: <7fb0bd17-ed06-46de-9834-f593524df2b3@openjdk.org> Changeset: d0cc3d7c Author: Erik Helin Date: 2020-01-14 13:16:55 +0000 URL: https://git.openjdk.java.net/skara/commit/d0cc3d7c 227: Increase timeout on getting feedback for /test and /integrate Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitPr.java From ehelin at openjdk.java.net Tue Jan 14 14:35:55 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 14 Jan 2020 14:35:55 GMT Subject: RFR: 226: Fewer default columns for `git pr list` Message-ID: Hi all, please review this small patch that uses fewer columns by default for `git pr list`. The columns are of course still user configurable, either via the `--columns` flag to `git pr list` or via the `pr.list.columns` configuration variable. Thanks, Erik ## Testing - [x] Manual testing of `git pr list` ------------- Commits: - e5f9e79b: skara-226 Changes: https://git.openjdk.java.net/skara/pull/351/files Webrev: https://webrevs.openjdk.java.net/skara/351/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-226 Stats: 17 lines in 1 file changed: 0 ins; 1 del; 16 mod Patch: https://git.openjdk.java.net/skara/pull/351.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/351/head:pull/351 PR: https://git.openjdk.java.net/skara/pull/351 From rwestberg at openjdk.java.net Tue Jan 14 14:36:07 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 14 Jan 2020 14:36:07 GMT Subject: RFR: 226: Fewer default columns for `git pr list` In-Reply-To: References: Message-ID: On Tue, 14 Jan 2020 14:33:51 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that uses fewer columns by default for `git pr > list`. The columns are of course still user configurable, either via the > `--columns` flag to `git pr list` or via the `pr.list.columns` configuration > variable. > > Thanks, > Erik > > ## Testing > - [x] Manual testing of `git pr list` Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/351 From ehelin at openjdk.java.net Tue Jan 14 14:48:00 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 14 Jan 2020 14:48:00 GMT Subject: [Integrated] RFR: 226: Fewer default columns for `git pr list` In-Reply-To: References: Message-ID: Changeset: d9bc4ccc Author: Erik Helin Date: 2020-01-14 14:47:44 +0000 URL: https://git.openjdk.java.net/skara/commit/d9bc4ccc 226: Fewer default columns for `git pr list` Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitPr.java From rwestberg at openjdk.java.net Wed Jan 15 09:58:50 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Jan 2020 09:58:50 GMT Subject: RFR: Propagate issue properties when creating backports Message-ID: Hi all, Please review this change that ensures that certain properties are propagated when creating backport issues. Best regards, Robin ------------- Commits: - aa0ec2b8: Propagate issue properties when creating backports Changes: https://git.openjdk.java.net/skara/pull/352/files Webrev: https://webrevs.openjdk.java.net/skara/352/webrev.00 Stats: 369 lines in 14 files changed: 128 ins; 141 del; 100 mod Patch: https://git.openjdk.java.net/skara/pull/352.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/352/head:pull/352 PR: https://git.openjdk.java.net/skara/pull/352 From rwestberg at openjdk.java.net Wed Jan 15 10:15:02 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Jan 2020 10:15:02 GMT Subject: [Rev 01] RFR: Propagate issue properties when creating backports In-Reply-To: References: Message-ID: <4H6axb8PilQ4rZm7DT64-wOITfMGVF8C3d_PI8nsYg8=.29ecfcaa-e746-4d71-91ef-3f7dcdd98f7c@github.com> > Hi all, > > Please review this change that ensures that certain properties are propagated when creating backport issues. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - df4b6b78: Fix failing test Changes: - all: https://git.openjdk.java.net/skara/pull/352/files - new: https://git.openjdk.java.net/skara/pull/352/files/aa0ec2b8..df4b6b78 Webrevs: - full: https://webrevs.openjdk.java.net/skara/352/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/352/webrev.00-01 Stats: 2 lines in 1 file changed: 1 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/352.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/352/head:pull/352 PR: https://git.openjdk.java.net/skara/pull/352 From rwestberg at openjdk.java.net Wed Jan 15 12:29:49 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Jan 2020 12:29:49 GMT Subject: RFR: Add test mailserver logging Message-ID: Hi all, Please review this minor change that adds a bit of logging. Best regards, Robin ------------- Commits: - dac24015: force new check - 2ded1c51: Try to repro with logging Changes: https://git.openjdk.java.net/skara/pull/327/files Webrev: https://webrevs.openjdk.java.net/skara/327/webrev.00 Stats: 12 lines in 2 files changed: 10 ins; 1 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/327.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/327/head:pull/327 PR: https://git.openjdk.java.net/skara/pull/327 From ehelin at openjdk.java.net Wed Jan 15 12:30:57 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 15 Jan 2020 12:30:57 GMT Subject: [Rev 01] RFR: Propagate issue properties when creating backports In-Reply-To: <4H6axb8PilQ4rZm7DT64-wOITfMGVF8C3d_PI8nsYg8=.29ecfcaa-e746-4d71-91ef-3f7dcdd98f7c@github.com> References: <4H6axb8PilQ4rZm7DT64-wOITfMGVF8C3d_PI8nsYg8=.29ecfcaa-e746-4d71-91ef-3f7dcdd98f7c@github.com> Message-ID: On Wed, 15 Jan 2020 12:30:57 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that ensures that certain properties are propagated when creating backport issues. >> >> Best regards, >> Robin > > The pull request has been updated with 1 additional commit. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/352 From rwestberg at openjdk.java.net Wed Jan 15 12:32:09 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Jan 2020 12:32:09 GMT Subject: RFR: Improve formatting of ready-for-merge message Message-ID: Hi all, Please review this minor fix that improves the formatting of the ready-for-merge message when no automatic rebase is needed. Best regards, Robin ------------- Commits: - 10b7598f: Always output a newline Changes: https://git.openjdk.java.net/skara/pull/353/files Webrev: https://webrevs.openjdk.java.net/skara/353/webrev.00 Stats: 3 lines in 1 file changed: 0 ins; 2 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/353.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/353/head:pull/353 PR: https://git.openjdk.java.net/skara/pull/353 From rwestberg at openjdk.java.net Wed Jan 15 12:36:58 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Jan 2020 12:36:58 GMT Subject: [Integrated] RFR: Propagate issue properties when creating backports In-Reply-To: References: Message-ID: <3fb133ea-6045-4e35-884e-98afb786ef38@openjdk.org> Changeset: fd514098 Author: Robin Westberg Date: 2020-01-15 12:36:44 +0000 URL: https://git.openjdk.java.net/skara/commit/fd514098 Propagate issue properties when creating backports Reviewed-by: ehelin ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdaterTests.java ! bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryPullRequest.java ! forge/src/main/java/org/openjdk/skara/forge/github/GitHubPullRequest.java ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabMergeRequest.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/Issue.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/IssueProject.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraIssue.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraProject.java ! issuetracker/src/test/java/org/openjdk/skara/issuetracker/IssueTrackerTests.java ! test/src/main/java/org/openjdk/skara/test/IssueData.java ! test/src/main/java/org/openjdk/skara/test/TestHost.java ! test/src/main/java/org/openjdk/skara/test/TestIssue.java ! test/src/main/java/org/openjdk/skara/test/TestIssueProject.java From rwestberg at openjdk.java.net Wed Jan 15 12:41:00 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Jan 2020 12:41:00 GMT Subject: [Rev 01] RFR: Add test mailserver logging In-Reply-To: References: Message-ID: > Hi all, > > Please review this minor change that adds a bit of logging. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - 5853a679: Undo readme changes Changes: - all: https://git.openjdk.java.net/skara/pull/327/files - new: https://git.openjdk.java.net/skara/pull/327/files/dac24015..5853a679 Webrevs: - full: https://webrevs.openjdk.java.net/skara/327/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/327/webrev.00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/327.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/327/head:pull/327 PR: https://git.openjdk.java.net/skara/pull/327 From ehelin at openjdk.java.net Wed Jan 15 12:44:06 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 15 Jan 2020 12:44:06 GMT Subject: [Rev 01] RFR: Add test mailserver logging In-Reply-To: References: Message-ID: On Wed, 15 Jan 2020 12:44:06 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this minor change that adds a bit of logging. >> >> Best regards, >> Robin > > The pull request has been updated with 1 additional commit. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/327 From ehelin at openjdk.java.net Wed Jan 15 12:44:38 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 15 Jan 2020 12:44:38 GMT Subject: RFR: Improve formatting of ready-for-merge message In-Reply-To: References: Message-ID: On Wed, 15 Jan 2020 12:31:19 GMT, Robin Westberg wrote: > Hi all, > > Please review this minor fix that improves the formatting of the ready-for-merge message when no automatic rebase is needed. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/353 From rwestberg at openjdk.java.net Wed Jan 15 12:45:27 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Jan 2020 12:45:27 GMT Subject: [Integrated] RFR: Improve formatting of ready-for-merge message In-Reply-To: References: Message-ID: <00d68bdb-3f36-4f97-b2f6-b39607140e85@openjdk.org> Changeset: 0d1c64f2 Author: Robin Westberg Date: 2020-01-15 12:45:14 +0000 URL: https://git.openjdk.java.net/skara/commit/0d1c64f2 Improve formatting of ready-for-merge message Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java From rwestberg at openjdk.java.net Wed Jan 15 12:46:06 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Jan 2020 12:46:06 GMT Subject: [Integrated] RFR: Add test mailserver logging In-Reply-To: References: Message-ID: <22711ae6-a8f7-4fb2-9864-2ae31aa12a2b@openjdk.org> Changeset: 85526580 Author: Robin Westberg Date: 2020-01-15 12:45:52 +0000 URL: https://git.openjdk.java.net/skara/commit/85526580 Add test mailserver logging Reviewed-by: ehelin ! test/src/main/java/org/openjdk/skara/test/TestMailmanServer.java From rwestberg at openjdk.java.net Wed Jan 15 14:01:54 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Jan 2020 14:01:54 GMT Subject: RFR: Allow setting a fixversion per branch Message-ID: <-jopzlVbiab-pvpqOETWDYQphRvw3aFzeo2vkWbf__4=.904fe4c5-77d2-43b9-be9c-db9bdc3200cd@github.com> Hi all, Please review this change that allows setting a branch specific fixversion in the issue updater. Best regards, Robin ------------- Commits: - 0487bc71: Allow setting a fixversion per branch Changes: https://git.openjdk.java.net/skara/pull/354/files Webrev: https://webrevs.openjdk.java.net/skara/354/webrev.00 Stats: 13 lines in 3 files changed: 1 ins; 0 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/354.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/354/head:pull/354 PR: https://git.openjdk.java.net/skara/pull/354 From rwestberg at openjdk.java.net Wed Jan 15 15:25:42 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Jan 2020 15:25:42 GMT Subject: RFR: Make it possible to fetch the state of an issue Message-ID: Hi all, Please review this change that adds a method that returns the state of an issue, to complement the current possibility of just setting it. Best regards, Robin ------------- Commits: - ed505d5e: Make it possible to fetch the state of an issue Changes: https://git.openjdk.java.net/skara/pull/355/files Webrev: https://webrevs.openjdk.java.net/skara/355/webrev.00 Stats: 58 lines in 9 files changed: 52 ins; 4 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/355.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/355/head:pull/355 PR: https://git.openjdk.java.net/skara/pull/355 From ehelin at openjdk.java.net Wed Jan 15 15:37:36 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 15 Jan 2020 15:37:36 GMT Subject: RFR: Allow setting a fixversion per branch In-Reply-To: <-jopzlVbiab-pvpqOETWDYQphRvw3aFzeo2vkWbf__4=.904fe4c5-77d2-43b9-be9c-db9bdc3200cd@github.com> References: <-jopzlVbiab-pvpqOETWDYQphRvw3aFzeo2vkWbf__4=.904fe4c5-77d2-43b9-be9c-db9bdc3200cd@github.com> Message-ID: On Wed, 15 Jan 2020 14:01:03 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that allows setting a branch specific fixversion in the issue updater. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/354 From ehelin at openjdk.java.net Wed Jan 15 15:38:46 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 15 Jan 2020 15:38:46 GMT Subject: RFR: Make it possible to fetch the state of an issue In-Reply-To: References: Message-ID: <0TxDn1SPRkZ4U45jVs5y2Izq2G2NdZgblQ1-PZLMCXo=.885fc517-ad77-4675-9d13-3a975cbf3978@github.com> On Wed, 15 Jan 2020 15:24:57 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that adds a method that returns the state of an issue, to complement the current possibility of just setting it. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/355 From rwestberg at openjdk.java.net Thu Jan 16 07:10:07 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 07:10:07 GMT Subject: [Integrated] RFR: Allow setting a fixversion per branch In-Reply-To: <-jopzlVbiab-pvpqOETWDYQphRvw3aFzeo2vkWbf__4=.904fe4c5-77d2-43b9-be9c-db9bdc3200cd@github.com> References: <-jopzlVbiab-pvpqOETWDYQphRvw3aFzeo2vkWbf__4=.904fe4c5-77d2-43b9-be9c-db9bdc3200cd@github.com> Message-ID: Changeset: 207532cc Author: Robin Westberg Date: 2020-01-16 07:09:54 +0000 URL: https://git.openjdk.java.net/skara/commit/207532cc Allow setting a fixversion per branch Reviewed-by: ehelin ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/NotifyBotFactory.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdaterTests.java From rwestberg at openjdk.java.net Thu Jan 16 07:10:20 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 07:10:20 GMT Subject: [Integrated] RFR: Make it possible to fetch the state of an issue In-Reply-To: References: Message-ID: Changeset: b6753f29 Author: Robin Westberg Date: 2020-01-16 07:10:05 +0000 URL: https://git.openjdk.java.net/skara/commit/b6753f29 Make it possible to fetch the state of an issue Reviewed-by: ehelin ! bots/bridgekeeper/src/test/java/org/openjdk/skara/bots/bridgekeeper/PullRequestCloserBotTests.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdaterTests.java ! bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryPullRequest.java ! forge/src/main/java/org/openjdk/skara/forge/github/GitHubPullRequest.java ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabMergeRequest.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/Issue.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraIssue.java ! test/src/main/java/org/openjdk/skara/test/TestHost.java ! test/src/main/java/org/openjdk/skara/test/TestIssue.java From rwestberg at openjdk.java.net Thu Jan 16 07:54:58 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 07:54:58 GMT Subject: RFR: Add additional logging to the webrev availability verifier Message-ID: Hi all, Please review this minor change that logs the status of the webrev availability check regardless of the outcome, to aid future troubleshooting. Best regards, Robin ------------- Commits: - 498c7c57: Add additional logging Changes: https://git.openjdk.java.net/skara/pull/356/files Webrev: https://webrevs.openjdk.java.net/skara/356/webrev.00 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/356.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/356/head:pull/356 PR: https://git.openjdk.java.net/skara/pull/356 From ehelin at openjdk.java.net Thu Jan 16 07:56:09 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Jan 2020 07:56:09 GMT Subject: RFR: Add additional logging to the webrev availability verifier In-Reply-To: References: Message-ID: On Thu, 16 Jan 2020 07:54:11 GMT, Robin Westberg wrote: > Hi all, > > Please review this minor change that logs the status of the webrev availability check regardless of the outcome, to aid future troubleshooting. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/356 From rwestberg at openjdk.java.net Thu Jan 16 07:56:49 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 07:56:49 GMT Subject: [Integrated] RFR: Add additional logging to the webrev availability verifier In-Reply-To: References: Message-ID: <19754901-9fc9-4e96-9577-fbed6bad6934@openjdk.org> Changeset: 771a56c4 Author: Robin Westberg Date: 2020-01-16 07:56:35 +0000 URL: https://git.openjdk.java.net/skara/commit/771a56c4 Add additional logging to the webrev availability verifier Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java From rwestberg at openjdk.java.net Thu Jan 16 08:56:17 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 08:56:17 GMT Subject: RFR: Assign unassigned issues when resolving them Message-ID: Hi all, Please review this change that sets the assignee of unassigned issues when resolving them. Best regards, Robin ------------- Commits: - 151d7b1f: Assign unassigned issues when resolving them Changes: https://git.openjdk.java.net/skara/pull/357/files Webrev: https://webrevs.openjdk.java.net/skara/357/webrev.00 Stats: 41 lines in 2 files changed: 34 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/357.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/357/head:pull/357 PR: https://git.openjdk.java.net/skara/pull/357 From rwestberg at openjdk.java.net Thu Jan 16 08:57:24 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 08:57:24 GMT Subject: RFR: Fix race condition in mailman cache test Message-ID: Hi all, Please review this small change that fixes a race condition in the mailman cache test. Best regards, Robin ------------- Commits: - 6e665956: Fix race condition in test Changes: https://git.openjdk.java.net/skara/pull/358/files Webrev: https://webrevs.openjdk.java.net/skara/358/webrev.00 Stats: 2 lines in 1 file changed: 1 ins; 1 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/358.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/358/head:pull/358 PR: https://git.openjdk.java.net/skara/pull/358 From ehelin at openjdk.java.net Thu Jan 16 09:17:00 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Jan 2020 09:17:00 GMT Subject: RFR: Assign unassigned issues when resolving them In-Reply-To: References: Message-ID: On Thu, 16 Jan 2020 08:55:24 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that sets the assignee of unassigned issues when resolving them. > > Best regards, > Robin bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java line 233: > 232: } > 233: } > 234: Instead of repeating `Optional.of(issueProject.issueTracker().user(...))`, you might want to code this like: String username = null; var authorEmail = EmailAddress.from(commit.author().email()); if (authorEmail.domain().equals("openjdk.org")) { username = authorEmail.localPart(); } else { var committerEmail = EmailAddress.from(commit.committer().email()); if (!committerEmail.domain().equals("openjdk.org")) { log.severe("Cannot determine issue tracker user name from committer email: " + committerEmail); } username = committerEmail.localPart(); } return username == null ? Optional.empty() : Optional.of(issueProject.issueTracker().user(username)); ------------- PR: https://git.openjdk.java.net/skara/pull/357 From rwestberg at openjdk.java.net Thu Jan 16 09:42:23 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 09:42:23 GMT Subject: RFR: Ensure that redirects are followed when verifying webrev links Message-ID: Hi all, Please review this change that ensures that webrev link verification follows redirects, to avoid false positives. Best regards, Robin ------------- Commits: - 5e7c3d96: Ensure that redirects are followed when verifying webrev links Changes: https://git.openjdk.java.net/skara/pull/359/files Webrev: https://webrevs.openjdk.java.net/skara/359/webrev.00 Stats: 17 lines in 3 files changed: 14 ins; 1 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/359.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/359/head:pull/359 PR: https://git.openjdk.java.net/skara/pull/359 From ehelin at openjdk.java.net Thu Jan 16 09:53:45 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Jan 2020 09:53:45 GMT Subject: RFR: Assign unassigned issues when resolving them In-Reply-To: References: Message-ID: On Thu, 16 Jan 2020 08:55:24 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that sets the assignee of unassigned issues when resolving them. > > Best regards, > Robin ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/357 From ehelin at openjdk.java.net Thu Jan 16 09:53:46 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Jan 2020 09:53:46 GMT Subject: RFR: Assign unassigned issues when resolving them In-Reply-To: References: Message-ID: On Thu, 16 Jan 2020 09:16:45 GMT, Erik Helin wrote: >> Hi all, >> >> Please review this change that sets the assignee of unassigned issues when resolving them. >> >> Best regards, >> Robin > > bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java line 233: > >> 232: } >> 233: } >> 234: > > Instead of repeating `Optional.of(issueProject.issueTracker().user(...))`, you might want to code this like: > String username = null; > > var authorEmail = EmailAddress.from(commit.author().email()); > if (authorEmail.domain().equals("openjdk.org")) { > username = authorEmail.localPart(); > } else { > var committerEmail = EmailAddress.from(commit.committer().email()); > if (!committerEmail.domain().equals("openjdk.org")) { > log.severe("Cannot determine issue tracker user name from committer email: " + committerEmail); > } > username = committerEmail.localPart(); > } > > return username == null ? Optional.empty() : Optional.of(issueProject.issueTracker().user(username)); Oh, I should mention that I'm fine your version as well ?? If you want to use your version with early return, then please remove the `else {` part after the return ?? ------------- PR: https://git.openjdk.java.net/skara/pull/357 From ehelin at openjdk.java.net Thu Jan 16 09:54:29 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Jan 2020 09:54:29 GMT Subject: RFR: Fix race condition in mailman cache test In-Reply-To: References: Message-ID: On Thu, 16 Jan 2020 08:56:37 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that fixes a race condition in the mailman cache test. > > Best regards, > Robin Looks good, thanks for catching this! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/358 From ehelin at openjdk.java.net Thu Jan 16 09:55:00 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Jan 2020 09:55:00 GMT Subject: RFR: Ensure that redirects are followed when verifying webrev links In-Reply-To: References: Message-ID: <4jyT7oU1sknXnscrusEMJdX_Ye5alBvzbUOxm_mZpmg=.bbafd805-cc67-4d35-bd68-b03f7d83adb9@github.com> On Thu, 16 Jan 2020 09:41:37 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that ensures that webrev link verification follows redirects, to avoid false positives. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/359 From rwestberg at openjdk.java.net Thu Jan 16 09:58:30 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 09:58:30 GMT Subject: [Rev 01] RFR: Assign unassigned issues when resolving them In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that sets the assignee of unassigned issues when resolving them. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - 5e3019bb: Refactor a bit for readability Changes: - all: https://git.openjdk.java.net/skara/pull/357/files - new: https://git.openjdk.java.net/skara/pull/357/files/151d7b1f..5e3019bb Webrevs: - full: https://webrevs.openjdk.java.net/skara/357/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/357/webrev.00-01 Stats: 16 lines in 1 file changed: 2 ins; 2 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/357.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/357/head:pull/357 PR: https://git.openjdk.java.net/skara/pull/357 From rwestberg at openjdk.java.net Thu Jan 16 09:58:46 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 09:58:46 GMT Subject: [Rev 01] RFR: Assign unassigned issues when resolving them In-Reply-To: References: Message-ID: On Thu, 16 Jan 2020 09:53:32 GMT, Erik Helin wrote: >> bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java line 233: >> >>> 232: } >>> 233: } >>> 234: >> >> Instead of repeating `Optional.of(issueProject.issueTracker().user(...))`, you might want to code this like: >> String username = null; >> >> var authorEmail = EmailAddress.from(commit.author().email()); >> if (authorEmail.domain().equals("openjdk.org")) { >> username = authorEmail.localPart(); >> } else { >> var committerEmail = EmailAddress.from(commit.committer().email()); >> if (!committerEmail.domain().equals("openjdk.org")) { >> log.severe("Cannot determine issue tracker user name from committer email: " + committerEmail); >> } >> username = committerEmail.localPart(); >> } >> >> return username == null ? Optional.empty() : Optional.of(issueProject.issueTracker().user(username)); > > Oh, I should mention that I'm fine your version as well ?? If you want to use your version with early return, then please remove the `else {` part after the return ?? Fair enough, how about this? :) ------------- PR: https://git.openjdk.java.net/skara/pull/357 From rwestberg at openjdk.java.net Thu Jan 16 10:12:52 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 10:12:52 GMT Subject: [Integrated] RFR: Ensure that redirects are followed when verifying webrev links In-Reply-To: References: Message-ID: Changeset: e6e05bcb Author: Robin Westberg Date: 2020-01-16 10:12:24 +0000 URL: https://git.openjdk.java.net/skara/commit/e6e05bcb Ensure that redirects are followed when verifying webrev links Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/WebrevStorageTests.java ! test/src/main/java/org/openjdk/skara/test/TestWebrevServer.java From rwestberg at openjdk.java.net Thu Jan 16 10:13:38 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 10:13:38 GMT Subject: [Integrated] RFR: Fix race condition in mailman cache test In-Reply-To: References: Message-ID: <58613a17-1e01-4c0a-af60-d63944268293@openjdk.org> Changeset: 2cacefcf Author: Robin Westberg Date: 2020-01-16 10:13:24 +0000 URL: https://git.openjdk.java.net/skara/commit/2cacefcf Fix race condition in mailman cache test Reviewed-by: ehelin ! test/src/main/java/org/openjdk/skara/test/TestMailmanServer.java From rwestberg at openjdk.java.net Thu Jan 16 11:00:02 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 11:00:02 GMT Subject: git: openjdk/skara: Fix git 2.25 compatibility Message-ID: Changeset: 0624bed2 Author: Robin Westberg Date: 2020-01-16 10:59:45 +0000 URL: https://git.openjdk.java.net/skara/commit/0624bed2 Fix git 2.25 compatibility Reviewed-by: ehelin ! vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java From rwestberg at openjdk.java.net Thu Jan 16 11:07:17 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Jan 2020 11:07:17 GMT Subject: [Integrated] RFR: Assign unassigned issues when resolving them In-Reply-To: References: Message-ID: Changeset: eb311384 Author: Robin Westberg Date: 2020-01-16 11:07:05 +0000 URL: https://git.openjdk.java.net/skara/commit/eb311384 Assign unassigned issues when resolving them Reviewed-by: ehelin ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdaterTests.java From joe.darcy at oracle.com Thu Jan 16 20:57:06 2020 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 16 Jan 2020 12:57:06 -0800 Subject: Fwd: Invitation to Project Skara update and demo, January 22, 2020, 8:30 am PST (UTC-8) / 4:30 pm GMT (UTC+0) / 5:30 pm CET (UTC+1) In-Reply-To: References: Message-ID: FYI, -Joe -------- Forwarded Message -------- Subject: Invitation to Project Skara update and demo, January 22, 2020, 8:30 am PST (UTC-8) / 4:30 pm GMT (UTC+0) / 5:30 pm CET (UTC+1) Date: Thu, 16 Jan 2020 12:56:18 -0800 From: Joe Darcy Organization: Oracle Corporation To: 'discuss at openjdk.java.net' Hello, Project Skara [1] has been investigating migrating from Mercurial to Git for the OpenJDK Community's source code management needs. This work is described in two JEPs, JEP 357: "Migrate from Mercurial to Git" [2] and JEP 369: "Migrate to GitHub." [3]. Please join the Skara team on January 22, 2020 at ??? 8:30 am PST (UTC-8) / 4:30 pm GMT (UTC+0) / 5:30 pm CET (UTC+1) for an update and presentation, including a demo of the current state of the project, over Zoom ? https://oracle.zoom.us/j/4082767053 Also possible to join by phone: ??? +1 669 900 6833 or +1 646 558 8656 US Toll ??? Meeting ID: 408 276 7053 ??? International numbers available: https://oracle.zoom.us/u/adAltN8jVN -Joe [1] https://wiki.openjdk.java.net/display/SKARA [2] http://openjdk.java.net/jeps/357 [3] http://openjdk.java.net/jeps/369 From rwestberg at openjdk.java.net Fri Jan 17 08:55:42 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 17 Jan 2020 08:55:42 GMT Subject: RFR: Fix incorrect use of optional result Message-ID: Hi all, Please review this small change that fixes two missed instances of incorrect use of an optional result after a previous refactoring. Best regards, Robin ------------- Commits: - e41abb81: Fix incorrect use of optional result Changes: https://git.openjdk.java.net/skara/pull/362/files Webrev: https://webrevs.openjdk.java.net/skara/362/webrev.00 Stats: 5 lines in 2 files changed: 2 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/362.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/362/head:pull/362 PR: https://git.openjdk.java.net/skara/pull/362 From ehelin at openjdk.java.net Fri Jan 17 08:56:43 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 17 Jan 2020 08:56:43 GMT Subject: RFR: 231: The merge bot cannot create merge conflict PRs Message-ID: Hi all, please review this patch that fixes the merge bot. The merge bot is able to automatically merge commits from a branch in one repository to a branch in another repository. When the merge bot encounters a merge conflict it is supposed to open a PR describing the conflict. This didn't work because I forgot to include a personal fork for the bot when writing the code the first time around. This patch fixes and makes the merge bot aware of a personal fork it can use for creating PRs. I also had to update `TestPullRequest` a little bit to make it work with pull requests _between_ two different `TestHostedRepository` instances. Finally I also added the new method `Repository.prune`. It isn't currently used (besides by the unit test), but I used it at one point in time during this rewrite of the merge bot and I have a feeling we might need it again soon, so I decided to let it stay and be part of the patch. Thanks, Erik ## Testing - [x] `make test` on Linux x64 (includes unit tests for the merge bot) ------------- Commits: - 1bce3f13: skara-231 Changes: https://git.openjdk.java.net/skara/pull/361/files Webrev: https://webrevs.openjdk.java.net/skara/361/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-231 Stats: 177 lines in 10 files changed: 122 ins; 1 del; 54 mod Patch: https://git.openjdk.java.net/skara/pull/361.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/361/head:pull/361 PR: https://git.openjdk.java.net/skara/pull/361 From rwestberg at openjdk.java.net Fri Jan 17 09:06:11 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 17 Jan 2020 09:06:11 GMT Subject: RFR: Handle redirects manually Message-ID: Hi all, Please review this change that updates the webrev link verifier to handle redirects manually. Requesting the HttpClient to follow redirects automatically doesn't actually work in our case, not quite sure why. But we can work around it in the meantime. Best regards, Robin ------------- Commits: - 7fc52969: Handle redirects manually Changes: https://git.openjdk.java.net/skara/pull/363/files Webrev: https://webrevs.openjdk.java.net/skara/363/webrev.00 Stats: 13 lines in 2 files changed: 9 ins; 2 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/363.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/363/head:pull/363 PR: https://git.openjdk.java.net/skara/pull/363 From rwestberg at openjdk.java.net Fri Jan 17 09:17:19 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 17 Jan 2020 09:17:19 GMT Subject: RFR: 231: The merge bot cannot create merge conflict PRs In-Reply-To: References: Message-ID: <2NKFTM-Jp9uuSV6-UaILJ7Nq4jPDouUkw0YfTYzZlqI=.293fd7ad-621a-4d6f-94d9-e8ccbc7d3c3b@github.com> On Thu, 16 Jan 2020 15:07:49 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes the merge bot. The merge bot is able to > automatically merge commits from a branch in one repository to a branch in > another repository. When the merge bot encounters a merge conflict it is > supposed to open a PR describing the conflict. > > This didn't work because I forgot to include a personal fork for the bot when > writing the code the first time around. This patch fixes and makes the merge bot > aware of a personal fork it can use for creating PRs. > > I also had to update `TestPullRequest` a little bit to make it work with pull > requests _between_ two different `TestHostedRepository` instances. > > Finally I also added the new method `Repository.prune`. It isn't currently used > (besides by the unit test), but I used it at one point in time during this > rewrite of the merge bot and I have a feeling we might need it again soon, so I > decided to let it stay and be part of the patch. > > Thanks, > Erik > > ## Testing > - [x] `make test` on Linux x64 (includes unit tests for the merge bot) Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/361 From ehelin at openjdk.java.net Fri Jan 17 09:41:30 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 17 Jan 2020 09:41:30 GMT Subject: RFR: Fix incorrect use of optional result In-Reply-To: References: Message-ID: On Fri, 17 Jan 2020 07:04:58 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that fixes two missed instances of incorrect use of an optional result after a previous refactoring. > > Best regards, > Robin Looks good, thanks for fixing! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/362 From ehelin at openjdk.java.net Fri Jan 17 09:43:10 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 17 Jan 2020 09:43:10 GMT Subject: RFR: Handle redirects manually In-Reply-To: References: Message-ID: On Fri, 17 Jan 2020 09:02:53 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that updates the webrev link verifier to handle redirects manually. Requesting the HttpClient to follow redirects automatically doesn't actually work in our case, not quite sure why. But we can work around it in the meantime. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/363 From rwestberg at openjdk.java.net Fri Jan 17 09:52:35 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 17 Jan 2020 09:52:35 GMT Subject: [Integrated] RFR: Handle redirects manually In-Reply-To: References: Message-ID: <099ad8ce-6745-49cd-a6fc-71abb90af5ec@openjdk.org> Changeset: fd9d0e68 Author: Robin Westberg Date: 2020-01-17 09:44:37 +0000 URL: https://git.openjdk.java.net/skara/commit/fd9d0e68 Handle redirects manually Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java ! test/src/main/java/org/openjdk/skara/test/TestWebrevServer.java From ehelin at openjdk.java.net Fri Jan 17 09:52:35 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 17 Jan 2020 09:52:35 GMT Subject: [Integrated] RFR: 231: The merge bot cannot create merge conflict PRs In-Reply-To: References: Message-ID: <3ab43633-877c-497f-9666-296eaa87e7b5@openjdk.org> Changeset: a667c285 Author: Erik Helin Date: 2020-01-17 09:40:57 +0000 URL: https://git.openjdk.java.net/skara/commit/a667c285 231: The merge bot cannot create merge conflict PRs Reviewed-by: rwestberg ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBotFactory.java ! bots/merge/src/test/java/org/openjdk/skara/bots/merge/MergeBotTests.java ! test/src/main/java/org/openjdk/skara/test/TestHost.java ! test/src/main/java/org/openjdk/skara/test/TestHostedRepository.java ! test/src/main/java/org/openjdk/skara/test/TestPullRequest.java ! vcs/src/main/java/org/openjdk/skara/vcs/Repository.java ! vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java ! vcs/src/main/java/org/openjdk/skara/vcs/hg/HgRepository.java ! vcs/src/test/java/org/openjdk/skara/vcs/RepositoryTests.java From rwestberg at openjdk.java.net Fri Jan 17 09:52:40 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 17 Jan 2020 09:52:40 GMT Subject: [Integrated] RFR: Fix incorrect use of optional result In-Reply-To: References: Message-ID: Changeset: 5470429e Author: Robin Westberg Date: 2020-01-17 09:45:08 +0000 URL: https://git.openjdk.java.net/skara/commit/5470429e Fix incorrect use of optional result Reviewed-by: ehelin ! cli/src/main/java/org/openjdk/skara/cli/GitInfo.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraIssue.java From rwestberg at openjdk.java.net Fri Jan 17 13:16:48 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 17 Jan 2020 13:16:48 GMT Subject: RFR: 217: Enforce check on number of required reviewers Message-ID: Hi all, Please review this change that allows Reviewers of a PR to override the default number of required reviews as configured in the jcheck configuration file. Best regards, Robin ------------- Commits: - 6a6b9253: Initial implementation Changes: https://git.openjdk.java.net/skara/pull/364/files Webrev: https://webrevs.openjdk.java.net/skara/364/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-217 Stats: 403 lines in 11 files changed: 385 ins; 0 del; 18 mod Patch: https://git.openjdk.java.net/skara/pull/364.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/364/head:pull/364 PR: https://git.openjdk.java.net/skara/pull/364 From kcr at openjdk.java.net Fri Jan 17 13:30:32 2020 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Fri, 17 Jan 2020 13:30:32 GMT Subject: RFR: 217: Enforce check on number of required reviewers In-Reply-To: References: Message-ID: On Fri, 17 Jan 2020 13:11:56 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that allows Reviewers of a PR to override the default number of required reviews as configured in the jcheck configuration file. > > Best regards, > Robin In addition to allowing a reviewer to increase the required number of reviewers, which is the use case described in the Enhancement request, this will allow a reviewer to reduce the number of required reviewers below the minimum set in `.jcheck/conf`, including setting it to 0, right? Is this what we want? ------------- PR: https://git.openjdk.java.net/skara/pull/364 From kcr at openjdk.java.net Fri Jan 17 14:28:12 2020 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Fri, 17 Jan 2020 14:28:12 GMT Subject: RFR: 217: Enforce check on number of required reviewers In-Reply-To: References: Message-ID: <_rigvTLPLl6BhsZsdHReeboos86tza-2Gqce310LiUs=.72489596-978a-4edb-bcdb-dc38d4daffa5@github.com> On Fri, 17 Jan 2020 13:30:24 GMT, Kevin Rushforth wrote: >> Hi all, >> >> Please review this change that allows Reviewers of a PR to override the default number of required reviews as configured in the jcheck configuration file. >> >> Best regards, >> Robin > > In addition to allowing a reviewer to increase the required number of reviewers, which is the use case described in the Enhancement request, this will allow a reviewer to reduce the number of required reviewers below the minimum set in `.jcheck/conf`, including setting it to 0, right? Is this what we want? One more question: If I increase the number of required reviewers to 2, does that mean both have to have the Reviewer role? If so, this won't be nearly as useful to us on the openjfx project. I suspect the same is true of many sub-projects in the JDK itself. For example, the policy in the client team is that fixes in general need 2 reviewers, at least one of which must be a "R" reviewer. OpenJFX has a similar policy (except that only "high-impact" fixes need a second reviewer) in that one one of the reviewers needs to be a "R" reviewer. ------------- PR: https://git.openjdk.java.net/skara/pull/364 From ehelin at openjdk.java.net Mon Jan 20 06:54:44 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 20 Jan 2020 06:54:44 GMT Subject: RFR: 233: Merge bot should be able to multiple branches Message-ID: Hi all, please review this patch that makes the merge bot being able to merge multiple branches for a single target repository. For example, the merge bot can now be set up to merge e.g. `jdk:master` into the target's `master` branch and then merge the target's `master` branch into the target's `dev` branch. Merge conflict pull request "alerts" are created per merge specification (from repo, from branch, target branch). Thanks, Erik ## Testing - Updated existing unit tests ------------- Commits: - 63921e84: skara-233 Changes: https://git.openjdk.java.net/skara/pull/365/files Webrev: https://webrevs.openjdk.java.net/skara/365/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-233 Stats: 220 lines in 3 files changed: 89 ins; 43 del; 88 mod Patch: https://git.openjdk.java.net/skara/pull/365.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/365/head:pull/365 PR: https://git.openjdk.java.net/skara/pull/365 From rwestberg at openjdk.java.net Mon Jan 20 07:13:44 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 20 Jan 2020 07:13:44 GMT Subject: RFR: 233: Merge bot should be able to multiple branches In-Reply-To: References: Message-ID: <5oVkRk2q3KVW818alx9mLo_FJN04ruLWxxWB6nuNuJs=.ea8905ae-fc0a-4875-8d0c-dbc9bbb90506@github.com> On Mon, 20 Jan 2020 06:51:11 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the merge bot being able to merge multiple > branches for a single target repository. For example, the merge bot can now be > set up to merge e.g. `jdk:master` into the target's `master` branch and then > merge the target's `master` branch into the target's `dev` branch. Merge > conflict pull request "alerts" are created per merge specification (from repo, > from branch, target branch). > > Thanks, > Erik > > ## Testing > - Updated existing unit tests Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/365 From ehelin at openjdk.java.net Mon Jan 20 07:51:17 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 20 Jan 2020 07:51:17 GMT Subject: [Integrated] RFR: 233: Merge bot should be able to multiple branches In-Reply-To: References: Message-ID: <7d107d12-ee92-4fa6-8b3f-970c8f128c88@openjdk.org> Changeset: 326e4d3d Author: Erik Helin Date: 2020-01-20 07:51:02 +0000 URL: https://git.openjdk.java.net/skara/commit/326e4d3d 233: Merge bot should be able to multiple branches Reviewed-by: rwestberg ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBotFactory.java ! bots/merge/src/test/java/org/openjdk/skara/bots/merge/MergeBotTests.java From rwestberg at openjdk.java.net Mon Jan 20 13:29:11 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 20 Jan 2020 13:29:11 GMT Subject: RFR: Avoid quoting an empty review body Message-ID: Hi all, Please review this minor change that avoids quoting an empty review body when replying to a review. Best regards, Robin ------------- Commits: - 51090e3a: Avoid quoting an empty review body Changes: https://git.openjdk.java.net/skara/pull/366/files Webrev: https://webrevs.openjdk.java.net/skara/366/webrev.00 Stats: 58 lines in 2 files changed: 56 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/366.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/366/head:pull/366 PR: https://git.openjdk.java.net/skara/pull/366 From rwestberg at openjdk.java.net Mon Jan 20 14:17:34 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 20 Jan 2020 14:17:34 GMT Subject: RFR: Post the incremental webrev url in the PR comment Message-ID: <4zhJg3iFCijpUNcDmR0w9Wt7-6sHC6Onc3O1PWU30gc=.9365383f-969e-46ea-b5ca-841f50a3b56c@github.com> Hi all, Please review this change that fixes a regression where the link to the incremental webrev wasn't posted in the PR status comment. Best regards, Robin ------------- Commits: - 3c277d44: Post the incremental webrev url in the PR comment Changes: https://git.openjdk.java.net/skara/pull/367/files Webrev: https://webrevs.openjdk.java.net/skara/367/webrev.00 Stats: 9 lines in 4 files changed: 3 ins; 1 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/367.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/367/head:pull/367 PR: https://git.openjdk.java.net/skara/pull/367 From ehelin at openjdk.java.net Mon Jan 20 14:22:21 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 20 Jan 2020 14:22:21 GMT Subject: RFR: Avoid quoting an empty review body In-Reply-To: References: Message-ID: On Mon, 20 Jan 2020 13:25:05 GMT, Robin Westberg wrote: > Hi all, > > Please review this minor change that avoids quoting an empty review body when replying to a review. > > Best regards, > Robin Looks good, thanks for fixing this! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/366 From ehelin at openjdk.java.net Mon Jan 20 14:23:04 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 20 Jan 2020 14:23:04 GMT Subject: RFR: Post the incremental webrev url in the PR comment In-Reply-To: <4zhJg3iFCijpUNcDmR0w9Wt7-6sHC6Onc3O1PWU30gc=.9365383f-969e-46ea-b5ca-841f50a3b56c@github.com> References: <4zhJg3iFCijpUNcDmR0w9Wt7-6sHC6Onc3O1PWU30gc=.9365383f-969e-46ea-b5ca-841f50a3b56c@github.com> Message-ID: On Mon, 20 Jan 2020 14:14:05 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that fixes a regression where the link to the incremental webrev wasn't posted in the PR status comment. > > Best regards, > Robin Looks good, thanks! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/367 From rwestberg at openjdk.java.net Mon Jan 20 14:23:44 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 20 Jan 2020 14:23:44 GMT Subject: [Integrated] RFR: Post the incremental webrev url in the PR comment In-Reply-To: <4zhJg3iFCijpUNcDmR0w9Wt7-6sHC6Onc3O1PWU30gc=.9365383f-969e-46ea-b5ca-841f50a3b56c@github.com> References: <4zhJg3iFCijpUNcDmR0w9Wt7-6sHC6Onc3O1PWU30gc=.9365383f-969e-46ea-b5ca-841f50a3b56c@github.com> Message-ID: <48d5dbe2-6026-45de-8761-7de80fc08ef6@openjdk.org> Changeset: 9f56fcae Author: Robin Westberg Date: 2020-01-20 14:23:34 +0000 URL: https://git.openjdk.java.net/skara/commit/9f56fcae Post the incremental webrev url in the PR comment Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevNotification.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java From rwestberg at openjdk.java.net Mon Jan 20 14:23:53 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 20 Jan 2020 14:23:53 GMT Subject: [Integrated] RFR: Avoid quoting an empty review body In-Reply-To: References: Message-ID: <79b5b982-a91a-4954-8d75-1b9f5459afdb@openjdk.org> Changeset: 3d62e289 Author: Robin Westberg Date: 2020-01-20 14:23:43 +0000 URL: https://git.openjdk.java.net/skara/commit/3d62e289 Avoid quoting an empty review body Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveMessages.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java From ehelin at openjdk.java.net Mon Jan 20 14:51:50 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 20 Jan 2020 14:51:50 GMT Subject: RFR: 234: Allow more granular jcheck reviewer configuration Message-ID: Hi all, please review this patch that allows for more granular reviewers configuration with jcheck. With this patch a project can now specify exactly how many reviewers are need for each role, for example: [checks "reviewer"] reviewer = 1 committer = 1 author = 1 The above configuration would require three reviewers in total, out of which one must be reviewer, one must be committer and one must be author. This granularity of configuration is needed to fully implement [PR 364](https://git.openjdk.java.net/skara/pulls/364). I made sure that the patch is backwards compatible, we still support the old configuration syntax: [checks "reviewer"] minimum = 1 role = reviewer The above will simply be translated to the following configuration: [checks "reviewer"] reviewer = 1 Thanks, Erik ## Testing - [x] Added a number of additional unit tests ------------- Commits: - 7ce157a2: skara-234 Changes: https://git.openjdk.java.net/skara/pull/368/files Webrev: https://webrevs.openjdk.java.net/skara/368/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-234 Stats: 260 lines in 6 files changed: 216 ins; 11 del; 33 mod Patch: https://git.openjdk.java.net/skara/pull/368.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/368/head:pull/368 PR: https://git.openjdk.java.net/skara/pull/368 From rwestberg at openjdk.java.net Mon Jan 20 14:59:31 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 20 Jan 2020 14:59:31 GMT Subject: RFR: 234: Allow more granular jcheck reviewer configuration In-Reply-To: References: Message-ID: On Mon, 20 Jan 2020 14:46:59 GMT, Erik Helin wrote: > Hi all, > > please review this patch that allows for more granular reviewers configuration > with jcheck. With this patch a project can now specify exactly how many > reviewers are need for each role, for example: > > [checks "reviewer"] > reviewer = 1 > committer = 1 > author = 1 > > The above configuration would require three reviewers in total, out of which one > must be reviewer, one must be committer and one must be author. This granularity > of configuration is needed to fully implement [PR 364](https://git.openjdk.java.net/skara/pulls/364). > > I made sure that the patch is backwards compatible, we still support the old > configuration syntax: > > [checks "reviewer"] > minimum = 1 > role = reviewer > > The above will simply be translated to the following configuration: > > [checks "reviewer"] > reviewer = 1 > > Thanks, > Erik > > ## Testing > - [x] Added a number of additional unit tests Looks good, thanks for fixing! Only saw one spelling issue. jcheck/src/test/java/org/openjdk/skara/jcheck/ReviewersCheckTests.java line 340: > 339: @Test > 340: void relazedRoleAndMissingRoleShouldFail() throws IOException { > 341: var commit = commit(List.of("bar", "contributor")); Suggestion: void relaxedRoleAndMissingRoleShouldFail() throws IOException { ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/368 From rwestberg at openjdk.java.net Mon Jan 20 15:08:24 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 20 Jan 2020 15:08:24 GMT Subject: RFR: 217: Enforce check on number of required reviewers In-Reply-To: <_rigvTLPLl6BhsZsdHReeboos86tza-2Gqce310LiUs=.72489596-978a-4edb-bcdb-dc38d4daffa5@github.com> References: <_rigvTLPLl6BhsZsdHReeboos86tza-2Gqce310LiUs=.72489596-978a-4edb-bcdb-dc38d4daffa5@github.com> Message-ID: On Fri, 17 Jan 2020 14:27:40 GMT, Kevin Rushforth wrote: >> In addition to allowing a reviewer to increase the required number of reviewers, which is the use case described in the Enhancement request, this will allow a reviewer to reduce the number of required reviewers below the minimum set in `.jcheck/conf`, including setting it to 0, right? Is this what we want? > > One more question: If I increase the number of required reviewers to 2, does that mean both have to have the Reviewer role? If so, this won't be nearly as useful to us on the openjfx project. I suspect the same is true of many sub-projects in the JDK itself. For example, the policy in the client team is that fixes in general need 2 reviewers, at least one of which must be a "R" reviewer. OpenJFX has a similar policy (except that only "high-impact" fixes need a second reviewer) in that only one of the reviewers needs to be a "R" reviewer. Now that #368 has been implemented, I'll update this to support more complex reviewer requirements. Also, it makes sense not to allow relaxing the requirements below what the jcheck configuration specifies. ------------- PR: https://git.openjdk.java.net/skara/pull/364 From ehelin at openjdk.java.net Mon Jan 20 15:30:26 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 20 Jan 2020 15:30:26 GMT Subject: [Integrated] RFR: 234: Allow more granular jcheck reviewer configuration In-Reply-To: References: Message-ID: Changeset: daac177f Author: Erik Helin Date: 2020-01-20 15:30:10 +0000 URL: https://git.openjdk.java.net/skara/commit/daac177f 234: Allow more granular jcheck reviewer configuration Reviewed-by: rwestberg ! .jcheck/conf ! jcheck/src/main/java/org/openjdk/skara/jcheck/JCheckConfiguration.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/ReviewersCheck.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/ReviewersConfiguration.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/TooFewReviewersIssue.java ! jcheck/src/test/java/org/openjdk/skara/jcheck/ReviewersCheckTests.java From ehelin at openjdk.java.net Mon Jan 20 15:38:10 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 20 Jan 2020 15:38:10 GMT Subject: [Rev 01] RFR: 234: Allow more granular jcheck reviewer configuration In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that allows for more granular reviewers configuration > with jcheck. With this patch a project can now specify exactly how many > reviewers are need for each role, for example: > > [checks "reviewer"] > reviewer = 1 > committer = 1 > author = 1 > > The above configuration would require three reviewers in total, out of which one > must be reviewer, one must be committer and one must be author. This granularity > of configuration is needed to fully implement [PR 364](https://git.openjdk.java.net/skara/pulls/364). > > I made sure that the patch is backwards compatible, we still support the old > configuration syntax: > > [checks "reviewer"] > minimum = 1 > role = reviewer > > The above will simply be translated to the following configuration: > > [checks "reviewer"] > reviewer = 1 > > Thanks, > Erik > > ## Testing > - [x] Added a number of additional unit tests The pull request has been updated with 1 additional commit. ------------- Added commits: - c4d582cf: Fix spelling of method name Changes: - all: https://git.openjdk.java.net/skara/pull/368/files - new: https://git.openjdk.java.net/skara/pull/368/files/7ce157a2..c4d582cf Webrevs: - full: https://webrevs.openjdk.java.net/skara/368/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/368/webrev.00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/368.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/368/head:pull/368 PR: https://git.openjdk.java.net/skara/pull/368 From ehelin at openjdk.java.net Tue Jan 21 07:24:12 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 21 Jan 2020 07:24:12 GMT Subject: RFR: 235: git-webrev can't handle empty files Message-ID: Hi all, please review this patch that makes `git-webrev` work with empty files (either added or removed). The addition or removal of an empty file can't unfortunately be represented using the unified diff output format (one needs "extended headers" like `git`), but we can still make the HTML view work. Thanks, Erik ## Testing - [x] Manual testing of `git-webrev` on repositories with empty files ------------- Commits: - 071de9e1: skara-235 Changes: https://git.openjdk.java.net/skara/pull/369/files Webrev: https://webrevs.openjdk.java.net/skara/369/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-235 Stats: 46 lines in 2 files changed: 2 ins; 0 del; 44 mod Patch: https://git.openjdk.java.net/skara/pull/369.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/369/head:pull/369 PR: https://git.openjdk.java.net/skara/pull/369 From rwestberg at openjdk.java.net Tue Jan 21 07:24:24 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 21 Jan 2020 07:24:24 GMT Subject: RFR: 235: git-webrev can't handle empty files In-Reply-To: References: Message-ID: On Tue, 21 Jan 2020 07:20:46 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `git-webrev` work with empty files (either > added or removed). The addition or removal of an empty file can't unfortunately > be represented using the unified diff output format (one needs "extended > headers" like `git`), but we can still make the HTML view work. > > Thanks, > Erik > > ## Testing > - [x] Manual testing of `git-webrev` on repositories with empty files Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/369 From ehelin at openjdk.java.net Tue Jan 21 08:55:48 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 21 Jan 2020 08:55:48 GMT Subject: [Integrated] RFR: 235: git-webrev can't handle empty files In-Reply-To: References: Message-ID: <859285c9-7115-429c-8fcb-d7154e748bcc@openjdk.org> Changeset: f99220d3 Author: Erik Helin Date: 2020-01-21 08:55:33 +0000 URL: https://git.openjdk.java.net/skara/commit/f99220d3 235: git-webrev can't handle empty files Reviewed-by: rwestberg ! webrev/src/main/java/org/openjdk/skara/webrev/AddedPatchView.java ! webrev/src/main/java/org/openjdk/skara/webrev/RemovedPatchView.java From ehelin at openjdk.java.net Tue Jan 21 10:08:49 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 21 Jan 2020 10:08:49 GMT Subject: git: openjdk/skara: 220: webrev version unknown message Message-ID: <562f6175-6a8e-4718-a88c-e2c68c5b0a0d@openjdk.org> Changeset: f4cc4619 Author: Erik Helin Date: 2020-01-21 10:08:34 +0000 URL: https://git.openjdk.java.net/skara/commit/f4cc4619 220: webrev version unknown message Reviewed-by: rwestberg ! bots/cli/build.gradle ! bots/cli/src/main/java/module-info.java ! bots/cli/src/main/java/org/openjdk/skara/bots/cli/BotLauncher.java ! bots/mlbridge/build.gradle ! bots/mlbridge/src/main/java/module-info.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java ! cli/build.gradle ! cli/src/main/java/module-info.java ! cli/src/main/java/org/openjdk/skara/cli/GitDefpath.java ! cli/src/main/java/org/openjdk/skara/cli/GitFork.java ! cli/src/main/java/org/openjdk/skara/cli/GitInfo.java ! cli/src/main/java/org/openjdk/skara/cli/GitJCheck.java ! cli/src/main/java/org/openjdk/skara/cli/GitOpenJDKImport.java ! cli/src/main/java/org/openjdk/skara/cli/GitPr.java ! cli/src/main/java/org/openjdk/skara/cli/GitPublish.java ! cli/src/main/java/org/openjdk/skara/cli/GitSync.java ! cli/src/main/java/org/openjdk/skara/cli/GitToken.java ! cli/src/main/java/org/openjdk/skara/cli/GitTranslate.java ! cli/src/main/java/org/openjdk/skara/cli/GitVerifyImport.java ! cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java ! cli/src/main/java/org/openjdk/skara/cli/HgOpenJDKImport.java - cli/src/main/java/org/openjdk/skara/cli/Version.java ! settings.gradle + version/build.gradle + version/src/main/java/module-info.java + version/src/main/java/org/openjdk/skara/version/Version.java From ehelin at openjdk.java.net Tue Jan 21 10:11:46 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 21 Jan 2020 10:11:46 GMT Subject: RFR: 220: webrev version unknown message Message-ID: Hi all, please review this patch that add proper versions to the automatically generated webrevs. I also took the opportunity to add a `--version` flag to the bot launcher. Thanks, Erik ## Testing - [x] Manual testing of `skara-bots` and the CLI tools ------------- Commits: - c1eaead1: skara-220 Changes: https://git.openjdk.java.net/skara/pull/370/files Webrev: https://webrevs.openjdk.java.net/skara/370/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-220 Stats: 205 lines in 26 files changed: 147 ins; 56 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/370.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/370/head:pull/370 PR: https://git.openjdk.java.net/skara/pull/370 From rwestberg at openjdk.java.net Tue Jan 21 10:12:00 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 21 Jan 2020 10:12:00 GMT Subject: RFR: 220: webrev version unknown message In-Reply-To: References: Message-ID: On Tue, 21 Jan 2020 10:05:18 GMT, Erik Helin wrote: > Hi all, > > please review this patch that add proper versions to the automatically generated > webrevs. I also took the opportunity to add a `--version` flag to the bot > launcher. > > Thanks, > Erik > > ## Testing > - [x] Manual testing of `skara-bots` and the CLI tools Thanks, looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/370 From ehelin at openjdk.java.net Tue Jan 21 11:33:18 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 21 Jan 2020 11:33:18 GMT Subject: RFR: 236: Add links to issue in generated webrevs Message-ID: Hi all, please review this patch that adds links to issues in automatically generated webrevs (if the PR contains a link to an issue). Thanks, Erik ------------- Commits: - 316fd3f2: Add link to issues in generated webrevs Changes: https://git.openjdk.java.net/skara/pull/371/files Webrev: https://webrevs.openjdk.java.net/skara/371/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-236 Stats: 24 lines in 1 file changed: 18 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/371.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/371/head:pull/371 PR: https://git.openjdk.java.net/skara/pull/371 From rwestberg at openjdk.java.net Tue Jan 21 11:33:49 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 21 Jan 2020 11:33:49 GMT Subject: [Rev 01] RFR: 217: Enforce check on number of required reviewers In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that allows Reviewers of a PR to override the default number of required reviews as configured in the jcheck configuration file. > > Best regards, > Robin The pull request has been updated with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Added commits: - 059862b4: Updated after review - aff8ba3e: Merge remote-tracking branch 'upstream/master' into reviewers - daac177f: 234: Allow more granular jcheck reviewer configuration - 5438f4b8: Merge remote-tracking branch 'upstream/master' into reviewers - 3d62e289: Avoid quoting an empty review body - 9f56fcae: Post the incremental webrev url in the PR comment - 326e4d3d: 233: Merge bot should be able to multiple branches - 5470429e: Fix incorrect use of optional result - fd9d0e68: Handle redirects manually - a667c285: 231: The merge bot cannot create merge conflict PRs Changes: - all: https://git.openjdk.java.net/skara/pull/364/files - new: https://git.openjdk.java.net/skara/pull/364/files/6a6b9253..059862b4 Webrevs: - full: https://webrevs.openjdk.java.net/skara/364/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/364/webrev.00-01 Stats: 849 lines in 35 files changed: 601 ins; 60 del; 188 mod Patch: https://git.openjdk.java.net/skara/pull/364.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/364/head:pull/364 PR: https://git.openjdk.java.net/skara/pull/364 From nlisker at openjdk.java.net Tue Jan 21 11:37:12 2020 From: nlisker at openjdk.java.net (Nir Lisker) Date: Tue, 21 Jan 2020 11:37:12 GMT Subject: RFR: 217: Enforce check on number of required reviewers In-Reply-To: References: <_rigvTLPLl6BhsZsdHReeboos86tza-2Gqce310LiUs=.72489596-978a-4edb-bcdb-dc38d4daffa5@github.com> Message-ID: On Mon, 20 Jan 2020 15:08:03 GMT, Robin Westberg wrote: >> One more question: If I increase the number of required reviewers to 2, does that mean both have to have the Reviewer role? If so, this won't be nearly as useful to us on the openjfx project. I suspect the same is true of many sub-projects in the JDK itself. For example, the policy in the client team is that fixes in general need 2 reviewers, at least one of which must be a "R" reviewer. OpenJFX has a similar policy (except that only "high-impact" fixes need a second reviewer) in that only one of the reviewers needs to be a "R" reviewer. > > Now that #368 has been implemented, I'll update this to support more complex reviewer requirements. Also, it makes sense not to allow relaxing the requirements below what the jcheck configuration specifies. > `/reviewers []` where `` is the additional number of required reviewers. I fear that this will be confusing. I expect that `n` is the number of reviewers, not the number of additional reviewers. ------------- PR: https://git.openjdk.java.net/skara/pull/364 From ehelin at openjdk.java.net Tue Jan 21 12:49:29 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 21 Jan 2020 12:49:29 GMT Subject: [Rev 01] RFR: 236: Add links to issue in generated webrevs In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that adds links to issues in automatically generated > webrevs (if the PR contains a link to an issue). > > Thanks, > Erik The pull request has been updated with 1 additional commit. ------------- Added commits: - c4ec2ce5: Read .jcheck/conf more safely Changes: - all: https://git.openjdk.java.net/skara/pull/371/files - new: https://git.openjdk.java.net/skara/pull/371/files/316fd3f2..c4ec2ce5 Webrevs: - full: https://webrevs.openjdk.java.net/skara/371/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/371/webrev.00-01 Stats: 10 lines in 1 file changed: 3 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/371.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/371/head:pull/371 PR: https://git.openjdk.java.net/skara/pull/371 From rwestberg at openjdk.java.net Tue Jan 21 13:00:35 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 21 Jan 2020 13:00:35 GMT Subject: [Rev 01] RFR: 236: Add links to issue in generated webrevs In-Reply-To: References: Message-ID: On Tue, 21 Jan 2020 13:00:34 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that adds links to issues in automatically generated >> webrevs (if the PR contains a link to an issue). >> >> Thanks, >> Erik > > The pull request has been updated with 1 additional commit. Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/371 From ehelin at openjdk.java.net Tue Jan 21 13:01:58 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 21 Jan 2020 13:01:58 GMT Subject: [Integrated] RFR: 236: Add links to issue in generated webrevs In-Reply-To: References: Message-ID: <84a331b4-c321-4c07-8a26-fe74d8578b3b@openjdk.org> Changeset: d2060299 Author: Erik Helin Date: 2020-01-21 13:01:44 +0000 URL: https://git.openjdk.java.net/skara/commit/d2060299 236: Add links to issue in generated webrevs Reviewed-by: rwestberg ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java From ehelin at openjdk.java.net Tue Jan 21 13:46:57 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 21 Jan 2020 13:46:57 GMT Subject: RFR: 237: Add pull request author's full name to generated webrev Message-ID: Hi all, please review this small patch that adds a pull request author's full name to the automatically generated webrev for the pull request. Thanks, Erik ------------- Commits: - 0ffedc01: Add pull request author's full name to generated webrev Changes: https://git.openjdk.java.net/skara/pull/372/files Webrev: https://webrevs.openjdk.java.net/skara/372/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-237 Stats: 3 lines in 1 file changed: 2 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/372.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/372/head:pull/372 PR: https://git.openjdk.java.net/skara/pull/372 From rwestberg at openjdk.java.net Tue Jan 21 13:47:12 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 21 Jan 2020 13:47:12 GMT Subject: RFR: 237: Add pull request author's full name to generated webrev In-Reply-To: References: Message-ID: On Tue, 21 Jan 2020 13:41:46 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds a pull request author's full name to > the automatically generated webrev for the pull request. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/372 From ehelin at openjdk.java.net Tue Jan 21 13:48:58 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 21 Jan 2020 13:48:58 GMT Subject: [Integrated] RFR: 237: Add pull request author's full name to generated webrev In-Reply-To: References: Message-ID: <5e88f454-0ec8-4cb0-8481-23b5f0c6d2cc@openjdk.org> Changeset: 633d79f6 Author: Erik Helin Date: 2020-01-21 13:48:42 +0000 URL: https://git.openjdk.java.net/skara/commit/633d79f6 237: Add pull request author's full name to generated webrev Reviewed-by: rwestberg ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java From kcr at openjdk.java.net Tue Jan 21 23:44:46 2020 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Tue, 21 Jan 2020 23:44:46 GMT Subject: RFR: 217: Enforce check on number of required reviewers In-Reply-To: References: <_rigvTLPLl6BhsZsdHReeboos86tza-2Gqce310LiUs=.72489596-978a-4edb-bcdb-dc38d4daffa5@github.com> Message-ID: On Tue, 21 Jan 2020 11:37:07 GMT, Nir Lisker wrote: >> Now that #368 has been implemented, I'll update this to support more complex reviewer requirements. Also, it makes sense not to allow relaxing the requirements below what the jcheck configuration specifies. > >> `/reviewers []` where `` is the additional number of required reviewers. > > I fear that this will be confusing. I expect that `n` is the number of reviewers, not the number of additional reviewers. I agree with @nlisker. I believe that both the `jdk` and `openjfx` projects will set 1 reviewer in the .jcheck/conf file (which must be someone with a Reviewer role), with the common use case to increase that being to bump the required reviewers to 2 or maybe 3 where the additional reviewers don't have a required role. If I want to add a requirement for 2 reviewers, I would expect to be able to type: /reviewers 2 And the bot would figure out that it means one extra reviewer with no required role in the project. Anything else would be a "nice to have", but I wouldn't want to make it more confusing to do the simple thing. ------------- PR: https://git.openjdk.java.net/skara/pull/364 From rwestberg at openjdk.java.net Wed Jan 22 09:11:45 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Jan 2020 09:11:45 GMT Subject: [Rev 02] RFR: 217: Enforce check on number of required reviewers In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that allows Reviewers of a PR to override the default number of required reviews as configured in the jcheck configuration file. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - 52c43742: The argument to /reviewers is now an absolute number, and defaults to requiring a role of "author" or above (i.e. any project member). Changes: - all: https://git.openjdk.java.net/skara/pull/364/files - new: https://git.openjdk.java.net/skara/pull/364/files/059862b4..52c43742 Webrevs: - full: https://webrevs.openjdk.java.net/skara/364/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/364/webrev.01-02 Stats: 145 lines in 4 files changed: 89 ins; 26 del; 30 mod Patch: https://git.openjdk.java.net/skara/pull/364.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/364/head:pull/364 PR: https://git.openjdk.java.net/skara/pull/364 From ehelin at openjdk.java.net Wed Jan 22 12:02:46 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 22 Jan 2020 12:02:46 GMT Subject: [Rev 02] RFR: 217: Enforce check on number of required reviewers In-Reply-To: References: Message-ID: <3zISvbQxub2_n-QizFcjfyqdNQRh4-gIbAzP9CFy0Mo=.f6585cea-6bc5-4975-ae22-a4ad8263b826@github.com> On Wed, 22 Jan 2020 12:02:46 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that allows Reviewers of a PR to override the default number of required reviews as configured in the jcheck configuration file. >> >> Best regards, >> Robin > > The pull request has been updated with 1 additional commit. Looks good, particularly the tests! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/364 From kcr at openjdk.java.net Wed Jan 22 13:08:04 2020 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Wed, 22 Jan 2020 13:08:04 GMT Subject: [Rev 02] RFR: 217: Enforce check on number of required reviewers In-Reply-To: <3zISvbQxub2_n-QizFcjfyqdNQRh4-gIbAzP9CFy0Mo=.f6585cea-6bc5-4975-ae22-a4ad8263b826@github.com> References: <3zISvbQxub2_n-QizFcjfyqdNQRh4-gIbAzP9CFy0Mo=.f6585cea-6bc5-4975-ae22-a4ad8263b826@github.com> Message-ID: On Wed, 22 Jan 2020 12:02:32 GMT, Erik Helin wrote: >> The pull request has been updated with 1 additional commit. > > Looks good, particularly the tests! Thanks for making the requested update. To check that it matches my understanding, if the default policy as set in `.jcheck/conf` is 1 reviewer with a role of `Reviewer`, then I expect the following: `/reviewers 0` -- error `/reviewers 1` -- reset to default (1 reviewer with role of `Reviewer` in this example) `/reviewers 2` -- num reviewers is now two, one of which must have the role of `Reviewer` and the other must have the role of `Author` (or higher) Is my understanding correct? It seems so in looking at your most recent change, but wanted to double-check. ------------- PR: https://git.openjdk.java.net/skara/pull/364 From rwestberg at openjdk.java.net Wed Jan 22 13:12:33 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Jan 2020 13:12:33 GMT Subject: [Rev 02] RFR: 217: Enforce check on number of required reviewers In-Reply-To: References: <3zISvbQxub2_n-QizFcjfyqdNQRh4-gIbAzP9CFy0Mo=.f6585cea-6bc5-4975-ae22-a4ad8263b826@github.com> Message-ID: On Wed, 22 Jan 2020 13:07:49 GMT, Kevin Rushforth wrote: >> Looks good, particularly the tests! > > Thanks for making the requested update. To check that it matches my understanding, if the default policy as set in `.jcheck/conf` is 1 reviewer with a role of `Reviewer`, then I expect the following: > > `/reviewers 0` -- error > `/reviewers 1` -- reset to default (1 reviewer with role of `Reviewer` in this example) > `/reviewers 2` -- num reviewers is now two, one of which must have the role of `Reviewer` and the other must have the role of `Author` (or higher) > > Is my understanding correct? It seems so in looking at your most recent change, but wanted to double-check. Yep, that's correct! ------------- PR: https://git.openjdk.java.net/skara/pull/364 From ehelin at openjdk.java.net Wed Jan 22 16:54:36 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 22 Jan 2020 16:54:36 GMT Subject: RFR: 238: Add link to upstream repository to generated webrevs Message-ID: Hi all, please review this small patch that adds a link to the upstream repository in automatically generated webrevs. Thanks, Erik ------------- Commits: - 452d81cd: Add link to upstream Changes: https://git.openjdk.java.net/skara/pull/373/files Webrev: https://webrevs.openjdk.java.net/skara/373/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-238 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/373.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/373/head:pull/373 PR: https://git.openjdk.java.net/skara/pull/373 From rwestberg at openjdk.java.net Wed Jan 22 16:54:36 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Jan 2020 16:54:36 GMT Subject: RFR: 238: Add link to upstream repository to generated webrevs In-Reply-To: References: Message-ID: On Wed, 22 Jan 2020 16:47:17 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds a link to the upstream repository in > automatically generated webrevs. > > Thanks, > Erik Looks good, thanks for fixing! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/373 From rwestberg at openjdk.java.net Wed Jan 22 16:54:51 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Jan 2020 16:54:51 GMT Subject: RFR: 238: Add link to upstream repository to generated webrevs In-Reply-To: References: Message-ID: On Wed, 22 Jan 2020 16:47:17 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds a link to the upstream repository in > automatically generated webrevs. > > Thanks, > Erik Are you sure the URl does not contain sensitive information? ------------- Changes requested by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/373 From erik.helin at oracle.com Wed Jan 22 17:01:04 2020 From: erik.helin at oracle.com (Erik Helin) Date: Wed, 22 Jan 2020 18:01:04 +0100 Subject: RFR: 238: Add link to upstream repository to generated webrevs In-Reply-To: References: Message-ID: <6c9f655b-bbf8-39fd-2635-cac484a54a21@oracle.com> On 1/22/20 5:54 PM, Robin Westberg wrote: > On Wed, 22 Jan 2020 16:47:17 GMT, Erik Helin wrote: > >> Hi all, >> >> please review this small patch that adds a link to the upstream repository in >> automatically generated webrevs. >> >> Thanks, >> Erik > > Are you sure the URl does not contain sensitive information? Yes, I'm sure, the URL is to the upstream repository, not the personal fork. Thanks, Erik From rwestberg at openjdk.java.net Wed Jan 22 17:01:59 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Jan 2020 17:01:59 GMT Subject: RFR: 238: Add link to upstream repository to generated webrevs In-Reply-To: References: Message-ID: On Wed, 22 Jan 2020 16:47:17 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds a link to the upstream repository in > automatically generated webrevs. > > Thanks, > Erik Thanks! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/373 From ehelin at openjdk.java.net Wed Jan 22 17:03:58 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 22 Jan 2020 17:03:58 GMT Subject: [Integrated] RFR: 238: Add link to upstream repository to generated webrevs In-Reply-To: References: Message-ID: Changeset: db6fbee3 Author: Erik Helin Date: 2020-01-22 17:03:34 +0000 URL: https://git.openjdk.java.net/skara/commit/db6fbee3 238: Add link to upstream repository to generated webrevs Reviewed-by: rwestberg ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java From ehelin at openjdk.java.net Wed Jan 22 17:19:02 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 22 Jan 2020 17:19:02 GMT Subject: RFR: 239: Add link to pull requests to automatically generated webrevs Message-ID: Hi all, please review this small patch that adds a link to the PR in webrevs. Thanks, Erik ------------- Commits: - ab383900: Add link to PR in webrevs Changes: https://git.openjdk.java.net/skara/pull/374/files Webrev: https://webrevs.openjdk.java.net/skara/374/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-239 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/374.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/374/head:pull/374 PR: https://git.openjdk.java.net/skara/pull/374 From rwestberg at openjdk.java.net Wed Jan 22 17:19:13 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Jan 2020 17:19:13 GMT Subject: RFR: 239: Add link to pull requests to automatically generated webrevs In-Reply-To: References: Message-ID: On Wed, 22 Jan 2020 17:13:54 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds a link to the PR in webrevs. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/374 From ehelin at openjdk.java.net Wed Jan 22 17:23:09 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 22 Jan 2020 17:23:09 GMT Subject: [Integrated] RFR: 239: Add link to pull requests to automatically generated webrevs In-Reply-To: References: Message-ID: <01ff8265-247b-4434-8f22-6bb8889e479a@openjdk.org> Changeset: 5efaf036 Author: Erik Helin Date: 2020-01-22 17:22:52 +0000 URL: https://git.openjdk.java.net/skara/commit/5efaf036 239: Add link to pull requests to automatically generated webrevs Reviewed-by: rwestberg ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java From nlisker at openjdk.java.net Wed Jan 22 20:46:46 2020 From: nlisker at openjdk.java.net (Nir Lisker) Date: Wed, 22 Jan 2020 20:46:46 GMT Subject: [Rev 02] RFR: 217: Enforce check on number of required reviewers In-Reply-To: References: <3zISvbQxub2_n-QizFcjfyqdNQRh4-gIbAzP9CFy0Mo=.f6585cea-6bc5-4975-ae22-a4ad8263b826@github.com> Message-ID: <3Sl340xlycoo_Lgnxg050KAjo13ijwxl65dljV-6Iek=.b4fb6a62-d4e7-419a-825b-e42ad9342166@github.com> On Wed, 22 Jan 2020 13:12:25 GMT, Robin Westberg wrote: >> Thanks for making the requested update. To check that it matches my understanding, if the default policy as set in `.jcheck/conf` is 1 reviewer with a role of `Reviewer`, then I expect the following: >> >> `/reviewers 0` -- error >> `/reviewers 1` -- reset to default (1 reviewer with role of `Reviewer` in this example) >> `/reviewers 2` -- num reviewers is now two, one of which must have the role of `Reviewer` and the other must have the role of `Author` (or higher) >> >> Is my understanding correct? It seems so in looking at your most recent change, but wanted to double-check. > > Yep, that's correct! Looks good. After this is integrated, when will it take effect? Reviewers need to be notified. ------------- PR: https://git.openjdk.java.net/skara/pull/364 From ehelin at openjdk.java.net Thu Jan 23 07:41:25 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Jan 2020 07:41:25 GMT Subject: RFR: 241: Gradle version plugin should allow a version.txt file Message-ID: Hi all, please review this small patch that makes the `VersionPlugin` look for a `version.txt` in the root directory of the repository _if_ the `.git` directory is missing. This is useful to be able to build Skara with a proper version from e.g. a source tarball. Thanks, Erik ## Testing - [x] Manual testing in directory without `.git` present - [x] Manual testing in directory with `.git` present ------------- Commits: - 5d866066: Look for version.txt if not a repository Changes: https://git.openjdk.java.net/skara/pull/375/files Webrev: https://webrevs.openjdk.java.net/skara/375/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-241 Stats: 15 lines in 1 file changed: 14 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/375.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/375/head:pull/375 PR: https://git.openjdk.java.net/skara/pull/375 From rwestberg at openjdk.java.net Thu Jan 23 07:41:37 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Jan 2020 07:41:37 GMT Subject: RFR: 241: Gradle version plugin should allow a version.txt file In-Reply-To: References: Message-ID: On Thu, 23 Jan 2020 07:36:27 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes the `VersionPlugin` look for a > `version.txt` in the root directory of the repository _if_ the `.git` directory > is missing. This is useful to be able to build Skara with a proper version from > e.g. a source tarball. > > Thanks, > Erik > > ## Testing > - [x] Manual testing in directory without `.git` present > - [x] Manual testing in directory with `.git` present Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/375 From ehelin at openjdk.java.net Thu Jan 23 08:06:58 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Jan 2020 08:06:58 GMT Subject: [Integrated] RFR: 241: Gradle version plugin should allow a version.txt file In-Reply-To: References: Message-ID: <1fef528f-963a-4d6b-854d-77fc6fd586d7@openjdk.org> Changeset: 73dda3f0 Author: Erik Helin Date: 2020-01-23 08:06:43 +0000 URL: https://git.openjdk.java.net/skara/commit/73dda3f0 241: Gradle version plugin should allow a version.txt file Reviewed-by: rwestberg ! buildSrc/version/src/main/java/org/openjdk/skara/gradle/version/VersionPlugin.java From rwestberg at openjdk.java.net Thu Jan 23 09:22:41 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Jan 2020 09:22:41 GMT Subject: RFR: 223: Make required re-reviewing configurable Message-ID: Hi all, Please review this change that makes it possible to configure (per project) if additional commits to a pull request renders previous reviews invalid or not. It also tweaks the behavior of the `rfr` label slightly - instead of dropping it when a PR is reviewed and receives the `ready` label, is will remain for as long the PR is eligible for further reviews. This should reduce the number of label transitions when this feature is enabled. The change also contains a bit of refactoring to make it easier to add more project specific configuration in the future. Best regards, Robin ------------- Commits: - ef0825c9: Initial implementation Changes: https://git.openjdk.java.net/skara/pull/376/files Webrev: https://webrevs.openjdk.java.net/skara/376/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-223 Stats: 368 lines in 27 files changed: 208 ins; 47 del; 113 mod Patch: https://git.openjdk.java.net/skara/pull/376.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/376/head:pull/376 PR: https://git.openjdk.java.net/skara/pull/376 From rwestberg at openjdk.java.net Thu Jan 23 09:39:40 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Jan 2020 09:39:40 GMT Subject: [Rev 01] RFR: 223: Make required re-reviewing configurable In-Reply-To: References: Message-ID: <2UbJ4KYE6Ncim33P1jGZpSFoc3JCHUSnwD37MkzEiic=.d597f8f9-3fb4-4b37-8bae-b560e59e107a@github.com> > Hi all, > > Please review this change that makes it possible to configure (per project) if additional commits to a pull request renders previous reviews invalid or not. It also tweaks the behavior of the `rfr` label slightly - instead of dropping it when a PR is reviewed and receives the `ready` label, is will remain for as long the PR is eligible for further reviews. This should reduce the number of label transitions when this feature is enabled. > > The change also contains a bit of refactoring to make it easier to add more project specific configuration in the future. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - 9f819abd: Make it possible to actually enable the feature Changes: - all: https://git.openjdk.java.net/skara/pull/376/files - new: https://git.openjdk.java.net/skara/pull/376/files/ef0825c9..9f819abd Webrevs: - full: https://webrevs.openjdk.java.net/skara/376/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/376/webrev.00-01 Stats: 13 lines in 1 file changed: 12 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/376.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/376/head:pull/376 PR: https://git.openjdk.java.net/skara/pull/376 From rwestberg at openjdk.java.net Thu Jan 23 09:51:53 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Jan 2020 09:51:53 GMT Subject: [Rev 02] RFR: 217: Enforce check on number of required reviewers In-Reply-To: <3Sl340xlycoo_Lgnxg050KAjo13ijwxl65dljV-6Iek=.b4fb6a62-d4e7-419a-825b-e42ad9342166@github.com> References: <3zISvbQxub2_n-QizFcjfyqdNQRh4-gIbAzP9CFy0Mo=.f6585cea-6bc5-4975-ae22-a4ad8263b826@github.com> <3Sl340xlycoo_Lgnxg050KAjo13ijwxl65dljV-6Iek=.b4fb6a62-d4e7-419a-825b-e42ad9342166@github.com> Message-ID: On Wed, 22 Jan 2020 20:46:31 GMT, Nir Lisker wrote: >> Yep, that's correct! > > Looks good. After this is integrated, when will it take effect? Reviewers need to be notified. Will probably deploy it later this week. ------------- PR: https://git.openjdk.java.net/skara/pull/364 From rwestberg at openjdk.java.net Thu Jan 23 09:52:36 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Jan 2020 09:52:36 GMT Subject: [Integrated] RFR: 217: Enforce check on number of required reviewers In-Reply-To: References: Message-ID: Changeset: 8b3b3860 Author: Robin Westberg Date: 2020-01-23 09:52:16 +0000 URL: https://git.openjdk.java.net/skara/commit/8b3b3860 217: Enforce check on number of required reviewers Reviewed-by: ehelin + bots/pr/src/main/java/org/openjdk/skara/bots/pr/AdditionalConfiguration.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommandWorkItem.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestCheckIssueVisitor.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java + bots/pr/src/main/java/org/openjdk/skara/bots/pr/ReviewersCommand.java + bots/pr/src/main/java/org/openjdk/skara/bots/pr/ReviewersTracker.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/SponsorCommand.java + bots/pr/src/test/java/org/openjdk/skara/bots/pr/ReviewersTests.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/JCheck.java ! test/src/main/java/org/openjdk/skara/test/CheckableRepository.java From ehelin at openjdk.java.net Thu Jan 23 10:01:26 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Jan 2020 10:01:26 GMT Subject: [Rev 01] RFR: 223: Make required re-reviewing configurable In-Reply-To: <2UbJ4KYE6Ncim33P1jGZpSFoc3JCHUSnwD37MkzEiic=.d597f8f9-3fb4-4b37-8bae-b560e59e107a@github.com> References: <2UbJ4KYE6Ncim33P1jGZpSFoc3JCHUSnwD37MkzEiic=.d597f8f9-3fb4-4b37-8bae-b560e59e107a@github.com> Message-ID: On Thu, 23 Jan 2020 10:01:25 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that makes it possible to configure (per project) if additional commits to a pull request renders previous reviews invalid or not. It also tweaks the behavior of the `rfr` label slightly - instead of dropping it when a PR is reviewed and receives the `ready` label, is will remain for as long the PR is eligible for further reviews. This should reduce the number of label transitions when this feature is enabled. >> >> The change also contains a bit of refactoring to make it easier to add more project specific configuration in the future. >> >> Best regards, >> Robin > > The pull request has been updated with 1 additional commit. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/376 From rwestberg at openjdk.java.net Thu Jan 23 10:08:46 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Jan 2020 10:08:46 GMT Subject: [Rev 02] RFR: 223: Make required re-reviewing configurable In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that makes it possible to configure (per project) if additional commits to a pull request renders previous reviews invalid or not. It also tweaks the behavior of the `rfr` label slightly - instead of dropping it when a PR is reviewed and receives the `ready` label, is will remain for as long the PR is eligible for further reviews. This should reduce the number of label transitions when this feature is enabled. > > The change also contains a bit of refactoring to make it easier to add more project specific configuration in the future. > > Best regards, > Robin The pull request has been updated with a new target base due to a merge or a rebase. ------------- Commits: - 3490d3ad: Merge remote-tracking branch 'upstream/master' into stale_reviews - 9f819abd: Make it possible to actually enable the feature - ef0825c9: Initial implementation Changes: https://git.openjdk.java.net/skara/pull/376/files Webrev: https://webrevs.openjdk.java.net/skara/376/webrev.02 Stats: 379 lines in 27 files changed: 219 ins; 46 del; 114 mod Patch: https://git.openjdk.java.net/skara/pull/376.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/376/head:pull/376 PR: https://git.openjdk.java.net/skara/pull/376 From rwestberg at openjdk.java.net Thu Jan 23 10:27:40 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Jan 2020 10:27:40 GMT Subject: [Rev 03] RFR: 223: Make required re-reviewing configurable In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that makes it possible to configure (per project) if additional commits to a pull request renders previous reviews invalid or not. It also tweaks the behavior of the `rfr` label slightly - instead of dropping it when a PR is reviewed and receives the `ready` label, is will remain for as long the PR is eligible for further reviews. This should reduce the number of label transitions when this feature is enabled. > > The change also contains a bit of refactoring to make it easier to add more project specific configuration in the future. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - ac9729f3: Properly fix merge issues Changes: - all: https://git.openjdk.java.net/skara/pull/376/files - new: https://git.openjdk.java.net/skara/pull/376/files/3490d3ad..ac9729f3 Webrevs: - full: https://webrevs.openjdk.java.net/skara/376/webrev.03 - incr: https://webrevs.openjdk.java.net/skara/376/webrev.02-03 Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/376.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/376/head:pull/376 PR: https://git.openjdk.java.net/skara/pull/376 From rwestberg at openjdk.java.net Thu Jan 23 10:46:02 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Jan 2020 10:46:02 GMT Subject: [Rev 04] RFR: 223: Make required re-reviewing configurable In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that makes it possible to configure (per project) if additional commits to a pull request renders previous reviews invalid or not. It also tweaks the behavior of the `rfr` label slightly - instead of dropping it when a PR is reviewed and receives the `ready` label, is will remain for as long the PR is eligible for further reviews. This should reduce the number of label transitions when this feature is enabled. > > The change also contains a bit of refactoring to make it easier to add more project specific configuration in the future. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - 2f9a133f: Fix test issues Changes: - all: https://git.openjdk.java.net/skara/pull/376/files - new: https://git.openjdk.java.net/skara/pull/376/files/ac9729f3..2f9a133f Webrevs: - full: https://webrevs.openjdk.java.net/skara/376/webrev.04 - incr: https://webrevs.openjdk.java.net/skara/376/webrev.03-04 Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/376.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/376/head:pull/376 PR: https://git.openjdk.java.net/skara/pull/376 From rwestberg at openjdk.java.net Thu Jan 23 13:16:39 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Jan 2020 13:16:39 GMT Subject: [Integrated] RFR: 223: Make required re-reviewing configurable In-Reply-To: References: Message-ID: Changeset: 7a6119d1 Author: Robin Westberg Date: 2020-01-23 13:16:24 +0000 URL: https://git.openjdk.java.net/skara/commit/7a6119d1 223: Make required re-reviewing configurable Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/AllowCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommandHandler.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommandWorkItem.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/ContributorCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/LabelerWorkItem.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestBot.java + bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestBotBuilder.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestBotFactory.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestWorkItem.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/RejectCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/ReviewersCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/SolvesCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/SponsorCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/SummaryCommand.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CommandTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/ContributorTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/IntegrateTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/LabelerTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/ReviewersTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SolvesTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SponsorTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SummaryTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/VetoTests.java From rwestberg at openjdk.java.net Thu Jan 23 13:26:05 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Jan 2020 13:26:05 GMT Subject: RFR: Make it possible to only allow PRs against a select set of target branches Message-ID: Hi all, Please review this change that makes it possible to only allow PRs to target a select set of branches. Best regards, Robin ------------- Commits: - 7c3c3098: Make it possible to only allow PRs against a select set of target branches Changes: https://git.openjdk.java.net/skara/pull/377/files Webrev: https://webrevs.openjdk.java.net/skara/377/webrev.00 Stats: 130 lines in 6 files changed: 99 ins; 18 del; 13 mod Patch: https://git.openjdk.java.net/skara/pull/377.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/377/head:pull/377 PR: https://git.openjdk.java.net/skara/pull/377 From ehelin at openjdk.java.net Thu Jan 23 17:28:51 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Jan 2020 17:28:51 GMT Subject: RFR: 244: Legacy reviewers jcheck configuration does not reset default Message-ID: Hi all, please review this patch that fixes an issue with the parsing of the older format of the "reviewers" jcheck configuration. The problem is that the defaults weren't reset when parsing the older format, so if a repository has a `.jcheck/conf` containing the following [checks "reviewer"] minimum = 1 role = committer then the outcome would be the that jcheck would require 1 Reviewer and 1 Committer (since the default is 1 Reviewer). The fix is to reset the defaults to zero when parsing the older format. Thanks, Erik ## Testing - [x] Added a new unit test for the above scenario ------------- Commits: - 691d0f26: Reset defaults to 0 Changes: https://git.openjdk.java.net/skara/pull/378/files Webrev: https://webrevs.openjdk.java.net/skara/378/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-244 Stats: 39 lines in 2 files changed: 39 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/378.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/378/head:pull/378 PR: https://git.openjdk.java.net/skara/pull/378 From rwestberg at openjdk.java.net Fri Jan 24 06:54:15 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 06:54:15 GMT Subject: RFR: 244: Legacy reviewers jcheck configuration does not reset default In-Reply-To: References: Message-ID: <58sjxTengunQs6HkELyn62x15P_7xnmQu7pd1YVi8HI=.abfa1f5f-c4ec-4c0b-ade1-274f56dca0d8@github.com> On Thu, 23 Jan 2020 17:24:02 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes an issue with the parsing of the older > format of the "reviewers" jcheck configuration. The problem is that the defaults > weren't reset when parsing the older format, so if a repository has a > `.jcheck/conf` containing the following > > [checks "reviewer"] > minimum = 1 > role = committer > > then the outcome would be the that jcheck would require 1 Reviewer and 1 > Committer (since the default is 1 Reviewer). > > The fix is to reset the defaults to zero when parsing the older format. > > Thanks, > Erik > > ## Testing > - [x] Added a new unit test for the above scenario Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/378 From ehelin at openjdk.java.net Fri Jan 24 06:59:09 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Jan 2020 06:59:09 GMT Subject: [Integrated] RFR: 244: Legacy reviewers jcheck configuration does not reset default In-Reply-To: References: Message-ID: <3f2af6fd-4046-4e72-830f-b3b485c88c70@openjdk.org> Changeset: b0a97589 Author: Erik Helin Date: 2020-01-24 06:58:54 +0000 URL: https://git.openjdk.java.net/skara/commit/b0a97589 244: Legacy reviewers jcheck configuration does not reset default Reviewed-by: rwestberg ! jcheck/src/main/java/org/openjdk/skara/jcheck/ReviewersConfiguration.java ! jcheck/src/test/java/org/openjdk/skara/jcheck/ReviewersCheckTests.java From ehelin at openjdk.java.net Fri Jan 24 07:02:07 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Jan 2020 07:02:07 GMT Subject: RFR: Make it possible to only allow PRs against a select set of target branches In-Reply-To: References: Message-ID: On Thu, 23 Jan 2020 13:21:16 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that makes it possible to only allow PRs to target a select set of branches. > > Best regards, > Robin bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 74: > 73: private boolean checkTargetBranch() { > 74: var matcher = workItem.bot.allowedTargetBranches().matcher(pr.targetRef()); > 75: return matcher.matches(); Should we use a pattern or should we simply just enumerate the protected branches? It seems potentially overkill to support a regex, it seems like an anti-pattern to have a repository with so many protected branches that they are cumbersome to enumerate, so you need a regex ?? ------------- PR: https://git.openjdk.java.net/skara/pull/377 From ehelin at openjdk.java.net Fri Jan 24 07:55:56 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Jan 2020 07:55:56 GMT Subject: RFR: 245: CLI tools do not consider git's http.proxy configuration Message-ID: Hi all, please review this patch that makes the CLI tools respect git's [http.proxy](https://git-scm.com/docs/git-config#Documentation/git-config.txt-httpproxy) setting. The behavior with this patch is if `http_proxy`, `https_proxy` and/or `no_proxy` is *not* set, then we try to set the proxy based on git's `http.proxy` config (i.e. `http_proxy` and friends have precedence). Thanks, Erik ## Testing - [x] Manual testing of CLI tools behind http(s) proxy ------------- Commits: - 8ba31022: Support git's http.proxy in HttpProxy Changes: https://git.openjdk.java.net/skara/pull/379/files Webrev: https://webrevs.openjdk.java.net/skara/379/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-245 Stats: 50 lines in 1 file changed: 44 ins; 2 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/379.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/379/head:pull/379 PR: https://git.openjdk.java.net/skara/pull/379 From rwestberg at openjdk.java.net Fri Jan 24 08:01:56 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 08:01:56 GMT Subject: RFR: 245: CLI tools do not consider git's http.proxy configuration In-Reply-To: References: Message-ID: On Fri, 24 Jan 2020 07:49:10 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the CLI tools respect git's > [http.proxy](https://git-scm.com/docs/git-config#Documentation/git-config.txt-httpproxy) > setting. The behavior with this patch is if `http_proxy`, `https_proxy` and/or > `no_proxy` is *not* set, then we try to set the proxy based on git's > `http.proxy` config (i.e. `http_proxy` and friends have precedence). > > Thanks, > Erik > > ## Testing > - [x] Manual testing of CLI tools behind http(s) proxy Should the precedence order perhaps be changed to match how git treats the configuration? ------------- PR: https://git.openjdk.java.net/skara/pull/379 From rwestberg at openjdk.java.net Fri Jan 24 08:44:49 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 08:44:49 GMT Subject: RFR: 246: Avoid bridging too large emails Message-ID: Hi all, Please review this change that avoids posting too large comments when bridging email replies to a PR. Best regards, Robin ------------- Commits: - 01df453c: Truncate large email comments Changes: https://git.openjdk.java.net/skara/pull/380/files Webrev: https://webrevs.openjdk.java.net/skara/380/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-246 Stats: 86 lines in 2 files changed: 83 ins; 2 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/380.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/380/head:pull/380 PR: https://git.openjdk.java.net/skara/pull/380 From ehelin at openjdk.java.net Fri Jan 24 09:33:45 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Jan 2020 09:33:45 GMT Subject: RFR: 246: Avoid bridging too large emails In-Reply-To: References: Message-ID: On Fri, 24 Jan 2020 08:39:49 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that avoids posting too large comments when bridging email replies to a PR. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/380 From erik.helin at oracle.com Fri Jan 24 09:42:54 2020 From: erik.helin at oracle.com (Erik Helin) Date: Fri, 24 Jan 2020 10:42:54 +0100 Subject: RFR: 245: CLI tools do not consider git's http.proxy configuration In-Reply-To: References: Message-ID: On 1/24/20 9:01 AM, Robin Westberg wrote: > Should the precedence order perhaps be changed to match how git treats the configuration? Yeah, that makes sense. I pushed a new version! Thanks, Erik From ehelin at openjdk.java.net Fri Jan 24 09:48:09 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Jan 2020 09:48:09 GMT Subject: [Rev 01] RFR: 245: CLI tools do not consider git's http.proxy configuration In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that makes the CLI tools respect git's > [http.proxy](https://git-scm.com/docs/git-config#Documentation/git-config.txt-httpproxy) > setting. The behavior with this patch is if `http_proxy`, `https_proxy` and/or > `no_proxy` is *not* set, then we try to set the proxy based on git's > `http.proxy` config (i.e. `http_proxy` and friends have precedence). > > Thanks, > Erik > > ## Testing > - [x] Manual testing of CLI tools behind http(s) proxy The pull request has been updated with 1 additional commit. ------------- Added commits: - a9b037ec: Let git's config value have precedence over env variables Changes: - all: https://git.openjdk.java.net/skara/pull/379/files - new: https://git.openjdk.java.net/skara/pull/379/files/8ba31022..a9b037ec Webrevs: - full: https://webrevs.openjdk.java.net/skara/379/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/379/webrev.00-01 Stats: 58 lines in 1 file changed: 27 ins; 30 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/379.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/379/head:pull/379 PR: https://git.openjdk.java.net/skara/pull/379 From rwestberg at openjdk.java.net Fri Jan 24 09:48:20 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 09:48:20 GMT Subject: [Rev 01] RFR: 245: CLI tools do not consider git's http.proxy configuration In-Reply-To: References: Message-ID: On Fri, 24 Jan 2020 09:48:19 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that makes the CLI tools respect git's >> [http.proxy](https://git-scm.com/docs/git-config#Documentation/git-config.txt-httpproxy) >> setting. The behavior with this patch is if `http_proxy`, `https_proxy` and/or >> `no_proxy` is *not* set, then we try to set the proxy based on git's >> `http.proxy` config (i.e. `http_proxy` and friends have precedence). >> >> Thanks, >> Erik >> >> ## Testing >> - [x] Manual testing of CLI tools behind http(s) proxy > > The pull request has been updated with 1 additional commit. Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/379 From ehelin at openjdk.java.net Fri Jan 24 09:50:59 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Jan 2020 09:50:59 GMT Subject: [Integrated] RFR: 245: CLI tools do not consider git's http.proxy configuration In-Reply-To: References: Message-ID: Changeset: 1b578044 Author: Erik Helin Date: 2020-01-24 09:50:44 +0000 URL: https://git.openjdk.java.net/skara/commit/1b578044 245: CLI tools do not consider git's http.proxy configuration Reviewed-by: rwestberg ! proxy/src/main/java/org/openjdk/skara/proxy/HttpProxy.java From rwestberg at openjdk.java.net Fri Jan 24 10:31:35 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 10:31:35 GMT Subject: [Integrated] RFR: 246: Avoid bridging too large emails In-Reply-To: References: Message-ID: <83d702b6-0161-4532-8e87-7d9edc0616a5@openjdk.org> Changeset: d62e49ee Author: Robin Westberg Date: 2020-01-24 10:31:10 +0000 URL: https://git.openjdk.java.net/skara/commit/d62e49ee 246: Avoid bridging too large emails Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/CommentPosterWorkItem.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListArchiveReaderBotTests.java From rwestberg at openjdk.java.net Fri Jan 24 10:38:20 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 10:38:20 GMT Subject: [Rev 01] RFR: Make it possible to only allow PRs against a select set of target branches In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that makes it possible to only allow PRs to target a select set of branches. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - 7b261d73: Provide a better error message Changes: - all: https://git.openjdk.java.net/skara/pull/377/files - new: https://git.openjdk.java.net/skara/pull/377/files/7c3c3098..7b261d73 Webrevs: - full: https://webrevs.openjdk.java.net/skara/377/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/377/webrev.00-01 Stats: 26 lines in 3 files changed: 20 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/377.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/377/head:pull/377 PR: https://git.openjdk.java.net/skara/pull/377 From rwestberg at openjdk.java.net Fri Jan 24 10:38:30 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 10:38:30 GMT Subject: RFR: Make it possible to only allow PRs against a select set of target branches In-Reply-To: References: Message-ID: On Thu, 23 Jan 2020 13:21:16 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that makes it possible to only allow PRs to target a select set of branches. > > Best regards, > Robin How about enumerating the valid targets in the error message? ------------- PR: https://git.openjdk.java.net/skara/pull/377 From ehelin at openjdk.java.net Fri Jan 24 11:22:18 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Jan 2020 11:22:18 GMT Subject: [Rev 01] RFR: Make it possible to only allow PRs against a select set of target branches In-Reply-To: References: Message-ID: On Fri, 24 Jan 2020 11:22:17 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that makes it possible to only allow PRs to target a select set of branches. >> >> Best regards, >> Robin > > The pull request has been updated with 1 additional commit. Thanks, looks good! Just a small nit with regards to the method name ?? bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 73: > 72: > 73: private boolean checkTargetBranch() { > 74: var matcher = workItem.bot.allowedTargetBranches().matcher(pr.targetRef()); Suggestion: private boolean isTargetBranchAllowed() { bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 127: > 126: > 127: if (!checkTargetBranch()) { > 128: var error = "The branch `" + pr.targetRef() + "` is not allowed as target branch. The allowed target branches are:\n" + Suggestion: if (!isTargetBranchAllowed()) { ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/377 From ehelin at openjdk.java.net Fri Jan 24 11:51:14 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Jan 2020 11:51:14 GMT Subject: RFR: 243: Merge bot should support merging with certain frequency Message-ID: Hi all, please review this patch that enables the merge bot to periodically sync branches with a certain frequency. This is implemented by extending the configuration for a merge specification: "merge": { "target": "github:openjdk/panama", "specs": [ { "from": "github:openjdk/jdk:master", "to": "master", "frequency": { "interval": "weekly", "weekday": "Friday", "hour": "11" } } ] } The above configuration would merge the `master` branch from the [jdk](https://github.com/openjdk/jdk) repository to the `master` branch in the [panama](https://github.com/openjdk/panama) repository every Friday at 11:00. The merge will only be done once, i.e. it won't be retried until the next Friday if the merge fails (and result in a merge conflict PR). There is one limitation with the patch and that is that the merge bot only "remember" previous merges in memory. This is problematic if we redeploy the merge bot during 11:00 - 11:59 on a Friday and the merge already has occurred, the merge bot will then do a second merge. This is known limitation and one I think we can live with, I don't foresee it to become a problem in practice. Thanks, Erik ## Testing - [x] Added a bunch of new unit tests ------------- Commits: - d7a1769f: Support frequency in merge bot conf Changes: https://git.openjdk.java.net/skara/pull/381/files Webrev: https://webrevs.openjdk.java.net/skara/381/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-243 Stats: 995 lines in 5 files changed: 987 ins; 0 del; 8 mod Patch: https://git.openjdk.java.net/skara/pull/381.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/381/head:pull/381 PR: https://git.openjdk.java.net/skara/pull/381 From rwestberg at openjdk.java.net Fri Jan 24 12:19:56 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 12:19:56 GMT Subject: RFR: 245: Fix proxy protocol setting, add logging Message-ID: Hi all, Please review this follow-up change that fixes the proxy type selection, and also adds some logging. In addition, if proxy settings are picked up from the environment, nonProxyHosts are now always set. This avoids a problem when nonProxyHosts has a default value. Best regards, Robin ------------- Commits: - bdae54cc: Fix proxy protocol setting, add logging Changes: https://git.openjdk.java.net/skara/pull/382/files Webrev: https://webrevs.openjdk.java.net/skara/382/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-245 Stats: 47 lines in 2 files changed: 16 ins; 8 del; 23 mod Patch: https://git.openjdk.java.net/skara/pull/382.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/382/head:pull/382 PR: https://git.openjdk.java.net/skara/pull/382 From rwestberg at openjdk.java.net Fri Jan 24 12:24:56 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 12:24:56 GMT Subject: [Rev 01] RFR: Make it possible to only allow PRs against a select set of target branches In-Reply-To: References: Message-ID: On Fri, 24 Jan 2020 11:21:23 GMT, Erik Helin wrote: >> The pull request has been updated with 1 additional commit. > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 127: > >> 126: >> 127: if (!checkTargetBranch()) { >> 128: var error = "The branch `" + pr.targetRef() + "` is not allowed as target branch. The allowed target branches are:\n" + > > Suggestion: > > if (!isTargetBranchAllowed()) { Sounds good, will change! ------------- PR: https://git.openjdk.java.net/skara/pull/377 From rwestberg at openjdk.java.net Fri Jan 24 12:24:54 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 12:24:54 GMT Subject: [Rev 02] RFR: Make it possible to only allow PRs against a select set of target branches In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that makes it possible to only allow PRs to target a select set of branches. > > Best regards, > Robin The pull request has been updated with 2 additional commits. ------------- Added commits: - 19779e46: Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java - db6743ab: Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java Changes: - all: https://git.openjdk.java.net/skara/pull/377/files - new: https://git.openjdk.java.net/skara/pull/377/files/7b261d73..19779e46 Webrevs: - full: https://webrevs.openjdk.java.net/skara/377/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/377/webrev.01-02 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/377.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/377/head:pull/377 PR: https://git.openjdk.java.net/skara/pull/377 From ehelin at openjdk.java.net Fri Jan 24 13:42:00 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Jan 2020 13:42:00 GMT Subject: RFR: 245: Fix proxy protocol setting, add logging In-Reply-To: References: Message-ID: On Fri, 24 Jan 2020 12:14:42 GMT, Robin Westberg wrote: > Hi all, > > Please review this follow-up change that fixes the proxy type selection, and also adds some logging. In addition, if proxy settings are picked up from the environment, nonProxyHosts are now always set. This avoids a problem when nonProxyHosts has a default value. > > Best regards, > Robin Looks good, thanks Robin for fixing this! Just a very minor nit about adding a comment. proxy/src/main/java/org/openjdk/skara/proxy/HttpProxy.java line 60: > 59: if (!output.startsWith("http://") && !output.startsWith("https://")) { > 60: output = "http://" + output; > 61: } Add a comment that the protocol being prepended doesn't matter? ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/382 From rwestberg at openjdk.java.net Fri Jan 24 14:06:38 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 14:06:38 GMT Subject: RFR: 245: Fix proxy protocol setting, add logging In-Reply-To: References: Message-ID: On Fri, 24 Jan 2020 13:28:13 GMT, Erik Helin wrote: >> Hi all, >> >> Please review this follow-up change that fixes the proxy type selection, and also adds some logging. In addition, if proxy settings are picked up from the environment, nonProxyHosts are now always set. This avoids a problem when nonProxyHosts has a default value. >> >> Best regards, >> Robin > > proxy/src/main/java/org/openjdk/skara/proxy/HttpProxy.java line 60: > >> 59: if (!output.startsWith("http://") && !output.startsWith("https://")) { >> 60: output = "http://" + output; >> 61: } > > Add a comment that the protocol being prepended doesn't matter? Sure, sounds reasonable. ------------- PR: https://git.openjdk.java.net/skara/pull/382 From rwestberg at openjdk.java.net Fri Jan 24 14:08:59 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 14:08:59 GMT Subject: [Integrated] RFR: Make it possible to only allow PRs against a select set of target branches In-Reply-To: References: Message-ID: <3e066732-d1f7-49ae-bfb3-90b79f35d427@openjdk.org> Changeset: 10552fd2 Author: Robin Westberg Date: 2020-01-24 14:08:46 +0000 URL: https://git.openjdk.java.net/skara/commit/10552fd2 Make it possible to only allow PRs against a select set of target branches Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestBot.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestBotBuilder.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestBotFactory.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java From rwestberg at openjdk.java.net Fri Jan 24 14:09:41 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Jan 2020 14:09:41 GMT Subject: [Integrated] RFR: 245: Fix proxy protocol setting, add logging In-Reply-To: References: Message-ID: <4a58237f-e8e3-42b9-975d-15e4d2712c54@openjdk.org> Changeset: e59a67fe Author: Robin Westberg Date: 2020-01-24 14:09:28 +0000 URL: https://git.openjdk.java.net/skara/commit/e59a67fe 245: Fix proxy protocol setting, add logging Reviewed-by: ehelin ! proxy/src/main/java/module-info.java ! proxy/src/main/java/org/openjdk/skara/proxy/HttpProxy.java From rwestberg at openjdk.java.net Mon Jan 27 07:31:26 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Jan 2020 07:31:26 GMT Subject: RFR: 243: Merge bot should support merging with certain frequency In-Reply-To: References: Message-ID: On Fri, 24 Jan 2020 11:45:46 GMT, Erik Helin wrote: > Hi all, > > please review this patch that enables the merge bot to periodically sync > branches with a certain frequency. This is implemented by extending the > configuration for a merge specification: > > "merge": { > "target": "github:openjdk/panama", > "specs": [ > { > "from": "github:openjdk/jdk:master", > "to": "master", > "frequency": { > "interval": "weekly", > "weekday": "Friday", > "hour": "11" > } > } > ] > } > > The above configuration would merge the `master` branch from the > [jdk](https://github.com/openjdk/jdk) repository to the `master` branch in the > [panama](https://github.com/openjdk/panama) repository every Friday at 11:00. > The merge will only be done once, i.e. it won't be retried until the next Friday > if the merge fails (and result in a merge conflict PR). > > There is one limitation with the patch and that is that the merge bot only > "remember" previous merges in memory. This is problematic if we redeploy the > merge bot during 11:00 - 11:59 on a Friday and the merge already has occurred, > the merge bot will then do a second merge. This is known limitation and one I > think we can live with, I don't foresee it to become a problem in practice. > > Thanks, > Erik > > ## Testing > - [x] Added a bunch of new unit tests Looks good! I think it could have been possible to use a bit more existing `java.time` functionality, but I also don't think it's worth the effort to rewrite this working code. :) bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBotFactory.java line 82: > 81: private static Month toMonth(String s) { > 82: switch (s.toLowerCase()) { > 83: case "january": Would perhaps be a little less verbose to use Month.from with an appropriate formatter, but can keep it as-is if you prefer. :) ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/381 From ehelin at openjdk.java.net Mon Jan 27 09:05:07 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Jan 2020 09:05:07 GMT Subject: RFR: 243: Merge bot should support merging with certain frequency In-Reply-To: References: Message-ID: On Mon, 27 Jan 2020 07:29:35 GMT, Robin Westberg wrote: >> Hi all, >> >> please review this patch that enables the merge bot to periodically sync >> branches with a certain frequency. This is implemented by extending the >> configuration for a merge specification: >> >> "merge": { >> "target": "github:openjdk/panama", >> "specs": [ >> { >> "from": "github:openjdk/jdk:master", >> "to": "master", >> "frequency": { >> "interval": "weekly", >> "weekday": "Friday", >> "hour": "11" >> } >> } >> ] >> } >> >> The above configuration would merge the `master` branch from the >> [jdk](https://github.com/openjdk/jdk) repository to the `master` branch in the >> [panama](https://github.com/openjdk/panama) repository every Friday at 11:00. >> The merge will only be done once, i.e. it won't be retried until the next Friday >> if the merge fails (and result in a merge conflict PR). >> >> There is one limitation with the patch and that is that the merge bot only >> "remember" previous merges in memory. This is problematic if we redeploy the >> merge bot during 11:00 - 11:59 on a Friday and the merge already has occurred, >> the merge bot will then do a second merge. This is known limitation and one I >> think we can live with, I don't foresee it to become a problem in practice. >> >> Thanks, >> Erik >> >> ## Testing >> - [x] Added a bunch of new unit tests > > bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBotFactory.java line 82: > >> 81: private static Month toMonth(String s) { >> 82: switch (s.toLowerCase()) { >> 83: case "january": > > Would perhaps be a little less verbose to use Month.from with an appropriate formatter, but can keep it as-is if you prefer. :) Yeah, I agree, but since I've already written the verbose version, lets just keep it for now ?? ------------- PR: https://git.openjdk.java.net/skara/pull/381 From ehelin at openjdk.java.net Mon Jan 27 09:15:13 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Jan 2020 09:15:13 GMT Subject: [Integrated] RFR: 243: Merge bot should support merging with certain frequency In-Reply-To: References: Message-ID: Changeset: 570d6a65 Author: Erik Helin Date: 2020-01-27 09:14:54 +0000 URL: https://git.openjdk.java.net/skara/commit/570d6a65 243: Merge bot should support merging with certain frequency Reviewed-by: rwestberg ! Makefile + bots/merge/src/main/java/org/openjdk/skara/bots/merge/Clock.java ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBotFactory.java ! bots/merge/src/test/java/org/openjdk/skara/bots/merge/MergeBotTests.java From rwestberg at openjdk.java.net Mon Jan 27 13:40:57 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Jan 2020 13:40:57 GMT Subject: RFR: 248: Only post integration messages to RFR threads once Message-ID: Hi all, Please review this change that ensures that `[Integrated]` messages are only posted to an RFR thread once, even if the commit is merged to another branch that is also watched by the notifier. Best regards, Robin ------------- Commits: - cb797502: Only post integratin messages to RFR threads once Changes: https://git.openjdk.java.net/skara/pull/383/files Webrev: https://webrevs.openjdk.java.net/skara/383/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-248 Stats: 104 lines in 2 files changed: 97 ins; 1 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/383.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/383/head:pull/383 PR: https://git.openjdk.java.net/skara/pull/383 From ehelin at openjdk.java.net Mon Jan 27 14:43:27 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Jan 2020 14:43:27 GMT Subject: RFR: 248: Only post integration messages to RFR threads once In-Reply-To: References: Message-ID: On Mon, 27 Jan 2020 13:33:05 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that ensures that `[Integrated]` messages are only posted to an RFR thread once, even if the commit is merged to another branch that is also watched by the notifier. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/383 From rwestberg at openjdk.java.net Mon Jan 27 15:20:14 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Jan 2020 15:20:14 GMT Subject: [Integrated] RFR: 248: Only post integration messages to RFR threads once In-Reply-To: References: Message-ID: <72f31e90-3abf-4cd4-b783-7713a007ead0@openjdk.org> Changeset: 1325136c Author: Robin Westberg Date: 2020-01-27 15:19:56 +0000 URL: https://git.openjdk.java.net/skara/commit/1325136c 248: Only post integration messages to RFR threads once Reviewed-by: ehelin ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/MailingListUpdater.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdaterTests.java From rwestberg at openjdk.java.net Tue Jan 28 11:35:36 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Jan 2020 11:35:36 GMT Subject: RFR: 247: Support atomic pushes in with /integrate command Message-ID: Hi all, Please review this change that allows pushing without automatic rebasing. Best regards, Robin ------------- Commits: - 7497ada9: Add support for avoiding automatic rebase if wanted Changes: https://git.openjdk.java.net/skara/pull/384/files Webrev: https://webrevs.openjdk.java.net/skara/384/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-247 Stats: 183 lines in 6 files changed: 175 ins; 0 del; 8 mod Patch: https://git.openjdk.java.net/skara/pull/384.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/384/head:pull/384 PR: https://git.openjdk.java.net/skara/pull/384 From ehelin at openjdk.java.net Tue Jan 28 11:35:36 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Jan 2020 11:35:36 GMT Subject: RFR: 247: Support atomic pushes in with /integrate command In-Reply-To: References: Message-ID: On Tue, 28 Jan 2020 11:08:45 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that allows pushing without automatic rebasing. > > Best regards, > Robin Looks good, just a minor nit on wording ?? bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java line 125: > 124: if (!args.isBlank()) { > 125: reply.println("Note that your sponsor will make the final decision on which target hash to integrate on."); > 126: } Suggestion: reply.println("Note that your sponsor will make the final decision on which target hash to integrate upon."); ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/384 From rwestberg at openjdk.java.net Tue Jan 28 12:56:25 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Jan 2020 12:56:25 GMT Subject: RFR: 247: Support atomic pushes in with /integrate command In-Reply-To: References: Message-ID: On Tue, 28 Jan 2020 11:16:16 GMT, Erik Helin wrote: >> Hi all, >> >> Please review this change that allows pushing without automatic rebasing. >> >> Best regards, >> Robin > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java line 125: > >> 124: if (!args.isBlank()) { >> 125: reply.println("Note that your sponsor will make the final decision on which target hash to integrate on."); >> 126: } > > Suggestion: > > reply.println("Note that your sponsor will make the final decision on which target hash to integrate upon."); How about onto, as in `git rebase --onto`? ------------- PR: https://git.openjdk.java.net/skara/pull/384 From ehelin at openjdk.java.net Tue Jan 28 13:33:43 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Jan 2020 13:33:43 GMT Subject: RFR: 218: Enforce check on approval of CSRs Message-ID: Hi all, please review this patch that adds a CSR bot. The CSR bot allows a reviewer to issue the command `/csr` in a pull request comment. Once issued, the PR cannot be integrated until the CSR for the issue associated with the PR is in state "Closed" and "Approved". A reviewer can cancel this requirement by issuing the command `/csr unneeded` in a pull request comment. Testing: - Added a bunch of new unit tests for the `/csr` command and the CSR bot - `sh gradlew test` passes on Linux x64 Thanks, Erik ------------- Commits: - 76d62dd8: Add the CSR bot Changes: https://git.openjdk.java.net/skara/pull/385/files Webrev: https://webrevs.openjdk.java.net/skara/385/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-218 Stats: 928 lines in 10 files changed: 927 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/385.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/385/head:pull/385 PR: https://git.openjdk.java.net/skara/pull/385 From ehelin at openjdk.java.net Tue Jan 28 13:33:57 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Jan 2020 13:33:57 GMT Subject: RFR: 247: Support atomic pushes in with /integrate command In-Reply-To: References: Message-ID: <5FUPysoAMxOxvKqwyiF0P-IOtDIEQ3xNllBo6b1eVU4=.bb4ea53a-b4d5-4458-9874-d6cd0d1747f2@github.com> On Tue, 28 Jan 2020 12:56:15 GMT, Robin Westberg wrote: >> bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java line 125: >> >>> 124: if (!args.isBlank()) { >>> 125: reply.println("Note that your sponsor will make the final decision on which target hash to integrate on."); >>> 126: } >> >> Suggestion: >> >> reply.println("Note that your sponsor will make the final decision on which target hash to integrate upon."); > > How about onto, as in `git rebase --onto`? ?? ------------- PR: https://git.openjdk.java.net/skara/pull/384 From rwestberg at openjdk.java.net Wed Jan 29 07:32:56 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 29 Jan 2020 07:32:56 GMT Subject: RFR: 218: Enforce check on approval of CSRs In-Reply-To: References: Message-ID: On Tue, 28 Jan 2020 13:28:45 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a CSR bot. The CSR bot allows a reviewer to > issue the command `/csr` in a pull request comment. Once issued, the PR cannot > be integrated until the CSR for the issue associated with the PR is in state > "Closed" and "Approved". A reviewer can cancel this requirement by issuing the > command `/csr unneeded` in a pull request comment. > > Testing: > - Added a bunch of new unit tests for the `/csr` command and the CSR bot > - `sh gradlew test` passes on Linux x64 > > Thanks, > Erik Looks good, mostly have some spelling suggestions. ?? bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommandWorkItem.java line 98: > 97: private void processCommand(PullRequest pr, CensusInstance censusInstance, Path scratchPath, String command, Comment comment, List allComments) { > 98: System.out.println("processing command " + command); > 99: var writer = new StringWriter(); Revert? bots/pr/src/main/java/org/openjdk/skara/bots/pr/CSRCommand.java line 43: > 42: writer.println("has indicated that a " + > 43: "[compatability and specification](https://wiki.openjdk.java.net/display/csr/Main) (CSR) request " + > 44: "is needed for this pull request."); Suggestion: "[compatibility and specification](https://wiki.openjdk.java.net/display/csr/Main) (CSR) request " + bots/pr/src/main/java/org/openjdk/skara/bots/pr/CSRCommand.java line 134: > 133: public String description() { > 134: return "require a compatability and specification request (CSR) for this pull request"; > 135: } Suggestion: return "require a compatibility and specification request (CSR) for this pull request"; bots/pr/src/test/java/org/openjdk/skara/bots/pr/CSRTests.java line 76: > 75: assertLastCommentContains(pr, "has indicated that a " + > 76: "[compatability and specification](https://wiki.openjdk.java.net/display/csr/Main) (CSR) request " + > 77: "is needed for this pull request."); Suggestion: "[compatibility and specification](https://wiki.openjdk.java.net/display/csr/Main) (CSR) request " + bots/pr/src/test/java/org/openjdk/skara/bots/pr/CSRTests.java line 168: > 167: assertLastCommentContains(pr, "has indicated that a " + > 168: "[compatability and specification](https://wiki.openjdk.java.net/display/csr/Main) " + > 169: "(CSR) request is needed for this pull request."); Suggestion: "[compatibility and specification](https://wiki.openjdk.java.net/display/csr/Main) " + bots/pr/src/test/java/org/openjdk/skara/bots/pr/CSRTests.java line 281: > 280: assertLastCommentContains(pr, "has indicated that a " + > 281: "[compatability and specification](https://wiki.openjdk.java.net/display/csr/Main) " + > 282: "(CSR) request is needed for this pull request."); Suggestion: "[compatibility and specification](https://wiki.openjdk.java.net/display/csr/Main) " + bots/pr/src/test/java/org/openjdk/skara/bots/pr/CSRTests.java line 323: > 322: assertLastCommentContains(pr, "has indicated that a " + > 323: "[compatability and specification](https://wiki.openjdk.java.net/display/csr/Main) (CSR) request " + > 324: "is needed for this pull request."); Suggestion: "[compatibility and specification](https://wiki.openjdk.java.net/display/csr/Main) (CSR) request " + ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/385 From rwestberg at openjdk.java.net Wed Jan 29 08:04:28 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 29 Jan 2020 08:04:28 GMT Subject: [Integrated] RFR: 247: Support atomic pushes in with /integrate command In-Reply-To: References: Message-ID: Changeset: 77ae4d83 Author: Robin Westberg Date: 2020-01-29 08:04:11 +0000 URL: https://git.openjdk.java.net/skara/commit/77ae4d83 247: Support atomic pushes in with /integrate command Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/SponsorCommand.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/IntegrateTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SponsorTests.java From ehelin at openjdk.java.net Wed Jan 29 08:08:16 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 29 Jan 2020 08:08:16 GMT Subject: RFR: 218: Enforce check on approval of CSRs In-Reply-To: References: Message-ID: On Tue, 28 Jan 2020 13:42:42 GMT, Robin Westberg wrote: >> Hi all, >> >> please review this patch that adds a CSR bot. The CSR bot allows a reviewer to >> issue the command `/csr` in a pull request comment. Once issued, the PR cannot >> be integrated until the CSR for the issue associated with the PR is in state >> "Closed" and "Approved". A reviewer can cancel this requirement by issuing the >> command `/csr unneeded` in a pull request comment. >> >> Testing: >> - Added a bunch of new unit tests for the `/csr` command and the CSR bot >> - `sh gradlew test` passes on Linux x64 >> >> Thanks, >> Erik > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommandWorkItem.java line 98: > >> 97: private void processCommand(PullRequest pr, CensusInstance censusInstance, Path scratchPath, String command, Comment comment, List allComments) { >> 98: System.out.println("processing command " + command); >> 99: var writer = new StringWriter(); > > Revert? Right, thanks! ------------- PR: https://git.openjdk.java.net/skara/pull/385 From ehelin at openjdk.java.net Wed Jan 29 08:21:14 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 29 Jan 2020 08:21:14 GMT Subject: [Rev 01] RFR: 218: Enforce check on approval of CSRs In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that adds a CSR bot. The CSR bot allows a reviewer to > issue the command `/csr` in a pull request comment. Once issued, the PR cannot > be integrated until the CSR for the issue associated with the PR is in state > "Closed" and "Approved". A reviewer can cancel this requirement by issuing the > command `/csr unneeded` in a pull request comment. > > Testing: > - Added a bunch of new unit tests for the `/csr` command and the CSR bot > - `sh gradlew test` passes on Linux x64 > > Thanks, > Erik The pull request has been updated with 1 additional commit. ------------- Added commits: - c68a467f: Fix spelling Changes: - all: https://git.openjdk.java.net/skara/pull/385/files - new: https://git.openjdk.java.net/skara/pull/385/files/76d62dd8..c68a467f Webrevs: - full: https://webrevs.openjdk.java.net/skara/385/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/385/webrev.00-01 Stats: 7 lines in 2 files changed: 0 ins; 1 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/385.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/385/head:pull/385 PR: https://git.openjdk.java.net/skara/pull/385 From ehelin at openjdk.java.net Wed Jan 29 08:36:46 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 29 Jan 2020 08:36:46 GMT Subject: [Rev 02] RFR: 218: Enforce check on approval of CSRs In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that adds a CSR bot. The CSR bot allows a reviewer to > issue the command `/csr` in a pull request comment. Once issued, the PR cannot > be integrated until the CSR for the issue associated with the PR is in state > "Closed" and "Approved". A reviewer can cancel this requirement by issuing the > command `/csr unneeded` in a pull request comment. > > Testing: > - Added a bunch of new unit tests for the `/csr` command and the CSR bot > - `sh gradlew test` passes on Linux x64 > > Thanks, > Erik The pull request has been updated with 1 additional commit. ------------- Added commits: - 800212db: Remove spurious printing Changes: - all: https://git.openjdk.java.net/skara/pull/385/files - new: https://git.openjdk.java.net/skara/pull/385/files/c68a467f..800212db Webrevs: - full: https://webrevs.openjdk.java.net/skara/385/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/385/webrev.01-02 Stats: 1 line in 1 file changed: 0 ins; 1 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/385.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/385/head:pull/385 PR: https://git.openjdk.java.net/skara/pull/385 From ehelin at openjdk.java.net Wed Jan 29 08:38:38 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 29 Jan 2020 08:38:38 GMT Subject: [Integrated] RFR: 218: Enforce check on approval of CSRs In-Reply-To: References: Message-ID: Changeset: f40d58ed Author: Erik Helin Date: 2020-01-29 08:38:20 +0000 URL: https://git.openjdk.java.net/skara/commit/f40d58ed 218: Enforce check on approval of CSRs Reviewed-by: rwestberg ! bots/cli/build.gradle + bots/csr/build.gradle + bots/csr/src/main/java/module-info.java + bots/csr/src/main/java/org/openjdk/skara/bots/csr/CSRBot.java + bots/csr/src/main/java/org/openjdk/skara/bots/csr/CSRBotFactory.java + bots/csr/src/test/java/org/openjdk/skara/bots/csr/CSRBotTests.java + bots/pr/src/main/java/org/openjdk/skara/bots/pr/CSRCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommandWorkItem.java + bots/pr/src/test/java/org/openjdk/skara/bots/pr/CSRTests.java ! settings.gradle From jonathan.gibbons at oracle.com Wed Jan 29 20:05:30 2020 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Wed, 29 Jan 2020 12:05:30 -0800 Subject: RFR: 247: Support atomic pushes in with /integrate command In-Reply-To: <5FUPysoAMxOxvKqwyiF0P-IOtDIEQ3xNllBo6b1eVU4=.bb4ea53a-b4d5-4458-9874-d6cd0d1747f2@github.com> References: <5FUPysoAMxOxvKqwyiF0P-IOtDIEQ3xNllBo6b1eVU4=.bb4ea53a-b4d5-4458-9874-d6cd0d1747f2@github.com> Message-ID: <35634f32-a738-dde3-79b0-121d9a8cbe5b@oracle.com> On 1/28/20 5:33 AM, Erik Helin wrote: > On Tue, 28 Jan 2020 12:56:15 GMT, Robin Westberg wrote: > >>> bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java line 125: >>> >>>> 124: if (!args.isBlank()) { >>>> 125: reply.println("Note that your sponsor will make the final decision on which target hash to integrate on."); >>>> 126: } >>> Suggestion: >>> >>> reply.println("Note that your sponsor will make the final decision on which target hash to integrate upon."); >> How about onto, as in `git rebase --onto`? > ?? > > ------------- > > PR: https://git.openjdk.java.net/skara/pull/384 Some say you should not end a sentence with a preposition, and you've certainly got a double "on". Suggestion: reply.println("Note that your sponsor will make the final decision onto which target hash to integrate."); -- Jon From rwestberg at openjdk.java.net Thu Jan 30 09:54:59 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 30 Jan 2020 09:54:59 GMT Subject: RFR: 182: Implement a cooldown period when bridging pull request comments to mailing lists Message-ID: Hi all, Please review this change that implements waiting for a configured period of time before bridging PR comments to mailing lists. It also contains a refactoring to construct the mailing list bridge bot with a builder. Best regards, Robin ------------- Commits: - 4827aa4b: Implement the time-base filtering - 3b55cf70: Refactor MailingListBridgeBot construction Changes: https://git.openjdk.java.net/skara/pull/386/files Webrev: https://webrevs.openjdk.java.net/skara/386/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-182 Stats: 601 lines in 8 files changed: 370 ins; 29 del; 202 mod Patch: https://git.openjdk.java.net/skara/pull/386.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/386/head:pull/386 PR: https://git.openjdk.java.net/skara/pull/386 From ehelin at openjdk.java.net Thu Jan 30 10:43:08 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 30 Jan 2020 10:43:08 GMT Subject: RFR: 182: Implement a cooldown period when bridging pull request comments to mailing lists In-Reply-To: References: Message-ID: On Thu, 30 Jan 2020 09:49:32 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that implements waiting for a configured period of time before bridging PR comments to mailing lists. It also contains a refactoring to construct the mailing list bridge bot with a builder. > > Best regards, > Robin Looks good, thanks for fixing this! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/386 From rwestberg at openjdk.java.net Thu Jan 30 11:16:13 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 30 Jan 2020 11:16:13 GMT Subject: [Integrated] RFR: 182: Implement a cooldown period when bridging pull request comments to mailing lists In-Reply-To: References: Message-ID: <93f29653-a01f-47f0-bb1a-012ed397fd62@openjdk.org> Changeset: b760927d Author: Robin Westberg Date: 2020-01-30 11:15:56 +0000 URL: https://git.openjdk.java.net/skara/commit/b760927d 182: Implement a cooldown period when bridging pull request comments to mailing lists Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBot.java + bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotBuilder.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotFactory.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListArchiveReaderBotTests.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java From robin.westberg at oracle.com Thu Jan 30 12:59:01 2020 From: robin.westberg at oracle.com (Robin Westberg) Date: Thu, 30 Jan 2020 13:59:01 +0100 Subject: RFR: 247: Support atomic pushes in with /integrate command In-Reply-To: <35634f32-a738-dde3-79b0-121d9a8cbe5b@oracle.com> References: <5FUPysoAMxOxvKqwyiF0P-IOtDIEQ3xNllBo6b1eVU4=.bb4ea53a-b4d5-4458-9874-d6cd0d1747f2@github.com> <35634f32-a738-dde3-79b0-121d9a8cbe5b@oracle.com> Message-ID: <6F25FEF2-C9CA-4619-B499-08D0B221CC01@oracle.com> Hi Jon, > On 29 Jan 2020, at 21:05, Jonathan Gibbons wrote: > > > On 1/28/20 5:33 AM, Erik Helin wrote: >> On Tue, 28 Jan 2020 12:56:15 GMT, Robin Westberg wrote: >> >>>> bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java line 125: >>>> >>>>> 124: if (!args.isBlank()) { >>>>> 125: reply.println("Note that your sponsor will make the final decision on which target hash to integrate on."); >>>>> 126: } >>>> Suggestion: >>>> >>>> reply.println("Note that your sponsor will make the final decision on which target hash to integrate upon."); >>> How about onto, as in `git rebase --onto`? >> ?? >> >> ------------- >> >> PR: https://git.openjdk.java.net/skara/pull/384 > > > Some say you should not end a sentence with a preposition, and you've certainly got a double "on". > > Suggestion: > > reply.println("Note that your sponsor will make the final decision onto which target hash to integrate.?); Thanks! I?ll create a follow-up PR to incorporate your suggestion. Best regards, Robin > > -- Jon > > From rwestberg at openjdk.java.net Thu Jan 30 13:11:44 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 30 Jan 2020 13:11:44 GMT Subject: RFR: Improve sponsor message Message-ID: Hi all, Please review this small change that improves the wording when a PR with a specified integration hash needs sponsoring. Best regards, Robin ------------- Commits: - 737736f6: Improve sponsor message Changes: https://git.openjdk.java.net/skara/pull/387/files Webrev: https://webrevs.openjdk.java.net/skara/387/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/387.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/387/head:pull/387 PR: https://git.openjdk.java.net/skara/pull/387 From ehelin at openjdk.java.net Thu Jan 30 13:20:48 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 30 Jan 2020 13:20:48 GMT Subject: RFR: Improve sponsor message In-Reply-To: References: Message-ID: On Thu, 30 Jan 2020 13:06:52 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that improves the wording when a PR with a specified integration hash needs sponsoring. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/387 From rwestberg at openjdk.java.net Thu Jan 30 13:39:57 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 30 Jan 2020 13:39:57 GMT Subject: [Rev 01] RFR: Improve sponsor message In-Reply-To: References: Message-ID: > Hi all, > > Please review this small change that improves the wording when a PR with a specified integration hash needs sponsoring. > > Best regards, > Robin The pull request has been updated with 1 additional commit. ------------- Added commits: - 5e2e78a1: Also update the test Changes: - all: https://git.openjdk.java.net/skara/pull/387/files - new: https://git.openjdk.java.net/skara/pull/387/files/737736f6..5e2e78a1 Webrevs: - full: https://webrevs.openjdk.java.net/skara/387/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/387/webrev.00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/387.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/387/head:pull/387 PR: https://git.openjdk.java.net/skara/pull/387 From rwestberg at openjdk.java.net Thu Jan 30 13:51:07 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 30 Jan 2020 13:51:07 GMT Subject: [Integrated] RFR: Improve sponsor message In-Reply-To: References: Message-ID: <6712fa16-385f-4c44-8ade-4b4abfa3c077@openjdk.org> Changeset: 965ead05 Author: Robin Westberg Date: 2020-01-30 13:50:57 +0000 URL: https://git.openjdk.java.net/skara/commit/965ead05 Improve sponsor message Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SponsorTests.java From rwestberg at openjdk.java.net Fri Jan 31 12:17:22 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 31 Jan 2020 12:17:22 GMT Subject: RFR: 251: Bypass PR update cache when the cooldown period expires for a bridge candidate Message-ID: Hi all, Please review this change that ensures that the mailing list bridge bot retries the bridge operation if it was initially delayed due to the configured cooldown period. Best regards, Robin ------------- Commits: - 3f5657b5: Ensure bridging is retried after the cooldown period expires Changes: https://git.openjdk.java.net/skara/pull/388/files Webrev: https://webrevs.openjdk.java.net/skara/388/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-251 Stats: 171 lines in 5 files changed: 161 ins; 0 del; 10 mod Patch: https://git.openjdk.java.net/skara/pull/388.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/388/head:pull/388 PR: https://git.openjdk.java.net/skara/pull/388 From ehelin at openjdk.java.net Fri Jan 31 13:33:12 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 31 Jan 2020 13:33:12 GMT Subject: RFR: 251: Bypass PR update cache when the cooldown period expires for a bridge candidate In-Reply-To: References: Message-ID: On Fri, 31 Jan 2020 12:11:55 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that ensures that the mailing list bridge bot retries the bridge operation if it was initially delayed due to the configured cooldown period. > > Best regards, > Robin Nice work! Couldn't `getUniqueId()` just be replaced by `pr.webUrl()`? bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/CooldownQuarantine.java line 46: > 45: public synchronized boolean inQuarantine(PullRequest pr) { > 46: var uniqueId = getUniqueId(pr); > 47: Suggestion: var uniqueId = pr.webUrl(); bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/CooldownQuarantine.java line 62: > 61: public synchronized void updateQuarantineEnd(PullRequest pr, Instant end) { > 62: var uniqueId = getUniqueId(pr); > 63: var currentEnd = quarantineEnd.getOrDefault(uniqueId, Instant.now()); Suggestion: var uniqueId = pr.webUrl(); ------------- PR: https://git.openjdk.java.net/skara/pull/388 From rwestberg at openjdk.java.net Fri Jan 31 16:00:30 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 31 Jan 2020 16:00:30 GMT Subject: RFR: Fix problem with ignoring links in Jira Message-ID: <2xxLf4FfTzDBCUHj-Cyfr8MCDhy8sJf7_L1ME0mMp-0=.8d573e05-25a1-49b7-af1c-002f98b987a0@github.com> Hi all, Please review this small change that avoids a potential NPE in the Jira issue handler, which can happen for external links added from another source than the Skara code. Best regards, Robin ------------- Commits: - 273a28ec: Fix NPE Changes: https://git.openjdk.java.net/skara/pull/389/files Webrev: https://webrevs.openjdk.java.net/skara/389/webrev.00 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/389.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/389/head:pull/389 PR: https://git.openjdk.java.net/skara/pull/389