From rwestberg at openjdk.java.net Wed Apr 1 09:57:39 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 1 Apr 2020 09:57:39 GMT Subject: RFR: 278: Enhance the /solves command Message-ID: Hi all, Please review this change that improves the allowed syntax for the `/solves` command. Best regards, Robin ------------- Commit messages: - Initial implementation Changes: https://git.openjdk.java.net/skara/pull/556/files Webrev: https://webrevs.openjdk.java.net/skara/556/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-278 Stats: 281 lines in 6 files changed: 236 ins; 18 del; 27 mod Patch: https://git.openjdk.java.net/skara/pull/556.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/556/head:pull/556 PR: https://git.openjdk.java.net/skara/pull/556 From rwestberg at openjdk.java.net Wed Apr 1 13:58:10 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 1 Apr 2020 13:58:10 GMT Subject: [Rev 01] RFR: 278: Enhance the /solves command In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that improves the allowed syntax for the `/solves` command. > > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Updated after offline review The primary form of the command is now /issue add or /issue remove. The /solves command remains as an alias, and can continue to be used with the previous syntax, as the "add" word is optional. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/556/files - new: https://git.openjdk.java.net/skara/pull/556/files/6453915b..3728b2cd Webrevs: - full: https://webrevs.openjdk.java.net/skara/556/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/556/webrev.00-01 Stats: 1202 lines in 5 files changed: 617 ins; 584 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/556.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/556/head:pull/556 PR: https://git.openjdk.java.net/skara/pull/556 From ehelin at openjdk.java.net Wed Apr 1 14:32:09 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 1 Apr 2020 14:32:09 GMT Subject: RFR: merge-bot: create integrateable pull requests Message-ID: Hi all, please review this patch that makes the merge bot creates pull requests that can be integrated. With this new version of the merge bot contributors will be able to update the "merge style" PR created by the automatic merge bot. This should reduce the overhead quite a bit for resolving a merge conflict. Testing: - `make test` - Updated unit tests Thanks, Erik ------------- Commit messages: - Use (most likely) PR id as branch name - merge-bot: create real merge PRs and integrate them Changes: https://git.openjdk.java.net/skara/pull/557/files Webrev: https://webrevs.openjdk.java.net/skara/557/webrev.00 Stats: 261 lines in 13 files changed: 69 ins; 125 del; 67 mod Patch: https://git.openjdk.java.net/skara/pull/557.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/557/head:pull/557 PR: https://git.openjdk.java.net/skara/pull/557 From rwestberg at openjdk.java.net Wed Apr 1 15:19:06 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 1 Apr 2020 15:19:06 GMT Subject: RFR: Allow disabling bidirectional mailing list syncing per repo Message-ID: Hi all, Please review this small change that allows disabling bidirectional mailing list syncing per repository. Best regards, Robin ------------- Commit messages: - Allow disabling bidirectional mailing list syncing per repo Changes: https://git.openjdk.java.net/skara/pull/558/files Webrev: https://webrevs.openjdk.java.net/skara/558/webrev.00 Stats: 6 lines in 1 file changed: 2 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/558.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/558/head:pull/558 PR: https://git.openjdk.java.net/skara/pull/558 From rwestberg at openjdk.java.net Thu Apr 2 04:29:50 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 2 Apr 2020 04:29:50 GMT Subject: RFR: merge-bot: create integrateable pull requests In-Reply-To: References: Message-ID: On Wed, 1 Apr 2020 14:26:58 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the merge bot creates pull requests that can be integrated. With this new version > of the merge bot contributors will be able to update the "merge style" PR created by the automatic merge bot. This > should reduce the overhead quite a bit for resolving a merge conflict. With the new workflow a contributor would have > to something like the following (assuming they have a remote named `openjdk-bot`): > $ git fetch openjdk-bot > $ git checkout openjdk-bot/17 > $ git merge > $ # fix merge conflicts > $ git add -u > $ git commit -m "Merge " > $ git push > > Testing: > - `make test` > - Updated unit tests > > Thanks, > Erik Looks good, nice improvement! I think it would be useful with an additional test that performs the /sponsor command as well and validates the actual pushed commit, to ensure that author and committer is set properly. bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java line 315: > 314: // Other reply, potentially due to rebase issue, just > 315: // wait for the labeler to add appropriate labes. > 316: } Suggestion: // wait for the labeler to add appropriate labels. ------------- PR: https://git.openjdk.java.net/skara/pull/557 From ehelin at openjdk.java.net Thu Apr 2 05:13:20 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 2 Apr 2020 05:13:20 GMT Subject: [Rev 01] RFR: 278: Enhance the /solves command In-Reply-To: References: Message-ID: On Wed, 1 Apr 2020 13:58:10 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that improves the allowed syntax for the `/solves` command. >> >> Best regards, >> Robin > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Updated after offline review > > The primary form of the command is now /issue add or /issue remove. The /solves command remains as an alias, and can > continue to be used with the previous syntax, as the "add" word is optional. Looks really nice, just a few comment places where `/solves` is still lingering ?? bots/pr/src/main/java/org/openjdk/skara/bots/pr/IssueCommand.java line 169: > 168: reply.print("This repository does not have an issue project configured - you will > need to input the issue title manually "); 169: reply.println("using the syntax > `/solves " + issue.id() + ": title of the issue`."); 170: return; Suggestion: reply.println("using the syntax `/" + name + "` add " + issue.id() + ": title of the issue`."); bots/pr/src/main/java/org/openjdk/skara/bots/pr/IssueCommand.java line 194: > 193: reply.print("Temporary failure when trying to look up issue `" + issue.id() + "` - you > will need to input the issue title manually "); 194: reply.println("using the syntax > `/solves " + issue.id() + ": title of the issue`."); 195: return; Suggestion: reply.println("using the syntax `/" + name +"` add " + issue.id() + ": title of the issue`."); bots/pr/src/main/java/org/openjdk/skara/bots/pr/IssueCommand.java line 108: > 107: if (!comment.author().equals(pr.author())) { > 108: reply.println("Only the author (@" + pr.author().userName() + ") is allowed to issue the `solves` > command."); 109: return; Suggestion: reply.println("Only the author (@" + pr.author().userName() + ") is allowed to issue the `" + name + "` command."); bots/pr/src/main/java/org/openjdk/skara/bots/pr/IssueCommand.java line 140: > 139: reply.println(SolvesTracker.removeSolvesMarker(issue)); > 140: reply.println("Removing additional issue from solves list: `" + issue.id() + "`."); > 141: } else { Suggestion: reply.println("Removing additional issue from " + name + " list: `" + issue.id() + "`."); bots/pr/src/main/java/org/openjdk/skara/bots/pr/IssueCommand.java line 228: > 227: } else { > 228: reply.println("Adding additional issue to solves list: `" + issue.toString() + "`."); > 229: } Suggestion: reply.println("Adding additional issue to " + name + " list: `" + issue.toString() + "`."); ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/556 From ehelin at openjdk.java.net Thu Apr 2 05:15:19 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 2 Apr 2020 05:15:19 GMT Subject: RFR: Allow disabling bidirectional mailing list syncing per repo In-Reply-To: References: Message-ID: On Wed, 1 Apr 2020 15:13:42 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that allows disabling bidirectional mailing list syncing per repository. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/558 From rwestberg at openjdk.java.net Thu Apr 2 05:16:02 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 2 Apr 2020 05:16:02 GMT Subject: [Integrated] RFR: Allow disabling bidirectional mailing list syncing per repo In-Reply-To: References: Message-ID: <75e8e32b-b317-4a6b-85f2-dd8aff7fbfe2@openjdk.org> Changeset: d48c124c Author: Robin Westberg Date: 2020-04-02 05:15:46 +0000 URL: https://git.openjdk.java.net/skara/commit/d48c124c Allow disabling bidirectional mailing list syncing per repo Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotFactory.java From ehelin at openjdk.java.net Thu Apr 2 06:24:54 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 2 Apr 2020 06:24:54 GMT Subject: [Rev 01] RFR: merge-bot: create integrateable pull requests In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that makes the merge bot creates pull requests that can be integrated. With this new version > of the merge bot contributors will be able to update the "merge style" PR created by the automatic merge bot. This > should reduce the overhead quite a bit for resolving a merge conflict. With the new workflow a contributor would have > to something like the following (assuming they have a remote named `openjdk-bot`): > $ git fetch openjdk-bot > $ git checkout openjdk-bot/17 > $ git merge > $ # fix merge conflicts > $ git add -u > $ git commit -m "Merge " > $ git push > > Testing: > - `make test` > - Updated unit tests > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Allow sponsor and full title for merge commits ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/557/files - new: https://git.openjdk.java.net/skara/pull/557/files/85d52505..7f84c6b9 Webrevs: - full: https://webrevs.openjdk.java.net/skara/557/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/557/webrev.00-01 Stats: 14 lines in 1 file changed: 7 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/557.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/557/head:pull/557 PR: https://git.openjdk.java.net/skara/pull/557 From ehelin at openjdk.java.net Thu Apr 2 07:21:20 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 2 Apr 2020 07:21:20 GMT Subject: [Rev 02] RFR: merge-bot: create integrateable pull requests In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that makes the merge bot creates pull requests that can be integrated. With this new version > of the merge bot contributors will be able to update the "merge style" PR created by the automatic merge bot. This > should reduce the overhead quite a bit for resolving a merge conflict. With the new workflow a contributor would have > to something like the following (assuming they have a remote named `openjdk-bot`): > $ git fetch openjdk-bot > $ git checkout openjdk-bot/17 > $ git merge > $ # fix merge conflicts > $ git add -u > $ git commit -m "Merge " > $ git push > > Testing: > - `make test` > - Updated unit tests > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Fix spelling in comment Co-Authored-By: Robin Westberg ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/557/files - new: https://git.openjdk.java.net/skara/pull/557/files/7f84c6b9..8a595249 Webrevs: - full: https://webrevs.openjdk.java.net/skara/557/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/557/webrev.01-02 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/557.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/557/head:pull/557 PR: https://git.openjdk.java.net/skara/pull/557 From rwestberg at openjdk.java.net Thu Apr 2 08:31:04 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 2 Apr 2020 08:31:04 GMT Subject: [Rev 02] RFR: 278: Enhance the /solves command In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that improves the allowed syntax for the `/solves` command. > > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Update after review comments ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/556/files - new: https://git.openjdk.java.net/skara/pull/556/files/3728b2cd..2876f28c Webrevs: - full: https://webrevs.openjdk.java.net/skara/556/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/556/webrev.01-02 Stats: 5 lines in 1 file changed: 0 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/556.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/556/head:pull/556 PR: https://git.openjdk.java.net/skara/pull/556 From rwestberg at openjdk.java.net Thu Apr 2 08:58:04 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 2 Apr 2020 08:58:04 GMT Subject: [Rev 03] RFR: 278: Enhance the /solves command In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that improves the allowed syntax for the `/solves` command. > > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Also update the corresponding tests ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/556/files - new: https://git.openjdk.java.net/skara/pull/556/files/2876f28c..fa0a1366 Webrevs: - full: https://webrevs.openjdk.java.net/skara/556/webrev.03 - incr: https://webrevs.openjdk.java.net/skara/556/webrev.02-03 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/556.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/556/head:pull/556 PR: https://git.openjdk.java.net/skara/pull/556 From rwestberg at openjdk.java.net Thu Apr 2 09:29:52 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 2 Apr 2020 09:29:52 GMT Subject: [Integrated] RFR: 278: Enhance the /solves command In-Reply-To: References: Message-ID: <28bad5ca-6589-4e19-b898-9b48a591b81e@openjdk.org> Changeset: 60a10303 Author: Robin Westberg Date: 2020-04-02 09:29:37 +0000 URL: https://git.openjdk.java.net/skara/commit/60a10303 278: Enhance the /solves command Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommandWorkItem.java + bots/pr/src/main/java/org/openjdk/skara/bots/pr/IssueCommand.java - bots/pr/src/main/java/org/openjdk/skara/bots/pr/SolvesCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/SolvesTracker.java + bots/pr/src/test/java/org/openjdk/skara/bots/pr/IssueTests.java - bots/pr/src/test/java/org/openjdk/skara/bots/pr/SolvesTests.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/IssueProject.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraProject.java ! test/src/main/java/org/openjdk/skara/test/TestIssueProject.java From rwestberg at openjdk.java.net Thu Apr 2 09:14:15 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 2 Apr 2020 09:14:15 GMT Subject: RFR: Parse the bidirectional option properly Message-ID: Hi all, Please review this minor change that properly interprets the bidirectional option for the mailinglist bridge bot. Best regards, Robin ------------- Commit messages: - The bidirectional option was inverted Changes: https://git.openjdk.java.net/skara/pull/559/files Webrev: https://webrevs.openjdk.java.net/skara/559/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/559.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/559/head:pull/559 PR: https://git.openjdk.java.net/skara/pull/559 From ehelin at openjdk.java.net Thu Apr 2 11:05:18 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 2 Apr 2020 11:05:18 GMT Subject: RFR: Parse the bidirectional option properly In-Reply-To: References: Message-ID: On Thu, 2 Apr 2020 09:07:35 GMT, Robin Westberg wrote: > Hi all, > > Please review this minor change that properly interprets the bidirectional option for the mailinglist bridge bot. > > Best regards, > Robin Looks awesome ?? ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/559 From rwestberg at openjdk.java.net Thu Apr 2 11:06:40 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 2 Apr 2020 11:06:40 GMT Subject: [Integrated] RFR: Parse the bidirectional option properly In-Reply-To: References: Message-ID: Changeset: 46c6d8d7 Author: Robin Westberg Date: 2020-04-02 11:06:27 +0000 URL: https://git.openjdk.java.net/skara/commit/46c6d8d7 Parse the bidirectional option properly Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotFactory.java From ehelin at openjdk.java.net Thu Apr 2 14:41:47 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 2 Apr 2020 14:41:47 GMT Subject: [Rev 03] RFR: merge-bot: create integrateable pull requests In-Reply-To: References: Message-ID: <2iMVkHwI464ML69LAfPZIMQc8ZS5UZKn4r2t5fjLrk8=.d51a8131-eeae-4f6e-a501-21fb3f45050f@github.com> > Hi all, > > please review this patch that makes the merge bot creates pull requests that can be integrated. With this new version > of the merge bot contributors will be able to update the "merge style" PR created by the automatic merge bot. This > should reduce the overhead quite a bit for resolving a merge conflict. With the new workflow a contributor would have > to something like the following (assuming they have a remote named `openjdk-bot`): > $ git fetch openjdk-bot > $ git checkout openjdk-bot/17 > $ git merge > $ # fix merge conflicts > $ git add -u > $ git commit -m "Merge " > $ git push > > Testing: > - `make test` > - Updated unit tests > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Add a test ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/557/files - new: https://git.openjdk.java.net/skara/pull/557/files/8a595249..fad4dd43 Webrevs: - full: https://webrevs.openjdk.java.net/skara/557/webrev.03 - incr: https://webrevs.openjdk.java.net/skara/557/webrev.02-03 Stats: 93 lines in 2 files changed: 93 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/557.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/557/head:pull/557 PR: https://git.openjdk.java.net/skara/pull/557 From rwestberg at openjdk.java.net Thu Apr 2 14:42:33 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 2 Apr 2020 14:42:33 GMT Subject: [Rev 03] RFR: merge-bot: create integrateable pull requests In-Reply-To: <2iMVkHwI464ML69LAfPZIMQc8ZS5UZKn4r2t5fjLrk8=.d51a8131-eeae-4f6e-a501-21fb3f45050f@github.com> References: <2iMVkHwI464ML69LAfPZIMQc8ZS5UZKn4r2t5fjLrk8=.d51a8131-eeae-4f6e-a501-21fb3f45050f@github.com> Message-ID: On Thu, 2 Apr 2020 14:41:47 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that makes the merge bot creates pull requests that can be integrated. With this new version >> of the merge bot contributors will be able to update the "merge style" PR created by the automatic merge bot. This >> should reduce the overhead quite a bit for resolving a merge conflict. With the new workflow a contributor would have >> to something like the following (assuming they have a remote named `openjdk-bot`): >> $ git fetch openjdk-bot >> $ git checkout openjdk-bot/17 >> $ git merge >> $ # fix merge conflicts >> $ git add -u >> $ git commit -m "Merge " >> $ git push >> >> Testing: >> - `make test` >> - Updated unit tests >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > Add a test Looks good! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SponsorTests.java line 669: > 668: > 669: //System.out.println(pr.comments()); > 670: //for (var entry : pr.checks(pr.headHash()).entrySet()) { Remove? ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/557 From ehelin at openjdk.java.net Thu Apr 2 15:06:17 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 2 Apr 2020 15:06:17 GMT Subject: RFR: webrev: do not fetch remote branches Message-ID: Hi all, please review this patch that makes webrev use the branches under `remote/` (e.g. `origin/`) to when calculating the closest remote branch. There is no need to fetch the remote branches. Testing: - Manual testing of `git webrev` Thanks, Erik ------------- Commit messages: - webrev: do not fetch remote branches Changes: https://git.openjdk.java.net/skara/pull/560/files Webrev: https://webrevs.openjdk.java.net/skara/560/webrev.00 Stats: 18 lines in 1 file changed: 14 ins; 1 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/560.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/560/head:pull/560 PR: https://git.openjdk.java.net/skara/pull/560 From rwestberg at openjdk.java.net Fri Apr 3 07:05:03 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 3 Apr 2020 07:05:03 GMT Subject: RFR: webrev: do not fetch remote branches In-Reply-To: References: Message-ID: On Thu, 2 Apr 2020 15:01:14 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes webrev use the branches under `remote/` > (e.g. `origin/`) to when calculating the closest remote branch. There is no need > to fetch the remote branches. > > Testing: > - Manual testing of `git webrev` > > Thanks, > Erik Looks good! cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java line 270: > 269: var branchHead = repo.resolve(branch).orElseThrow(); > 270: var mergeBase = repo.mergeBase(branchHead, head); > 271: var distance = repo.commitMetadata(mergeBase, head).size(); Now that the fetch is gone, could repo become a ReadOnlyRepository again? ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/560 From rwestberg at openjdk.java.net Fri Apr 3 08:01:48 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 3 Apr 2020 08:01:48 GMT Subject: RFR: 352: Set X-Git-URL and X-Git-Changeset headers for push notification emails Message-ID: <7lV4NmFUJEk3jU_GpeD4b7EK7JaAjH4Kd4zOxd_S8DM=.b1c46119-c515-47af-ab4c-cfdaa2b43ffc@github.com> Hi all, Please review this change that sets X-Git-URL and X-Git-Changeset headers for push notification emails. Best regards, Robin ------------- Commit messages: - Add git url and changeset headers to notifier emails Changes: https://git.openjdk.java.net/skara/pull/561/files Webrev: https://webrevs.openjdk.java.net/skara/561/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-352 Stats: 36 lines in 2 files changed: 34 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/561.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/561/head:pull/561 PR: https://git.openjdk.java.net/skara/pull/561 From duke at openjdk.java.net Fri Apr 3 08:03:34 2020 From: duke at openjdk.java.net (J.Duke) Date: Fri, 3 Apr 2020 08:03:34 GMT Subject: RFR: 352: Set X-Git-URL and X-Git-Changeset headers for push notification emails In-Reply-To: <7lV4NmFUJEk3jU_GpeD4b7EK7JaAjH4Kd4zOxd_S8DM=.b1c46119-c515-47af-ab4c-cfdaa2b43ffc@github.com> References: <7lV4NmFUJEk3jU_GpeD4b7EK7JaAjH4Kd4zOxd_S8DM=.b1c46119-c515-47af-ab4c-cfdaa2b43ffc@github.com> Message-ID: On Fri, 3 Apr 2020 07:56:43 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that sets X-Git-URL and X-Git-Changeset headers for push notification emails. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by duke (no project role). PR: https://git.openjdk.java.net/skara/pull/561 From rwestberg at openjdk.java.net Fri Apr 3 08:34:17 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 3 Apr 2020 08:34:17 GMT Subject: [Integrated] RFR: 352: Set X-Git-URL and X-Git-Changeset headers for push notification emails In-Reply-To: <7lV4NmFUJEk3jU_GpeD4b7EK7JaAjH4Kd4zOxd_S8DM=.b1c46119-c515-47af-ab4c-cfdaa2b43ffc@github.com> References: <7lV4NmFUJEk3jU_GpeD4b7EK7JaAjH4Kd4zOxd_S8DM=.b1c46119-c515-47af-ab4c-cfdaa2b43ffc@github.com> Message-ID: <1c40a9c4-f61b-4e1b-ac5a-694b45bf100b@openjdk.org> Changeset: 4da64c84 Author: Robin Westberg Date: 2020-04-03 08:34:03 +0000 URL: https://git.openjdk.java.net/skara/commit/4da64c84 352: Set X-Git-URL and X-Git-Changeset headers for push notification emails Reviewed-by: duke, 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 ehelin at openjdk.java.net Fri Apr 3 08:35:23 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 3 Apr 2020 08:35:23 GMT Subject: RFR: 352: Set X-Git-URL and X-Git-Changeset headers for push notification emails In-Reply-To: <7lV4NmFUJEk3jU_GpeD4b7EK7JaAjH4Kd4zOxd_S8DM=.b1c46119-c515-47af-ab4c-cfdaa2b43ffc@github.com> References: <7lV4NmFUJEk3jU_GpeD4b7EK7JaAjH4Kd4zOxd_S8DM=.b1c46119-c515-47af-ab4c-cfdaa2b43ffc@github.com> Message-ID: On Fri, 3 Apr 2020 07:56:43 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that sets X-Git-URL and X-Git-Changeset headers for push notification emails. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/561 From ehelin at openjdk.java.net Fri Apr 3 09:39:44 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 3 Apr 2020 09:39:44 GMT Subject: [Integrated] RFR: merge-bot: create integrateable pull requests In-Reply-To: References: Message-ID: Changeset: 921411f1 Author: Erik Helin Date: 2020-04-03 09:39:28 +0000 URL: https://git.openjdk.java.net/skara/commit/921411f1 merge-bot: create integrateable pull requests Reviewed-by: rwestberg ! bots/merge/build.gradle ! bots/merge/src/main/java/module-info.java ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java ! bots/merge/src/test/java/org/openjdk/skara/bots/merge/MergeBotTests.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java ! 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/IntegrateCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SponsorTests.java ! cli/src/main/java/org/openjdk/skara/cli/GitInfo.java ! cli/src/main/java/org/openjdk/skara/cli/pr/Utils.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/Comment.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/JCheckConfiguration.java From ehelin at openjdk.java.net Fri Apr 3 12:47:18 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 3 Apr 2020 12:47:18 GMT Subject: RFR: skara update: fix bad Files.exists check Message-ID: Hi all, please review this small patch that fixes an bad `Files.exists` check in `git skara update`. Testing: - Manual testing of `git skara update` Thanks, Erik ------------- Commit messages: - skara update: fix bad Files.exists check Changes: https://git.openjdk.java.net/skara/pull/562/files Webrev: https://webrevs.openjdk.java.net/skara/562/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/562.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/562/head:pull/562 PR: https://git.openjdk.java.net/skara/pull/562 From rwestberg at openjdk.java.net Fri Apr 3 12:47:38 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 3 Apr 2020 12:47:38 GMT Subject: RFR: skara update: fix bad Files.exists check In-Reply-To: References: Message-ID: On Fri, 3 Apr 2020 12:42:12 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that fixes an bad `Files.exists` check in `git > skara update`. > > Testing: > - Manual testing of `git skara update` > > Thanks, > Erik Good stuff! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/562 From ehelin at openjdk.java.net Fri Apr 3 12:42:51 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 3 Apr 2020 12:42:51 GMT Subject: RFR: webrev: do not fetch remote branches In-Reply-To: References: Message-ID: On Fri, 3 Apr 2020 07:02:46 GMT, Robin Westberg wrote: >> Hi all, >> >> please review this patch that makes webrev use the branches under `remote/` >> (e.g. `origin/`) to when calculating the closest remote branch. There is no need >> to fetch the remote branches. >> >> Testing: >> - Manual testing of `git webrev` >> >> Thanks, >> Erik > > cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java line 270: > >> 269: var branchHead = repo.resolve(branch).orElseThrow(); >> 270: var mergeBase = repo.mergeBase(branchHead, head); >> 271: var distance = repo.commitMetadata(mergeBase, head).size(); > > Now that the fetch is gone, could repo become a ReadOnlyRepository again? Ah right, yes! Will fix ?? ------------- PR: https://git.openjdk.java.net/skara/pull/560 From ehelin at openjdk.java.net Fri Apr 3 12:56:11 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 3 Apr 2020 12:56:11 GMT Subject: [Rev 01] RFR: webrev: do not fetch remote branches In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that makes webrev use the branches under `remote/` > (e.g. `origin/`) to when calculating the closest remote branch. There is no need > to fetch the remote branches. > > Testing: > - Manual testing of `git webrev` > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Use ReadOnlyRepository ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/560/files - new: https://git.openjdk.java.net/skara/pull/560/files/28cfac8f..a7c57fed Webrevs: - full: https://webrevs.openjdk.java.net/skara/560/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/560/webrev.00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/560.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/560/head:pull/560 PR: https://git.openjdk.java.net/skara/pull/560 From ehelin at openjdk.java.net Fri Apr 3 12:57:11 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 3 Apr 2020 12:57:11 GMT Subject: [Integrated] RFR: skara update: fix bad Files.exists check In-Reply-To: References: Message-ID: <4ea063cd-cc68-406f-b010-5252621ef1f1@openjdk.org> Changeset: 5d690661 Author: Erik Helin Date: 2020-04-03 12:56:58 +0000 URL: https://git.openjdk.java.net/skara/commit/5d690661 skara update: fix bad Files.exists check Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitSkara.java From ehelin at openjdk.java.net Fri Apr 3 12:52:32 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 3 Apr 2020 12:52:32 GMT Subject: [Integrated] RFR: webrev: do not fetch remote branches In-Reply-To: References: Message-ID: <9154c3ed-4162-46a4-be2c-690f92e1940d@openjdk.org> Changeset: 629d2f85 Author: Erik Helin Date: 2020-04-03 12:52:17 +0000 URL: https://git.openjdk.java.net/skara/commit/629d2f85 webrev: do not fetch remote branches Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java From ehelin at openjdk.java.net Fri Apr 3 13:47:57 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 3 Apr 2020 13:47:57 GMT Subject: RFR: 341: Show target branch in integration message Message-ID: <4Phn8Cc64TNDFggQKgRdqosvvZQqaZzbc4b-JqB5oHY=.e236bccd-0edb-4cd9-81c5-85fa7d3f622e@github.com> Hi all, please review this small patch that clarifies which branch the commit will be integrated to when running `/integrate`. Testing: - Update one unit test - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - skara-341 Changes: https://git.openjdk.java.net/skara/pull/563/files Webrev: https://webrevs.openjdk.java.net/skara/563/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-341 Stats: 10 lines in 2 files changed: 9 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/563.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/563/head:pull/563 PR: https://git.openjdk.java.net/skara/pull/563 From rwestberg at openjdk.java.net Fri Apr 3 13:47:57 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 3 Apr 2020 13:47:57 GMT Subject: RFR: 341: Show target branch in integration message In-Reply-To: <4Phn8Cc64TNDFggQKgRdqosvvZQqaZzbc4b-JqB5oHY=.e236bccd-0edb-4cd9-81c5-85fa7d3f622e@github.com> References: <4Phn8Cc64TNDFggQKgRdqosvvZQqaZzbc4b-JqB5oHY=.e236bccd-0edb-4cd9-81c5-85fa7d3f622e@github.com> Message-ID: On Fri, 3 Apr 2020 13:41:10 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that clarifies which branch the commit will be > integrated to when running `/integrate`. > > Testing: > - Update one unit test > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/563 From ehelin at openjdk.java.net Fri Apr 3 13:58:02 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 3 Apr 2020 13:58:02 GMT Subject: [Integrated] RFR: 341: Show target branch in integration message In-Reply-To: <4Phn8Cc64TNDFggQKgRdqosvvZQqaZzbc4b-JqB5oHY=.e236bccd-0edb-4cd9-81c5-85fa7d3f622e@github.com> References: <4Phn8Cc64TNDFggQKgRdqosvvZQqaZzbc4b-JqB5oHY=.e236bccd-0edb-4cd9-81c5-85fa7d3f622e@github.com> Message-ID: <025defff-54d1-4ab6-b028-e6f68b45d1de@openjdk.org> Changeset: c010c051 Author: Erik Helin Date: 2020-04-03 13:57:48 +0000 URL: https://git.openjdk.java.net/skara/commit/c010c051 341: Show target branch in integration message Reviewed-by: rwestberg ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/IntegrateTests.java From rwestberg at openjdk.java.net Mon Apr 6 12:47:48 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 6 Apr 2020 12:47:48 GMT Subject: RFR: 338: Send email notification for closed pull request Message-ID: Hi all, Please review this change that sends an email notification to review threads when the corresponding PR is closed without being integrated. Best regards, Robin ------------- Commit messages: - Initial implementation Changes: https://git.openjdk.java.net/skara/pull/565/files Webrev: https://webrevs.openjdk.java.net/skara/565/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-338 Stats: 102 lines in 4 files changed: 102 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/565.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/565/head:pull/565 PR: https://git.openjdk.java.net/skara/pull/565 From ehelin at openjdk.java.net Mon Apr 6 12:51:39 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 6 Apr 2020 12:51:39 GMT Subject: RFR: 338: Send email notification for closed pull request In-Reply-To: References: Message-ID: On Mon, 6 Apr 2020 12:42:38 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that sends an email notification to review threads when the corresponding PR is closed > without being integrated. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/565 From rwestberg at openjdk.java.net Mon Apr 6 13:02:52 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 6 Apr 2020 13:02:52 GMT Subject: [Integrated] RFR: 338: Send email notification for closed pull request In-Reply-To: References: Message-ID: <9b1a3ea0-0236-4bdd-97bf-1069d1fcd57f@openjdk.org> Changeset: 52394ae7 Author: Robin Westberg Date: 2020-04-06 13:02:37 +0000 URL: https://git.openjdk.java.net/skara/commit/52394ae7 338: Send email notification for closed pull request 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/ArchiveMessages.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java From ehelin at openjdk.java.net Mon Apr 6 13:42:21 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 6 Apr 2020 13:42:21 GMT Subject: RFR: notify: add Slack notifier Message-ID: Hi all, this is a draft pull request to add Slack support to the `NotifyBot`. @rwestberg can you help out with implementing the `NotifyBot` part of `handleNewPullRequest`? Thanks, Erik ------------- Commit messages: - Support new callback - notify: add Slack notifier Changes: https://git.openjdk.java.net/skara/pull/564/files Webrev: https://webrevs.openjdk.java.net/skara/564/webrev.00 Stats: 209 lines in 14 files changed: 181 ins; 16 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/564.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/564/head:pull/564 PR: https://git.openjdk.java.net/skara/pull/564 From rwestberg at openjdk.java.net Mon Apr 6 13:49:43 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 6 Apr 2020 13:49:43 GMT Subject: RFR: 347: Display additional errors in the pull request status message (if any) Message-ID: Hi all, Please review this change that displays additional errors in the pull request status message (if any), as they can be a bit hard to find in the check status. Best regards, Robin ------------- Commit messages: - Display additional errors in the pull request status message (if any) Changes: https://git.openjdk.java.net/skara/pull/566/files Webrev: https://webrevs.openjdk.java.net/skara/566/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-347 Stats: 24 lines in 2 files changed: 22 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/566.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/566/head:pull/566 PR: https://git.openjdk.java.net/skara/pull/566 From ehelin at openjdk.java.net Mon Apr 6 14:36:59 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 6 Apr 2020 14:36:59 GMT Subject: RFR: 347: Display additional errors in the pull request status message (if any) In-Reply-To: References: Message-ID: On Mon, 6 Apr 2020 13:42:59 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that displays additional errors in the pull request status message (if any), as they can be a > bit hard to find in the check status. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/566 From ehelin at openjdk.java.net Mon Apr 6 14:40:22 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 6 Apr 2020 14:40:22 GMT Subject: [Integrated] RFR: notify: add Slack notifier In-Reply-To: References: Message-ID: <69d74a60-c4f5-4b8a-bc29-3b59ba6b8670@openjdk.org> Changeset: 09ad3dc2 Author: Erik Helin Date: 2020-04-06 14:40:07 +0000 URL: https://git.openjdk.java.net/skara/commit/09ad3dc2 notify: add Slack notifier Reviewed-by: rwestberg ! 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/main/java/org/openjdk/skara/bots/notify/PullRequestUpdateConsumer.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/PullRequestWorkItem.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/RepositoryUpdateConsumer.java + bots/notify/src/main/java/org/openjdk/skara/bots/notify/SlackUpdater.java ! bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryHost.java ! forge/src/main/java/org/openjdk/skara/forge/Forge.java ! forge/src/main/java/org/openjdk/skara/forge/github/GitHubHost.java ! forge/src/main/java/org/openjdk/skara/forge/github/GitHubPullRequest.java ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabForgeFactory.java ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabHost.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/Issue.java ! test/src/main/java/org/openjdk/skara/test/TestHost.java From rwestberg at openjdk.java.net Mon Apr 6 14:39:19 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 6 Apr 2020 14:39:19 GMT Subject: RFR: notify: add Slack notifier In-Reply-To: References: Message-ID: On Mon, 6 Apr 2020 08:28:39 GMT, Erik Helin wrote: > Hi all, > > this is a draft pull request to add Slack support to the `NotifyBot`. @rwestberg > can you help out with implementing the `NotifyBot` part of > `handleNewPullRequest`? > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/564 From david.holmes at oracle.com Mon Apr 6 23:21:18 2020 From: david.holmes at oracle.com (David Holmes) Date: Tue, 7 Apr 2020 09:21:18 +1000 Subject: Email subject line formatting Message-ID: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> Hi everyone, Erik asked me to raise this here to see if anyone else is bothered by this ... When an integration email is sent the subject line of the RFR thread is augmented with [integrated] and also adorned with "Re:" as if a reply to the RFR thread e.g. Re: [Integrated] [foreign-abi] RFR: Revert "JDK-8242127: reorganize ABI-dependent layout constants" My objection to this is that once the subject has been augmented with [Integrated] it is not appropriate to treat that as a "reply" and use the "Re:". If I see: [Integrated] [foreign-abi] RFR: Revert "JDK-8242127: reorganize ABI-dependent layout constants" I know its a changeset notification email and I can ignore it. Just as I can ignore: git: openjdk/panama-foreign: foreign-jextract: 2 new changesets or hg: jdk/jdk: 8242217: Shenandoah: Enable GC mode to be diagnostic/experimental and have a name but when I see the "Re:" I think "oh someone is commenting on that push, there must be an issue and I should read the email" - which is the case with current hg notification emails! This would be less of an issue if the sender of the integration email was a bot account but it isn't, it is the committer. So I'd like to suggest that the "Re:" be dropped from the subject line of these automatically generated integration emails. Cheers, David From rwestberg at openjdk.java.net Tue Apr 7 06:56:00 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 7 Apr 2020 06:56:00 GMT Subject: [Integrated] RFR: 347: Display additional errors in the pull request status message (if any) In-Reply-To: References: Message-ID: <12b5308f-2df5-44c4-9ab9-f52016f6b974@openjdk.org> Changeset: 131ea3f6 Author: Robin Westberg Date: 2020-04-07 06:55:44 +0000 URL: https://git.openjdk.java.net/skara/commit/131ea3f6 347: Display additional errors in the pull request status message (if any) Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java From rwestberg at openjdk.java.net Tue Apr 7 08:54:50 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 7 Apr 2020 08:54:50 GMT Subject: RFR: 335: The JBS notifier should use a different method to find PRs Message-ID: <4CJSijD2RiqqTlII8BHmuT56GxLUAz_yKXf1KZ-Nm6M=.6572aca9-1283-482b-88ee-5d5e89861d86@github.com> Hi all, Please review this change that ensures that the JBS notifier properly searches for a matching PR. Best regards, Robin ------------- Commit messages: - Search for matching PR when updating issues in prOnly mode Changes: https://git.openjdk.java.net/skara/pull/567/files Webrev: https://webrevs.openjdk.java.net/skara/567/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-335 Stats: 11 lines in 2 files changed: 1 ins; 0 del; 10 mod Patch: https://git.openjdk.java.net/skara/pull/567.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/567/head:pull/567 PR: https://git.openjdk.java.net/skara/pull/567 From rwestberg at openjdk.java.net Tue Apr 7 11:53:42 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 7 Apr 2020 11:53:42 GMT Subject: RFR: Improve error section formatting Message-ID: Hi all, Please review this small change that improves the formatting of the PR error section. Best regards, Robin ------------- Commit messages: - Improve error section formatting Changes: https://git.openjdk.java.net/skara/pull/568/files Webrev: https://webrevs.openjdk.java.net/skara/568/webrev.00 Stats: 6 lines in 1 file changed: 4 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/568.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/568/head:pull/568 PR: https://git.openjdk.java.net/skara/pull/568 From ehelin at openjdk.java.net Tue Apr 7 11:54:21 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 7 Apr 2020 11:54:21 GMT Subject: RFR: 335: The JBS notifier should use a different method to find PRs In-Reply-To: <4CJSijD2RiqqTlII8BHmuT56GxLUAz_yKXf1KZ-Nm6M=.6572aca9-1283-482b-88ee-5d5e89861d86@github.com> References: <4CJSijD2RiqqTlII8BHmuT56GxLUAz_yKXf1KZ-Nm6M=.6572aca9-1283-482b-88ee-5d5e89861d86@github.com> Message-ID: On Tue, 7 Apr 2020 08:25:24 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that ensures that the JBS notifier properly searches for a matching PR. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/567 From ehelin at openjdk.java.net Tue Apr 7 11:55:51 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 7 Apr 2020 11:55:51 GMT Subject: RFR: Improve error section formatting In-Reply-To: References: Message-ID: On Tue, 7 Apr 2020 11:48:38 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that improves the formatting of the PR error section. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/568 From rwestberg at openjdk.java.net Tue Apr 7 11:59:37 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 7 Apr 2020 11:59:37 GMT Subject: [Integrated] RFR: 335: The JBS notifier should use a different method to find PRs In-Reply-To: <4CJSijD2RiqqTlII8BHmuT56GxLUAz_yKXf1KZ-Nm6M=.6572aca9-1283-482b-88ee-5d5e89861d86@github.com> References: <4CJSijD2RiqqTlII8BHmuT56GxLUAz_yKXf1KZ-Nm6M=.6572aca9-1283-482b-88ee-5d5e89861d86@github.com> Message-ID: <6b5d4107-0896-4dbd-9ffb-7581cbb7b840@openjdk.org> Changeset: ba3a0847 Author: Robin Westberg Date: 2020-04-07 11:59:19 +0000 URL: https://git.openjdk.java.net/skara/commit/ba3a0847 335: The JBS notifier should use a different method to find PRs 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 rwestberg at openjdk.java.net Tue Apr 7 12:22:26 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 7 Apr 2020 12:22:26 GMT Subject: [Rev 01] RFR: Improve error section formatting In-Reply-To: References: Message-ID: > Hi all, > > Please review this small change that improves the formatting of the PR error section. > > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Also update the test ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/568/files - new: https://git.openjdk.java.net/skara/pull/568/files/9266a8d5..1918b478 Webrevs: - full: https://webrevs.openjdk.java.net/skara/568/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/568/webrev.00-01 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/568.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/568/head:pull/568 PR: https://git.openjdk.java.net/skara/pull/568 From rwestberg at openjdk.java.net Tue Apr 7 12:41:34 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 7 Apr 2020 12:41:34 GMT Subject: [Integrated] RFR: Improve error section formatting In-Reply-To: References: Message-ID: <9f47576d-47f4-44d7-aacb-62cf6a01a0c2@openjdk.org> Changeset: 52626b52 Author: Robin Westberg Date: 2020-04-07 12:41:21 +0000 URL: https://git.openjdk.java.net/skara/commit/52626b52 Improve error section formatting Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java From rwestberg at openjdk.java.net Wed Apr 8 09:29:34 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 8 Apr 2020 09:29:34 GMT Subject: RFR: Add testReport task to create a combined report Message-ID: Hi all, Please review this change that adds a new gradle task `testReport` that runs all tests (continuing even if there are failures) and creates a combined report afterwards. Best regards, Robin ------------- Commit messages: - Add testReport task to create a combined report Changes: https://git.openjdk.java.net/skara/pull/569/files Webrev: https://webrevs.openjdk.java.net/skara/569/webrev.00 Stats: 24 lines in 1 file changed: 24 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/569.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/569/head:pull/569 PR: https://git.openjdk.java.net/skara/pull/569 From ehelin at openjdk.java.net Wed Apr 8 11:16:11 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 8 Apr 2020 11:16:11 GMT Subject: RFR: Add testReport task to create a combined report In-Reply-To: References: Message-ID: <_cHv92eJ8LBjx_3JbKYehndVZqSvIa0v6Zro4uw31oc=.2171c34c-daf2-4ae2-947e-4c5ead5eeb16@github.com> On Wed, 8 Apr 2020 09:23:57 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that adds a new gradle task `testReport` that runs all tests (continuing even if there are > failures) and creates a combined report afterwards. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/569 From rwestberg at openjdk.java.net Wed Apr 8 11:24:23 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 8 Apr 2020 11:24:23 GMT Subject: [Integrated] RFR: Add testReport task to create a combined report In-Reply-To: References: Message-ID: <4efa5e9c-6c68-427c-af21-e8db4c608bf5@openjdk.org> Changeset: ef749307 Author: Robin Westberg Date: 2020-04-08 11:24:11 +0000 URL: https://git.openjdk.java.net/skara/commit/ef749307 Add testReport task to create a combined report Reviewed-by: ehelin ! build.gradle From ehelin at openjdk.java.net Wed Apr 8 11:30:04 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 8 Apr 2020 11:30:04 GMT Subject: RFR: merge-bot: recreate repository on failed push Message-ID: Hi all, please review this patch that makes the merge bot recreate the repository on a failed push. A push can fail for a variety of reasons: network errors, conflicting push by another contributor, etc. The safest, and easiest, way to handle this scenario is to just recreate the repository. To make this operation cheap I made the merge bot utilize a `HostedRepositoryPool`. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - merge-bot: recreate repository on failed push Changes: https://git.openjdk.java.net/skara/pull/570/files Webrev: https://webrevs.openjdk.java.net/skara/570/webrev.00 Stats: 57 lines in 1 file changed: 35 ins; 20 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/570.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/570/head:pull/570 PR: https://git.openjdk.java.net/skara/pull/570 From rwestberg at openjdk.java.net Wed Apr 8 11:37:40 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 8 Apr 2020 11:37:40 GMT Subject: RFR: merge-bot: recreate repository on failed push In-Reply-To: References: Message-ID: On Wed, 8 Apr 2020 11:24:40 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the merge bot recreate the repository on a > failed push. A push can fail for a variety of reasons: network errors, > conflicting push by another contributor, etc. The safest, and easiest, way to > handle this scenario is to just recreate the repository. To make this operation > cheap I made the merge bot utilize a `HostedRepositoryPool`. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/570 From ehelin at openjdk.java.net Wed Apr 8 11:42:23 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 8 Apr 2020 11:42:23 GMT Subject: [Integrated] RFR: merge-bot: recreate repository on failed push In-Reply-To: References: Message-ID: Changeset: 29c90210 Author: Erik Helin Date: 2020-04-08 11:42:11 +0000 URL: https://git.openjdk.java.net/skara/commit/29c90210 merge-bot: recreate repository on failed push Reviewed-by: rwestberg ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java From rwestberg at openjdk.java.net Wed Apr 8 11:43:12 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 8 Apr 2020 11:43:12 GMT Subject: RFR: 351: /contributor command should allow GitHub and OpenJDK usernames Message-ID: Hi all, Please review this change that improves the usability of the /contributor command. Best regards, Robin ------------- Commit messages: - Improve usability of contributor command Changes: https://git.openjdk.java.net/skara/pull/571/files Webrev: https://webrevs.openjdk.java.net/skara/571/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-351 Stats: 131 lines in 3 files changed: 95 ins; 14 del; 22 mod Patch: https://git.openjdk.java.net/skara/pull/571.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/571/head:pull/571 PR: https://git.openjdk.java.net/skara/pull/571 From ehelin at openjdk.java.net Wed Apr 8 11:46:11 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 8 Apr 2020 11:46:11 GMT Subject: RFR: 351: /contributor command should allow GitHub and OpenJDK usernames In-Reply-To: References: Message-ID: On Wed, 8 Apr 2020 11:37:36 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that improves the usability of the /contributor command. > > Best regards, > Robin Looks good, just a minor comment on the username in the example. bots/pr/src/main/java/org/openjdk/skara/bots/pr/ContributorCommand.java line 41: > 40: reply.println(); > 41: reply.println(" * `/contributor add @" + pr.repository().forge().name() + "-User`"); > 42: reply.println(" * `/contributor add duke`"); Suggestion: reply.println(" * `/contributor add @openjdk-bot`"); ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/571 From rwestberg at openjdk.java.net Wed Apr 8 11:59:37 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 8 Apr 2020 11:59:37 GMT Subject: [Rev 01] RFR: 351: /contributor command should allow GitHub and OpenJDK usernames In-Reply-To: References: Message-ID: On Wed, 8 Apr 2020 11:42:44 GMT, Erik Helin wrote: >> Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: >> >> Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ContributorCommand.java >> >> Co-Authored-By: Erik Duveblad > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/ContributorCommand.java line 41: > >> 40: reply.println(); >> 41: reply.println(" * `/contributor add @" + pr.repository().forge().name() + "-User`"); >> 42: reply.println(" * `/contributor add duke`"); > > Suggestion: > > reply.println(" * `/contributor add @openjdk-bot`"); Sure, is probably safer to use a username that we control. ------------- PR: https://git.openjdk.java.net/skara/pull/571 From rwestberg at openjdk.java.net Wed Apr 8 11:59:36 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 8 Apr 2020 11:59:36 GMT Subject: [Rev 01] RFR: 351: /contributor command should allow GitHub and OpenJDK usernames In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that improves the usability of the /contributor command. > > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/ContributorCommand.java Co-Authored-By: Erik Duveblad ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/571/files - new: https://git.openjdk.java.net/skara/pull/571/files/66e43161..444a5791 Webrevs: - full: https://webrevs.openjdk.java.net/skara/571/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/571/webrev.00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/571.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/571/head:pull/571 PR: https://git.openjdk.java.net/skara/pull/571 From rwestberg at openjdk.java.net Wed Apr 8 12:09:22 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 8 Apr 2020 12:09:22 GMT Subject: [Integrated] RFR: 351: /contributor command should allow GitHub and OpenJDK usernames In-Reply-To: References: Message-ID: <8fba8e26-4652-44d1-85ef-e20e9e37f44c@openjdk.org> Changeset: 99be6edf Author: Robin Westberg Date: 2020-04-08 12:09:10 +0000 URL: https://git.openjdk.java.net/skara/commit/99be6edf 351: /contributor command should allow GitHub and OpenJDK usernames Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/ContributorCommand.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/ContributorTests.java ! test/src/main/java/org/openjdk/skara/test/TestHost.java From jonathan.gibbons at oracle.com Thu Apr 9 03:48:17 2020 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Wed, 8 Apr 2020 20:48:17 -0700 Subject: Email subject line formatting In-Reply-To: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> References: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> Message-ID: <6bfb8a23-02de-ea75-3c6b-507477b26f9c@oracle.com> I'm not sure I quite understand the example, because normally I would expect to see a bug number after the RFR:.? In this case, seems to be part of the synopsis of the bug, and not the bug number itself. That being said, IMO, the important part of the message, for email management, is the bug number. If the change is being integrated, it is not part of the "discussion" of the review and so does not warrant the RFR token at all.? In other words, "Integrated" should replace the RFR token. By analogy, look at the process for OpenJDK voting.?? There's a "CFV:" message; people respond with "Re: CFV", and the result of the vote starts with "Result", and does not contain the CFV.? That helps firmly indicate that the thread is closed. -- Jon On 4/6/20 4:21 PM, David Holmes wrote: > Hi everyone, > > Erik asked me to raise this here to see if anyone else is bothered by > this ... > > When an integration email is sent the subject line of the RFR thread > is augmented with [integrated] and also adorned with "Re:" as if a > reply to the RFR thread e.g. > > Re: [Integrated] [foreign-abi] RFR: Revert "JDK-8242127: reorganize > ABI-dependent layout constants" > > My objection to this is that once the subject has been augmented with > [Integrated] it is not appropriate to treat that as a "reply" and use > the "Re:". If I see: > > [Integrated] [foreign-abi] RFR: Revert "JDK-8242127: reorganize > ABI-dependent layout constants" > > I know its a changeset notification email and I can ignore it. Just as > I can ignore: > > git: openjdk/panama-foreign: foreign-jextract: 2 new changesets > > or > > hg: jdk/jdk: 8242217: Shenandoah: Enable GC mode to be > diagnostic/experimental and have a name > > but when I see the "Re:" I think "oh someone is commenting on that > push, there must be an issue and I should read the email" - which is > the case with current hg notification emails! > > This would be less of an issue if the sender of the integration email > was a bot account but it isn't, it is the committer. > > So I'd like to suggest that the "Re:" be dropped from the subject line > of these automatically generated integration emails. > > Cheers, > David From david.holmes at oracle.com Thu Apr 9 03:54:48 2020 From: david.holmes at oracle.com (David Holmes) Date: Thu, 9 Apr 2020 13:54:48 +1000 Subject: Email subject line formatting In-Reply-To: <6bfb8a23-02de-ea75-3c6b-507477b26f9c@oracle.com> References: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> <6bfb8a23-02de-ea75-3c6b-507477b26f9c@oracle.com> Message-ID: Hi Jon, On 9/04/2020 1:48 pm, Jonathan Gibbons wrote: > I'm not sure I quite understand the example, because normally I would > expect to see a bug number after the RFR:.? In this case, seems to be > part of the synopsis of the bug, and not the bug number itself. > > That being said, IMO, the important part of the message, for email > management, is the bug number. If the change is being integrated, it is > not part of the "discussion" of the review and so does not warrant the > RFR token at all.? In other words, "Integrated" should replace the RFR > token. > > By analogy, look at the process for OpenJDK voting.?? There's a "CFV:" > message; people respond with "Re: CFV", and the result of the vote > starts with "Result", and does not contain the CFV.? That helps firmly > indicate that the thread is closed. To add further to the discussion this is what Erik wrote on a slack chat about this: Skara features two kinds of "changeset notification" emails. The first is the "classical" one that is fully backwards compatible with the "changeset notifications" you are used to see today. An example of this format is: https://mail.openjdk.java.net/pipermail/skara-dev/2020-February/001796.html The other kind of "changeset notification" that Skara supports is a reply to the original "RFR" thread. This kind of notification has the advantage that you can quickly scan the mailing lists and from just the subjects see which "RFR" threads that have been integrated. (edited) See for example the skara-dev mailing list for February: https://mail.openjdk.java.net/pipermail/skara-dev/2020-February/thread.html (remember that mailman drops the "Re: " part of the subject) (edited) The panama team chose to only go with the second kind of changeset notifications - the replies to "RFR" threads. They felt that having both kind of notifications was a bit too much and they preferred this second kind of changeset notification emails. --- Cheers, David ----- > -- Jon > > > On 4/6/20 4:21 PM, David Holmes wrote: >> Hi everyone, >> >> Erik asked me to raise this here to see if anyone else is bothered by >> this ... >> >> When an integration email is sent the subject line of the RFR thread >> is augmented with [integrated] and also adorned with "Re:" as if a >> reply to the RFR thread e.g. >> >> Re: [Integrated] [foreign-abi] RFR: Revert "JDK-8242127: reorganize >> ABI-dependent layout constants" >> >> My objection to this is that once the subject has been augmented with >> [Integrated] it is not appropriate to treat that as a "reply" and use >> the "Re:". If I see: >> >> [Integrated] [foreign-abi] RFR: Revert "JDK-8242127: reorganize >> ABI-dependent layout constants" >> >> I know its a changeset notification email and I can ignore it. Just as >> I can ignore: >> >> git: openjdk/panama-foreign: foreign-jextract: 2 new changesets >> >> or >> >> hg: jdk/jdk: 8242217: Shenandoah: Enable GC mode to be >> diagnostic/experimental and have a name >> >> but when I see the "Re:" I think "oh someone is commenting on that >> push, there must be an issue and I should read the email" - which is >> the case with current hg notification emails! >> >> This would be less of an issue if the sender of the integration email >> was a bot account but it isn't, it is the committer. >> >> So I'd like to suggest that the "Re:" be dropped from the subject line >> of these automatically generated integration emails. >> >> Cheers, >> David From rwestberg at openjdk.java.net Thu Apr 9 05:08:38 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 9 Apr 2020 05:08:38 GMT Subject: RFR: forge: use correct endpoint for GitLab branches In-Reply-To: References: Message-ID: On Thu, 9 Apr 2020 05:01:13 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that fixes the "branches" endpoint for > `GitLabRepository` (it is `/repository/branches`, not `/branches`). > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/572 From ehelin at openjdk.java.net Thu Apr 9 05:08:38 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 9 Apr 2020 05:08:38 GMT Subject: RFR: forge: use correct endpoint for GitLab branches Message-ID: Hi all, please review this small patch that fixes the "branches" endpoint for `GitLabRepository` (it is `/repository/branches`, not `/branches`). Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - forge: use correct endpoint for GitLab branches Changes: https://git.openjdk.java.net/skara/pull/572/files Webrev: https://webrevs.openjdk.java.net/skara/572/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/572.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/572/head:pull/572 PR: https://git.openjdk.java.net/skara/pull/572 From ehelin at openjdk.java.net Thu Apr 9 06:22:13 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 9 Apr 2020 06:22:13 GMT Subject: [Integrated] RFR: forge: use correct endpoint for GitLab branches In-Reply-To: References: Message-ID: <3383ca8d-8d4f-4a35-b58e-221273f12605@openjdk.org> Changeset: 6b271460 Author: Erik Helin Date: 2020-04-09 06:22:01 +0000 URL: https://git.openjdk.java.net/skara/commit/6b271460 forge: use correct endpoint for GitLab branches Reviewed-by: rwestberg ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java From rwestberg at openjdk.java.net Thu Apr 9 07:20:36 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 9 Apr 2020 07:20:36 GMT Subject: git: openjdk/skara: Fix GitLab source_project_id api call Message-ID: <212da11d-b582-41b8-abe1-dc61c7674023@openjdk.org> Changeset: e922c1df Author: Robin Westberg Date: 2020-04-09 07:20:21 +0000 URL: https://git.openjdk.java.net/skara/commit/e922c1df Fix GitLab source_project_id api call Reviewed-by: ehelin ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabMergeRequest.java From rwestberg at openjdk.java.net Thu Apr 9 07:26:03 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 9 Apr 2020 07:26:03 GMT Subject: FYI: Fix GitLab source_project_id api call Message-ID: Hi all, Please review this small change that fixes a GitLab specific API call. Best regards, Robin ------------- Commit messages: - Fix source_project_id api call Changes: https://git.openjdk.java.net/skara/pull/573/files Webrev: https://webrevs.openjdk.java.net/skara/573/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/573.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/573/head:pull/573 PR: https://git.openjdk.java.net/skara/pull/573 From ehelin at openjdk.java.net Thu Apr 9 07:26:03 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 9 Apr 2020 07:26:03 GMT Subject: FYI: Fix GitLab source_project_id api call In-Reply-To: References: Message-ID: On Thu, 9 Apr 2020 07:18:42 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that fixes a GitLab specific API call. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/573 From ehelin at openjdk.java.net Thu Apr 9 08:03:35 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 9 Apr 2020 08:03:35 GMT Subject: git: openjdk/skara: forge: support project id for GitLab repos Message-ID: <4947181d-cd84-4190-a697-7f55e1fede97@openjdk.org> Changeset: f5b20e32 Author: Erik Helin Date: 2020-04-09 08:03:23 +0000 URL: https://git.openjdk.java.net/skara/commit/f5b20e32 forge: support project id for GitLab repos Reviewed-by: rwestberg ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabHost.java ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabMergeRequest.java ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java From ehelin at openjdk.java.net Thu Apr 9 08:06:05 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 9 Apr 2020 08:06:05 GMT Subject: RFR: forge: support project id for GitLab repos Message-ID: Hi all, please review this patch that makes `GitLabRepository` work with project id:s as well as project names. I had to make a few changes to the `GitLabRepository` constructor and add a new `getProjectInfo` overload to `GitLabHost`. Testing: - `make test` on Linux x64 Thanks, Erik ------------- Commit messages: - forge: support project id for GitLab repos Changes: https://git.openjdk.java.net/skara/pull/574/files Webrev: https://webrevs.openjdk.java.net/skara/574/webrev.00 Stats: 17 lines in 3 files changed: 14 ins; 1 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/574.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/574/head:pull/574 PR: https://git.openjdk.java.net/skara/pull/574 From rwestberg at openjdk.java.net Thu Apr 9 08:06:05 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 9 Apr 2020 08:06:05 GMT Subject: RFR: forge: support project id for GitLab repos In-Reply-To: References: Message-ID: On Thu, 9 Apr 2020 07:58:58 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `GitLabRepository` work with project id:s as > well as project names. I had to make a few changes to the `GitLabRepository` > constructor and add a new `getProjectInfo` overload to `GitLabHost`. > > Testing: > - `make test` on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/574 From jlahoda at openjdk.java.net Thu Apr 9 09:51:31 2020 From: jlahoda at openjdk.java.net (Jan Lahoda) Date: Thu, 9 Apr 2020 09:51:31 GMT Subject: RFR: Accept trailing slash in URIs for git fork. Message-ID: Consider a command like this: $ git fork https://github.com/openjdk/skara/ This fails with a fairly cryptic error: Apr 09, 2020 11:39:44 AM org.openjdk.skara.network.RestRequest transformBadResponse WARNING: org.openjdk.skara.network.RestRequest$QueryBuilder at 2a17b7b6 Apr 09, 2020 11:39:44 AM org.openjdk.skara.network.RestRequest transformBadResponse WARNING: {"message":"Not Found","documentation_url":"https://developer.github.com/v3"} Exception in thread "main" java.lang.RuntimeException: Request returned bad status: 404 at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest.transformBadResponse(RestRequest.java:285) at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest.execute(RestRequest.java:325) at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest$QueryBuilder.execute(RestRequest.java:156) at org.openjdk.skara.forge/org.openjdk.skara.forge.github.GitHubRepository.fork(GitHubRepository.java:231) at org.openjdk.skara.cli/org.openjdk.skara.cli.GitFork.main(GitFork.java:278) at org.openjdk.skara.cli/org.openjdk.skara.cli.GitSkara.main(GitSkara.java:186) The cause is the trailing '/', which is normally accepted when accessing the repository through a web browser, or when cloning the repository. This patch changes the git fork to also accept trailing slashes, by removing them before the GitHubRepository repository instance is created. It is not quite clear if this should be solved at some other level, but felt like a better approach to keep the APIs clean (i.e. just plain repository names), and do normalization in the UI tools. ------------- Commit messages: - Accept trailing slash in URIs for git fork. Changes: https://git.openjdk.java.net/skara/pull/575/files Webrev: https://webrevs.openjdk.java.net/skara/575/webrev.00 Stats: 8 lines in 1 file changed: 7 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/575.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/575/head:pull/575 PR: https://git.openjdk.java.net/skara/pull/575 From rwestberg at openjdk.java.net Thu Apr 9 14:36:23 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 9 Apr 2020 14:36:23 GMT Subject: RFR: Use proper value for GitLab PR state Message-ID: Hi all, Please review this change that properly parses the state of a GitLab PR. Best regards, Robin ------------- Commit messages: - Use proper value for GitLab PR state Changes: https://git.openjdk.java.net/skara/pull/576/files Webrev: https://webrevs.openjdk.java.net/skara/576/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/576.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/576/head:pull/576 PR: https://git.openjdk.java.net/skara/pull/576 From duke at openjdk.java.net Thu Apr 9 14:36:24 2020 From: duke at openjdk.java.net (J.Duke) Date: Thu, 9 Apr 2020 14:36:24 GMT Subject: RFR: Use proper value for GitLab PR state In-Reply-To: References: Message-ID: On Thu, 9 Apr 2020 14:29:16 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that properly parses the state of a GitLab PR. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by duke (no project role). PR: https://git.openjdk.java.net/skara/pull/576 From ehelin at openjdk.java.net Thu Apr 9 14:57:00 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 9 Apr 2020 14:57:00 GMT Subject: RFR: Use proper value for GitLab PR state In-Reply-To: References: Message-ID: On Thu, 9 Apr 2020 14:29:16 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that properly parses the state of a GitLab PR. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/576 From rwestberg at openjdk.java.net Tue Apr 14 04:22:34 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 14 Apr 2020 04:22:34 GMT Subject: [Integrated] RFR: Use proper value for GitLab PR state In-Reply-To: References: Message-ID: <26dc92fb-a361-4cec-a2b4-ddc236eb72c6@openjdk.org> Changeset: ea3bc918 Author: Robin Westberg Date: 2020-04-14 04:22:19 +0000 URL: https://git.openjdk.java.net/skara/commit/ea3bc918 Use proper value for GitLab PR state Reviewed-by: duke, ehelin ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabMergeRequest.java From magnus.ihse.bursie at oracle.com Tue Apr 14 07:48:37 2020 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Tue, 14 Apr 2020 09:48:37 +0200 Subject: Duke as a reviewer (was: RFR: Use proper value for GitLab PR state) In-Reply-To: References: Message-ID: I'm a bit curious -- how come our Duke is now reviewing PRs? Is this the result of some bot verifying the patch? Or just a mistake due to someone logged in with the wrong account? /Magnus On 2020-04-09 16:36, J.Duke wrote: > On Thu, 9 Apr 2020 14:29:16 GMT, Robin Westberg wrote: > >> Hi all, >> >> Please review this change that properly parses the state of a GitLab PR. >> >> Best regards, >> Robin > Looks good! > > ------------- > > Marked as reviewed by duke (no project role). > > PR: https://git.openjdk.java.net/skara/pull/576 From magnus.ihse.bursie at oracle.com Tue Apr 14 07:58:15 2020 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Tue, 14 Apr 2020 09:58:15 +0200 Subject: Email subject line formatting In-Reply-To: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> References: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> Message-ID: On 2020-04-07 01:21, David Holmes wrote: > Hi everyone, > > Erik asked me to raise this here to see if anyone else is bothered by > this ... > > When an integration email is sent the subject line of the RFR thread > is augmented with [integrated] and also adorned with "Re:" as if a > reply to the RFR thread e.g. > > Re: [Integrated] [foreign-abi] RFR: Revert "JDK-8242127: reorganize > ABI-dependent layout constants" > > My objection to this is that once the subject has been augmented with > [Integrated] it is not appropriate to treat that as a "reply" and use > the "Re:". If I see: > > [Integrated] [foreign-abi] RFR: Revert "JDK-8242127: reorganize > ABI-dependent layout constants" > > I know its a changeset notification email and I can ignore it. Just as > I can ignore: > > git: openjdk/panama-foreign: foreign-jextract: 2 new changesets > > or > > hg: jdk/jdk: 8242217: Shenandoah: Enable GC mode to be > diagnostic/experimental and have a name > > but when I see the "Re:" I think "oh someone is commenting on that > push, there must be an issue and I should read the email" - which is > the case with current hg notification emails! I agree, I react the same way. I think the problem is two-fold. First of all, the traditional way of adding "Re:" assumes that the subject following "Re:" is untouched. If you rewrite the subject, you are supposed to not add "Re:". (And if you rewrite the subject, it is polite to keep the old one as "was:" instead.) Secondly, with the hg reports, wwe have been conditioned to be on the lookout for "Re: hg: ..." mails, since they indicated that someone had commented on a checkin, and that you should just not skip it. I've found myself over and over again clicking on those mails, thinking that they include something important. While the latter one is perhaps mostly about habits and processes we are used to, I still think the current subjects are odd, and that we can probably find something better, that does not go against netiquette and old-time OpenJDKers habits. :-) Perhaps Jon is onto something that we should be more aggressive in how the subject line is rewritten. When a change is actually integrated, it is technically no longer a "RFR", so maybe rewrite to "Integrate: Bug description ..." instead? As long as the In-Reply-To mail header is correct, mail software should get the threading right regardless of subject. /Magnus > > This would be less of an issue if the sender of the integration email > was a bot account but it isn't, it is the committer. > > So I'd like to suggest that the "Re:" be dropped from the subject line > of these automatically generated integration emails. > > Cheers, > David From erik.helin at oracle.com Tue Apr 14 08:09:34 2020 From: erik.helin at oracle.com (Erik Helin) Date: Tue, 14 Apr 2020 10:09:34 +0200 Subject: Duke as a reviewer In-Reply-To: References: Message-ID: On 4/14/20 9:48 AM, Magnus Ihse Bursie wrote: > I'm a bit curious -- how come our Duke is now reviewing PRs? Is this the > result of some bot verifying the patch? Or just a mistake due to someone > logged in with the wrong account? Haha, that was me by mistake using the bot account when looking at a PR :) Thanks, Erik > /Magnus > > On 2020-04-09 16:36, J.Duke wrote: >> On Thu, 9 Apr 2020 14:29:16 GMT, Robin Westberg >> wrote: >> >>> Hi all, >>> >>> Please review this change that properly parses the state of a GitLab PR. >>> >>> Best regards, >>> Robin >> Looks good! >> >> ------------- >> >> Marked as reviewed by duke (no project role). >> >> PR: https://git.openjdk.java.net/skara/pull/576 > From magnus.ihse.bursie at oracle.com Tue Apr 14 08:18:20 2020 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Tue, 14 Apr 2020 10:18:20 +0200 Subject: Email subject line formatting In-Reply-To: References: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> Message-ID: On 2020-04-14 09:58, Magnus Ihse Bursie wrote: > > > On 2020-04-07 01:21, David Holmes wrote: >> Hi everyone, >> >> Erik asked me to raise this here to see if anyone else is bothered by >> this ... >> >> When an integration email is sent the subject line of the RFR thread >> is augmented with [integrated] and also adorned with "Re:" as if a >> reply to the RFR thread e.g. >> >> Re: [Integrated] [foreign-abi] RFR: Revert "JDK-8242127: reorganize >> ABI-dependent layout constants" >> >> My objection to this is that once the subject has been augmented with >> [Integrated] it is not appropriate to treat that as a "reply" and use >> the "Re:". If I see: >> >> [Integrated] [foreign-abi] RFR: Revert "JDK-8242127: reorganize >> ABI-dependent layout constants" >> >> I know its a changeset notification email and I can ignore it. Just >> as I can ignore: >> >> git: openjdk/panama-foreign: foreign-jextract: 2 new changesets >> >> or >> >> hg: jdk/jdk: 8242217: Shenandoah: Enable GC mode to be >> diagnostic/experimental and have a name >> >> but when I see the "Re:" I think "oh someone is commenting on that >> push, there must be an issue and I should read the email" - which is >> the case with current hg notification emails! > > I agree, I react the same way. I think the problem is two-fold. First > of all, the traditional way of adding "Re:" assumes that the subject > following "Re:" is untouched. If you rewrite the subject, you are > supposed to not add "Re:". (And if you rewrite the subject, it is > polite to keep the old one as "was:" instead.) > > Secondly, with the hg reports, wwe have been conditioned to be on the > lookout for "Re: hg: ..." mails, since they indicated that someone had > commented on a checkin, and that you should just not skip it. I've > found myself over and over again clicking on those mails, thinking > that they include something important. > > While the latter one is perhaps mostly about habits and processes we > are used to, I still think the current subjects are odd, and that we > can probably find something better, that does not go against > netiquette and old-time OpenJDKers habits. :-) > > Perhaps Jon is onto something that we should be more aggressive in how > the subject line is rewritten. When a change is actually integrated, > it is technically no longer a "RFR", so maybe rewrite to "Integrate: > Bug description ..." instead? As long as the In-Reply-To mail header > is correct, mail software should get the threading right regardless of > subject. I also realise that on projects where a commit can be pushed without a review, the commit message is sent out as "FYI: Bug description...". This has also confused me, since it sounded like someone wanted to inform me about something, and not an auto-generated commit mail. Using "Integrated: Bug description..." would be beneficial here as well, I think. /Magnus > > /Magnus >> >> This would be less of an issue if the sender of the integration email >> was a bot account but it isn't, it is the committer. >> >> So I'd like to suggest that the "Re:" be dropped from the subject >> line of these automatically generated integration emails. >> >> Cheers, >> David > From ehelin at openjdk.java.net Tue Apr 14 09:33:31 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 14 Apr 2020 09:33:31 GMT Subject: RFR: Accept trailing slash in URIs for git fork. In-Reply-To: References: Message-ID: On Tue, 14 Apr 2020 09:29:07 GMT, Erik Helin wrote: >> Consider a command like this: >> $ git fork https://github.com/openjdk/skara/ >> >> This fails with a fairly cryptic error: >> Apr 09, 2020 11:39:44 AM org.openjdk.skara.network.RestRequest transformBadResponse >> WARNING: org.openjdk.skara.network.RestRequest$QueryBuilder at 2a17b7b6 >> Apr 09, 2020 11:39:44 AM org.openjdk.skara.network.RestRequest transformBadResponse >> WARNING: {"message":"Not Found","documentation_url":"https://developer.github.com/v3"} >> Exception in thread "main" java.lang.RuntimeException: Request returned bad status: 404 >> at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest.transformBadResponse(RestRequest.java:285) >> at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest.execute(RestRequest.java:325) >> at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest$QueryBuilder.execute(RestRequest.java:156) >> at org.openjdk.skara.forge/org.openjdk.skara.forge.github.GitHubRepository.fork(GitHubRepository.java:231) >> at org.openjdk.skara.cli/org.openjdk.skara.cli.GitFork.main(GitFork.java:278) >> at org.openjdk.skara.cli/org.openjdk.skara.cli.GitSkara.main(GitSkara.java:186) >> >> The cause is the trailing '/', which is normally accepted when accessing the repository through a web browser, or when >> cloning the repository. This patch changes the git fork to also accept trailing slashes, by removing them before the >> GitHubRepository repository instance is created. It is not quite clear if this should be solved at some other level, >> but felt like a better approach to keep the APIs clean (i.e. just plain repository names), and do normalization in the >> UI tools. > > Looks good! Hi Jan, thanks for contributing! Just a super minor nit before you integrate this pull request, could you remove the "." (period) in the title? In general we don't end pull request titles with a period, similar to how we in JBS don't end bug titles with a period. Thanks! Erik ------------- PR: https://git.openjdk.java.net/skara/pull/575 From ehelin at openjdk.java.net Tue Apr 14 09:33:30 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 14 Apr 2020 09:33:30 GMT Subject: RFR: Accept trailing slash in URIs for git fork. In-Reply-To: References: Message-ID: On Thu, 9 Apr 2020 09:45:14 GMT, Jan Lahoda wrote: > Consider a command like this: > $ git fork https://github.com/openjdk/skara/ > > This fails with a fairly cryptic error: > Apr 09, 2020 11:39:44 AM org.openjdk.skara.network.RestRequest transformBadResponse > WARNING: org.openjdk.skara.network.RestRequest$QueryBuilder at 2a17b7b6 > Apr 09, 2020 11:39:44 AM org.openjdk.skara.network.RestRequest transformBadResponse > WARNING: {"message":"Not Found","documentation_url":"https://developer.github.com/v3"} > Exception in thread "main" java.lang.RuntimeException: Request returned bad status: 404 > at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest.transformBadResponse(RestRequest.java:285) > at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest.execute(RestRequest.java:325) > at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest$QueryBuilder.execute(RestRequest.java:156) > at org.openjdk.skara.forge/org.openjdk.skara.forge.github.GitHubRepository.fork(GitHubRepository.java:231) > at org.openjdk.skara.cli/org.openjdk.skara.cli.GitFork.main(GitFork.java:278) > at org.openjdk.skara.cli/org.openjdk.skara.cli.GitSkara.main(GitSkara.java:186) > > The cause is the trailing '/', which is normally accepted when accessing the repository through a web browser, or when > cloning the repository. This patch changes the git fork to also accept trailing slashes, by removing them before the > GitHubRepository repository instance is created. It is not quite clear if this should be solved at some other level, > but felt like a better approach to keep the APIs clean (i.e. just plain repository names), and do normalization in the > UI tools. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/575 From rwestberg at openjdk.java.net Tue Apr 14 09:41:38 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 14 Apr 2020 09:41:38 GMT Subject: RFR: 357: Mismatch between PR body and RFR email Message-ID: <_pVtaJ6FpZghG3UnN-6_GBmFp4hRkFkM4yJ1Xm9d6QM=.05467103-e761-4015-894b-4c0fe6b7dce0@github.com> Hi all, Please review this change that fixes a problem with overflowing list items into the next line. Best regards, Robin ------------- Commit messages: - Only fill following indents if they are the same both filtered and non-filtered - Add testcase Changes: https://git.openjdk.java.net/skara/pull/577/files Webrev: https://webrevs.openjdk.java.net/skara/577/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-357 Stats: 21 lines in 2 files changed: 20 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/577.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/577/head:pull/577 PR: https://git.openjdk.java.net/skara/pull/577 From jlahoda at openjdk.java.net Tue Apr 14 09:51:18 2020 From: jlahoda at openjdk.java.net (Jan Lahoda) Date: Tue, 14 Apr 2020 09:51:18 GMT Subject: [Rev 01] RFR: Accept trailing slash in URIs for git fork In-Reply-To: References: Message-ID: > Consider a command like this: > $ git fork https://github.com/openjdk/skara/ > > This fails with a fairly cryptic error: > Apr 09, 2020 11:39:44 AM org.openjdk.skara.network.RestRequest transformBadResponse > WARNING: org.openjdk.skara.network.RestRequest$QueryBuilder at 2a17b7b6 > Apr 09, 2020 11:39:44 AM org.openjdk.skara.network.RestRequest transformBadResponse > WARNING: {"message":"Not Found","documentation_url":"https://developer.github.com/v3"} > Exception in thread "main" java.lang.RuntimeException: Request returned bad status: 404 > at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest.transformBadResponse(RestRequest.java:285) > at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest.execute(RestRequest.java:325) > at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest$QueryBuilder.execute(RestRequest.java:156) > at org.openjdk.skara.forge/org.openjdk.skara.forge.github.GitHubRepository.fork(GitHubRepository.java:231) > at org.openjdk.skara.cli/org.openjdk.skara.cli.GitFork.main(GitFork.java:278) > at org.openjdk.skara.cli/org.openjdk.skara.cli.GitSkara.main(GitSkara.java:186) > > The cause is the trailing '/', which is normally accepted when accessing the repository through a web browser, or when > cloning the repository. This patch changes the git fork to also accept trailing slashes, by removing them before the > GitHubRepository repository instance is created. It is not quite clear if this should be solved at some other level, > but felt like a better approach to keep the APIs clean (i.e. just plain repository names), and do normalization in the > UI tools. Jan Lahoda has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains one commit: Accept trailing slash in URIs for git fork ------------- Changes: https://git.openjdk.java.net/skara/pull/575/files Webrev: https://webrevs.openjdk.java.net/skara/575/webrev.01 Stats: 8 lines in 1 file changed: 7 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/575.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/575/head:pull/575 PR: https://git.openjdk.java.net/skara/pull/575 From ehelin at openjdk.java.net Tue Apr 14 10:00:40 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 14 Apr 2020 10:00:40 GMT Subject: RFR: 357: Mismatch between PR body and RFR email In-Reply-To: <_pVtaJ6FpZghG3UnN-6_GBmFp4hRkFkM4yJ1Xm9d6QM=.05467103-e761-4015-894b-4c0fe6b7dce0@github.com> References: <_pVtaJ6FpZghG3UnN-6_GBmFp4hRkFkM4yJ1Xm9d6QM=.05467103-e761-4015-894b-4c0fe6b7dce0@github.com> Message-ID: On Tue, 14 Apr 2020 09:26:28 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that fixes a problem with overflowing list items into the next line. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/577 From rwestberg at openjdk.java.net Tue Apr 14 10:09:12 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 14 Apr 2020 10:09:12 GMT Subject: [Integrated] RFR: 357: Mismatch between PR body and RFR email In-Reply-To: <_pVtaJ6FpZghG3UnN-6_GBmFp4hRkFkM4yJ1Xm9d6QM=.05467103-e761-4015-894b-4c0fe6b7dce0@github.com> References: <_pVtaJ6FpZghG3UnN-6_GBmFp4hRkFkM4yJ1Xm9d6QM=.05467103-e761-4015-894b-4c0fe6b7dce0@github.com> Message-ID: <05a802d7-1e2a-4a38-ba34-d214f1905b66@openjdk.org> Changeset: d6d97767 Author: Robin Westberg Date: 2020-04-14 10:09:00 +0000 URL: https://git.openjdk.java.net/skara/commit/d6d97767 357: Mismatch between PR body and RFR email Reviewed-by: ehelin ! email/src/main/java/org/openjdk/skara/email/WordWrap.java ! email/src/test/java/org/openjdk/skara/email/WordWrapTests.java From ehelin at openjdk.java.net Tue Apr 14 11:47:22 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 14 Apr 2020 11:47:22 GMT Subject: [Integrated] RFR: Accept trailing slash in URIs for git fork. In-Reply-To: References: Message-ID: <0f40a75c-be76-4b2b-9126-cc6ea493c533@openjdk.org> Changeset: 444f61c3 Author: Jan Lahoda Committer: Erik Helin Date: 2020-04-14 11:47:05 +0000 URL: https://git.openjdk.java.net/skara/commit/444f61c3 Accept trailing slash in URIs for git fork Reviewed-by: ehelin ! cli/src/main/java/org/openjdk/skara/cli/GitFork.java From mark.reinhold at oracle.com Tue Apr 14 18:32:34 2020 From: mark.reinhold at oracle.com (mark.reinhold at oracle.com) Date: Tue, 14 Apr 2020 11:32:34 -0700 Subject: Email subject line formatting In-Reply-To: References: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> Message-ID: <20200414113234.9902763@eggemoggin.niobe.net> 2020/4/14 1:18:20 -0700, magnus.ihse.bursie at oracle.com: > On 2020-04-14 09:58, Magnus Ihse Bursie wrote: > ... >> >> Perhaps Jon is onto something that we should be more aggressive in how >> the subject line is rewritten. When a change is actually integrated, >> it is technically no longer a "RFR", so maybe rewrite to "Integrate: >> Bug description ..." instead? As long as the In-Reply-To mail header >> is correct, mail software should get the threading right regardless of >> subject. That would be preferable. > I also realise that on projects where a commit can be pushed without a > review, the commit message is sent out as "FYI: Bug description...". > This has also confused me, since it sounded like someone wanted to > inform me about something, and not an auto-generated commit mail. Using > "Integrated: Bug description..." would be beneficial here as well, I think. Is that always the case? Or is there still the option (per-project, I?d assume) to get the traditional ?git: jdk/jdk: 87654321: ...? style of message for commits that are not formally reviewed? - Mark From ehelin at openjdk.java.net Wed Apr 15 09:09:22 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 15 Apr 2020 09:09:22 GMT Subject: git: openjdk/skara: merge-bot: use commitMetadata when listing commits Message-ID: <4487b51b-4ba6-41c6-9918-a7049bafebeb@openjdk.org> Changeset: 0a71dcf3 Author: Erik Helin Date: 2020-04-15 09:09:08 +0000 URL: https://git.openjdk.java.net/skara/commit/0a71dcf3 merge-bot: use commitMetadata when listing commits Reviewed-by: rwestberg ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java From rwestberg at openjdk.java.net Wed Apr 15 09:11:35 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Apr 2020 09:11:35 GMT Subject: RFR: merge-bot: use commitMetadata when listing commits In-Reply-To: References: Message-ID: On Wed, 15 Apr 2020 09:01:21 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the automatic merge bot use `commitMetadata` > instead of `commits` to speed up listing of large commit ranges. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good, just one minor comment! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java line 466: > 465: > 466: var commits = repo.commitMetadata(mergeBase.hex() + ".." + fetchHead.hex(), true); > 467: var numCommits = commits.size(); Use the overloaded range syntax instead of manual ".."? ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/578 From ehelin at openjdk.java.net Wed Apr 15 09:11:34 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 15 Apr 2020 09:11:34 GMT Subject: RFR: merge-bot: use commitMetadata when listing commits Message-ID: Hi all, please review this patch that makes the automatic merge bot use `commitMetadata` instead of `commits` to speed up listing of large commit ranges. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - merge-bot: use commitMetadata when listing commits Changes: https://git.openjdk.java.net/skara/pull/578/files Webrev: https://webrevs.openjdk.java.net/skara/578/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/578.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/578/head:pull/578 PR: https://git.openjdk.java.net/skara/pull/578 From ehelin at openjdk.java.net Wed Apr 15 09:31:30 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 15 Apr 2020 09:31:30 GMT Subject: RFR: merge-bot: give each branch a new number as name Message-ID: <_TNwFSZ9rKePEoD0EzDBs2unZUzSf0V2ilU7ZAxjb80=.f3971950-269a-477c-af86-b03f0bfc602b@github.com> Hi all, please review this patch that makes the merge bot always increment its branch names by one. The previous code (mistakenly) used the number of open pull request, but that is not monotonically increasing. Since the merge bot does not delete branches it has created, the number of branches should be monotonically increasing ?? Testing: - `make test` on Linux x64 passes Thanks, Erik ------------- Commit messages: - merge-bot: give each branch a new number as name Changes: https://git.openjdk.java.net/skara/pull/579/files Webrev: https://webrevs.openjdk.java.net/skara/579/webrev.00 Stats: 3 lines in 1 file changed: 2 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/579.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/579/head:pull/579 PR: https://git.openjdk.java.net/skara/pull/579 From rwestberg at openjdk.java.net Wed Apr 15 09:39:40 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Apr 2020 09:39:40 GMT Subject: RFR: merge-bot: give each branch a new number as name In-Reply-To: <_TNwFSZ9rKePEoD0EzDBs2unZUzSf0V2ilU7ZAxjb80=.f3971950-269a-477c-af86-b03f0bfc602b@github.com> References: <_TNwFSZ9rKePEoD0EzDBs2unZUzSf0V2ilU7ZAxjb80=.f3971950-269a-477c-af86-b03f0bfc602b@github.com> Message-ID: On Wed, 15 Apr 2020 09:26:51 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the merge bot always increment its branch > names by one. The previous code (mistakenly) used the number of open pull > request, but that is not monotonically increasing. Since the merge bot does not > delete branches it has created, the number of branches should be monotonically > increasing ?? > > Testing: > - `make test` on Linux x64 passes > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/579 From ehelin at openjdk.java.net Wed Apr 15 09:49:43 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 15 Apr 2020 09:49:43 GMT Subject: [Integrated] RFR: merge-bot: give each branch a new number as name In-Reply-To: <_TNwFSZ9rKePEoD0EzDBs2unZUzSf0V2ilU7ZAxjb80=.f3971950-269a-477c-af86-b03f0bfc602b@github.com> References: <_TNwFSZ9rKePEoD0EzDBs2unZUzSf0V2ilU7ZAxjb80=.f3971950-269a-477c-af86-b03f0bfc602b@github.com> Message-ID: <6f5f5a9c-7d09-45f0-bea0-ed2300d7add0@openjdk.org> Changeset: a5b74922 Author: Erik Helin Date: 2020-04-15 09:49:28 +0000 URL: https://git.openjdk.java.net/skara/commit/a5b74922 merge-bot: give each branch a new number as name Reviewed-by: rwestberg ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java From rwestberg at openjdk.java.net Wed Apr 15 11:17:40 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Apr 2020 11:17:40 GMT Subject: RFR: Failed merge commit message should not throw, but report a failure Message-ID: Hi all, Please review this change that makes sure that a failing "merge" jcheck does not throw, but properly reports an error. Best regards, Robin ------------- Commit messages: - Failed merge commit message should not throw, but report a failure Changes: https://git.openjdk.java.net/skara/pull/580/files Webrev: https://webrevs.openjdk.java.net/skara/580/webrev.00 Stats: 59 lines in 2 files changed: 58 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/580.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/580/head:pull/580 PR: https://git.openjdk.java.net/skara/pull/580 From rwestberg at openjdk.java.net Wed Apr 15 11:23:18 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 15 Apr 2020 11:23:18 GMT Subject: RFR: 360: Always show instructions for atomic integrations Message-ID: Hi all, Please review this change that always shows the option of making an atomic (no automatic rebase) integration. Best regards, Robin ------------- Commit messages: - Always mention the atomic integration option Changes: https://git.openjdk.java.net/skara/pull/581/files Webrev: https://webrevs.openjdk.java.net/skara/581/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-360 Stats: 17 lines in 2 files changed: 11 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/581.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/581/head:pull/581 PR: https://git.openjdk.java.net/skara/pull/581 From manc at google.com Thu Apr 16 01:59:06 2020 From: manc at google.com (Man Cao) Date: Wed, 15 Apr 2020 18:59:06 -0700 Subject: "/covered" command for OCA Message-ID: Hi Skara developers, Thanks for the awesome work of Skara! Our project TSAN has a pending pull request from a contributor from Arm. https://github.com/openjdk/tsan/pull/5 The bridgekeeper bot suggested using the "/covered" command to notify OCA status, and responded "Please allow for a few business days to verify that your employer has signed the OCA". Is it a manual process to verify OCA behind the scene? Are there further steps to follow? Also, I didn't find any description of the "/covered" command on https://wiki.openjdk.java.net/display/SKARA/Pull+Request+Commands. Could add a paragraph for it? -Man From ehelin at openjdk.java.net Thu Apr 16 06:10:39 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 06:10:39 GMT Subject: RFR: 360: Always show instructions for atomic integrations In-Reply-To: References: Message-ID: On Wed, 15 Apr 2020 11:14:39 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that always shows the option of making an atomic (no automatic rebase) integration. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/581 From ehelin at openjdk.java.net Thu Apr 16 06:11:11 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 06:11:11 GMT Subject: RFR: Failed merge commit message should not throw, but report a failure In-Reply-To: References: Message-ID: On Wed, 15 Apr 2020 11:13:16 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that makes sure that a failing "merge" jcheck does not throw, but properly reports an error. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/580 From ehelin at openjdk.java.net Thu Apr 16 06:46:45 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 06:46:45 GMT Subject: RFR: merge-bot: no need to force push Message-ID: Hi all, please review this small patch that makes the merge bot no longer use force pushes. The redesigned merge bot has no need for force pushes, all "from" branches (branches in bot's fork) will have a unique name, so there should never be a conflict when pushing. Testing: - `make test` on Linux x64 Thanks, Erik ------------- Commit messages: - merge-bot: no need to force push Changes: https://git.openjdk.java.net/skara/pull/582/files Webrev: https://webrevs.openjdk.java.net/skara/582/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/582.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/582/head:pull/582 PR: https://git.openjdk.java.net/skara/pull/582 From rwestberg at openjdk.java.net Thu Apr 16 06:55:03 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Apr 2020 06:55:03 GMT Subject: [Integrated] RFR: Failed merge commit message should not throw, but report a failure In-Reply-To: References: Message-ID: <5267c789-8d27-4e4d-8c1b-2586a7b1b67f@openjdk.org> Changeset: 1ba3260b Author: Robin Westberg Date: 2020-04-16 06:54:49 +0000 URL: https://git.openjdk.java.net/skara/commit/1ba3260b Failed merge commit message should not throw, but report a failure Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestCheckIssueVisitor.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java From rwestberg at openjdk.java.net Thu Apr 16 06:55:42 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Apr 2020 06:55:42 GMT Subject: [Integrated] RFR: 360: Always show instructions for atomic integrations In-Reply-To: References: Message-ID: Changeset: f6d9f4e2 Author: Robin Westberg Date: 2020-04-16 06:55:24 +0000 URL: https://git.openjdk.java.net/skara/commit/f6d9f4e2 360: Always show instructions for atomic integrations Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/IntegrateTests.java From rwestberg at openjdk.java.net Thu Apr 16 06:56:09 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Apr 2020 06:56:09 GMT Subject: RFR: merge-bot: no need to force push In-Reply-To: References: Message-ID: On Thu, 16 Apr 2020 06:40:37 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes the merge bot no longer use force > pushes. The redesigned merge bot has no need for force pushes, all "from" > branches (branches in bot's fork) will have a unique name, so there should never > be a conflict when pushing. > > Testing: > - `make test` on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/582 From ehelin at openjdk.java.net Thu Apr 16 07:44:03 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 07:44:03 GMT Subject: [Integrated] RFR: merge-bot: no need to force push In-Reply-To: References: Message-ID: Changeset: fe828df4 Author: Erik Helin Date: 2020-04-16 07:43:44 +0000 URL: https://git.openjdk.java.net/skara/commit/fe828df4 merge-bot: no need to force push Reviewed-by: rwestberg ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java From ehelin at openjdk.java.net Thu Apr 16 09:05:10 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 09:05:10 GMT Subject: RFR: 364: The bots should not fetch tags by default Message-ID: Hi all, please review this patch that makes the bots *not* fetch tags by default. Fetching tags should be an explicit action, not something that happens as a side effect of fetching commits. Testing: - `make test` on Linux x64 Thanks, Erik ------------- Commit messages: - skara-364 Changes: https://git.openjdk.java.net/skara/pull/583/files Webrev: https://webrevs.openjdk.java.net/skara/583/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-364 Stats: 52 lines in 15 files changed: 28 ins; 0 del; 24 mod Patch: https://git.openjdk.java.net/skara/pull/583.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/583/head:pull/583 PR: https://git.openjdk.java.net/skara/pull/583 From rwestberg at openjdk.java.net Thu Apr 16 09:05:10 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Apr 2020 09:05:10 GMT Subject: RFR: 364: The bots should not fetch tags by default In-Reply-To: References: Message-ID: On Thu, 16 Apr 2020 08:51:29 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the bots *not* fetch tags by default. > Fetching tags should be an explicit action, not something that happens as a side > effect of fetching commits. > > Testing: > - `make test` on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/583 From ehelin at openjdk.java.net Thu Apr 16 09:14:02 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 09:14:02 GMT Subject: [Integrated] RFR: 364: The bots should not fetch tags by default In-Reply-To: References: Message-ID: <69e53f8e-d37d-4d3e-bac0-eebb46390d91@openjdk.org> Changeset: 2139bf5f Author: Erik Helin Date: 2020-04-16 09:13:48 +0000 URL: https://git.openjdk.java.net/skara/commit/2139bf5f 364: The bots should not fetch tags by default Reviewed-by: rwestberg ! bots/forward/src/main/java/org/openjdk/skara/bots/forward/ForwardBot.java ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java ! bots/mirror/src/main/java/org/openjdk/skara/bots/mirror/MirrorBot.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/CensusInstance.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/RepositoryWorkItem.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CensusInstance.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java ! bots/submit/src/main/java/org/openjdk/skara/bots/submit/SubmitBotWorkItem.java ! bots/tester/src/main/java/org/openjdk/skara/bots/tester/TestWorkItem.java ! bots/topological/src/main/java/org/openjdk/skara/bots/topological/TopologicalBot.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 From rwestberg at openjdk.java.net Thu Apr 16 10:23:54 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Apr 2020 10:23:54 GMT Subject: RFR: 362: Only amend merge commits that has the target branch as parent Message-ID: Hi all, Please review this change that avoids performing automatic rebasing of Merge PRs, as that doesn't work correctly in all cases. Best regards, Robin ------------- Commit messages: - Only amend merge commits that has the target branch as parent Changes: https://git.openjdk.java.net/skara/pull/584/files Webrev: https://webrevs.openjdk.java.net/skara/584/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-362 Stats: 25 lines in 3 files changed: 18 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/584.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/584/head:pull/584 PR: https://git.openjdk.java.net/skara/pull/584 From ehelin at openjdk.java.net Thu Apr 16 11:25:41 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 11:25:41 GMT Subject: RFR: 362: Only amend merge commits that has the target branch as parent In-Reply-To: References: Message-ID: <43xu0aOdfWmpCNf541TVaooY9BXK9MYvrAuxuwzzHoc=.b17b27a8-a53e-4297-9285-71696208a6e0@github.com> On Thu, 16 Apr 2020 10:17:20 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that avoids performing automatic rebasing of Merge PRs, as that doesn't work correctly in all > cases. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/584 From ehelin at openjdk.java.net Thu Apr 16 12:05:18 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 12:05:18 GMT Subject: RFR: cli: add git-proxy tool Message-ID: Hi all, please review this patch that adds a small new tool: `git-proxy`. `git-proxy` can be used to set up the `HTTPS_PROXY` and `HTTP_PROXY` environment variables based on either the `http.proxy` configuration setting or the `-c http.proxy=` argument. Finally `git-proxy` will also set up the `GIT_SSH_COMMAND` environment variable to use the `CONNECT` method for tunneling SSH over an HTTP proxy. Testing: - manual testing of `git-proxy` - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - cli: add git-proxy tool Changes: https://git.openjdk.java.net/skara/pull/585/files Webrev: https://webrevs.openjdk.java.net/skara/585/webrev.00 Stats: 158 lines in 3 files changed: 157 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/585.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/585/head:pull/585 PR: https://git.openjdk.java.net/skara/pull/585 From rwestberg at openjdk.java.net Thu Apr 16 12:05:28 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Apr 2020 12:05:28 GMT Subject: RFR: cli: add git-proxy tool In-Reply-To: References: Message-ID: On Thu, 16 Apr 2020 11:57:39 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a small new tool: `git-proxy`. `git-proxy` > can be used to set up the `HTTPS_PROXY` and `HTTP_PROXY` environment > variables based on either the `http.proxy` configuration setting or the `-c > http.proxy=` argument. Finally `git-proxy` will also set up the > `GIT_SSH_COMMAND` environment variable to use the `CONNECT` method for tunneling > SSH over an HTTP proxy. > > Testing: > - manual testing of `git-proxy` > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/585 From ehelin at openjdk.java.net Thu Apr 16 12:21:33 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 12:21:33 GMT Subject: [Integrated] RFR: cli: add git-proxy tool In-Reply-To: References: Message-ID: Changeset: 87aeddea Author: Erik Helin Date: 2020-04-16 12:21:20 +0000 URL: https://git.openjdk.java.net/skara/commit/87aeddea cli: add git-proxy tool Reviewed-by: rwestberg ! cli/build.gradle + cli/src/main/java/org/openjdk/skara/cli/GitProxy.java ! proxy/src/main/java/org/openjdk/skara/proxy/HttpProxy.java From rwestberg at openjdk.java.net Thu Apr 16 12:31:13 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Apr 2020 12:31:13 GMT Subject: [Integrated] RFR: 362: Only amend merge commits that has the target branch as parent In-Reply-To: References: Message-ID: <74ba3a07-1bfb-4fa2-8990-37b113905ab0@openjdk.org> Changeset: fed35009 Author: Robin Westberg Date: 2020-04-16 12:31:00 +0000 URL: https://git.openjdk.java.net/skara/commit/fed35009 362: Only amend merge commits that has the target branch as parent 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/PullRequestInstance.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java ! vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java From rwestberg at openjdk.java.net Thu Apr 16 12:35:18 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Apr 2020 12:35:18 GMT Subject: [Rev 01] RFR: 362: Only amend merge commits that has the target branch as parent In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that avoids performing automatic rebasing of Merge PRs, as that doesn't work correctly in all > cases. > Best regards, > Robin Robin Westberg has updated the pull request incrementally with two additional commits since the last revision: - Proper checking of the merge commit as well - Only search for the first merge commit ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/584/files - new: https://git.openjdk.java.net/skara/pull/584/files/b5f320ec..ac1f06e1 Webrevs: - full: https://webrevs.openjdk.java.net/skara/584/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/584/webrev.00-01 Stats: 23 lines in 3 files changed: 8 ins; 4 del; 11 mod Patch: https://git.openjdk.java.net/skara/pull/584.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/584/head:pull/584 PR: https://git.openjdk.java.net/skara/pull/584 From ehelin at openjdk.java.net Thu Apr 16 13:54:12 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 13:54:12 GMT Subject: RFR: build: respect git's http.proxy setting Message-ID: Hi all, please review this small patch that makes the `gradlew` script respect git's `http.proxy` setting. Testing: - Manual testing of `sh gradlew` Thanks, Erik ------------- Commit messages: - build: respect git's http.proxy setting Changes: https://git.openjdk.java.net/skara/pull/586/files Webrev: https://webrevs.openjdk.java.net/skara/586/webrev.00 Stats: 11 lines in 1 file changed: 11 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/586.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/586/head:pull/586 PR: https://git.openjdk.java.net/skara/pull/586 From ehelin at openjdk.java.net Thu Apr 16 14:50:22 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 14:50:22 GMT Subject: RFR: skara: add aliases for publish and proxy Message-ID: Hi all, please review this small patch that aliases for `git-publish` and `git-proxy` to `skara.gitconfig`. Testing: - Manual testing of `git publish` and `git proxy` Thanks, Erik ------------- Commit messages: - skara: add aliases for publish and proxy Changes: https://git.openjdk.java.net/skara/pull/587/files Webrev: https://webrevs.openjdk.java.net/skara/587/webrev.00 Stats: 5 lines in 2 files changed: 3 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/587.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/587/head:pull/587 PR: https://git.openjdk.java.net/skara/pull/587 From dalibor.topic at oracle.com Thu Apr 16 14:59:39 2020 From: dalibor.topic at oracle.com (Dalibor Topic) Date: Thu, 16 Apr 2020 16:59:39 +0200 Subject: "/covered" command for OCA In-Reply-To: References: Message-ID: <887af6d9-dbc8-aa8d-ad6b-2b8e50a98227@oracle.com> Hi Man, On 16.04.2020 03:59, Man Cao wrote: > Is it a manual process to verify OCA behind the scene? For /covered, typically there is a manual component in the process. > Are there further > steps to follow? No, that's fine. We take it from there. cheers, dalibor topic -- Dalibor Topic Consulting Product Manager Phone: +494089091214 , Mobile: +491737185961 , Video: dalibor.topic at oracle.com Oracle Global Services Germany GmbH Hauptverwaltung: Riesstr. 25, D-80992 M?nchen Registergericht: Amtsgericht M?nchen, HRB 246209 Gesch?ftsf?hrer: Ralf Herrmann From ehelin at openjdk.java.net Thu Apr 16 15:02:01 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 15:02:01 GMT Subject: [Rev 01] RFR: build: respect git's http.proxy setting In-Reply-To: References: Message-ID: <9g_RJrHK1vcXxKWpayDaOZSoLlt2JUorW1pjX3k4tUk=.41de5611-b2a4-4d9c-b2a1-2ea0fe13a43a@github.com> > Hi all, > > please review this small patch that makes the `gradlew` script respect git's > `http.proxy` setting. > > Testing: > - Manual testing of `sh gradlew` > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Check if git exists ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/586/files - new: https://git.openjdk.java.net/skara/pull/586/files/b7f4bf77..549837f8 Webrevs: - full: https://webrevs.openjdk.java.net/skara/586/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/586/webrev.00-01 Stats: 8 lines in 1 file changed: 2 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/586.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/586/head:pull/586 PR: https://git.openjdk.java.net/skara/pull/586 From rwestberg at openjdk.java.net Thu Apr 16 15:03:30 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Apr 2020 15:03:30 GMT Subject: RFR: skara: add aliases for publish and proxy In-Reply-To: References: Message-ID: On Thu, 16 Apr 2020 14:44:26 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that aliases for `git-publish` and `git-proxy` > to `skara.gitconfig`. > > Testing: > - Manual testing of `git publish` and `git proxy` > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/587 From rwestberg at openjdk.java.net Thu Apr 16 15:03:01 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 16 Apr 2020 15:03:01 GMT Subject: [Rev 01] RFR: build: respect git's http.proxy setting In-Reply-To: <9g_RJrHK1vcXxKWpayDaOZSoLlt2JUorW1pjX3k4tUk=.41de5611-b2a4-4d9c-b2a1-2ea0fe13a43a@github.com> References: <9g_RJrHK1vcXxKWpayDaOZSoLlt2JUorW1pjX3k4tUk=.41de5611-b2a4-4d9c-b2a1-2ea0fe13a43a@github.com> Message-ID: On Thu, 16 Apr 2020 15:02:01 GMT, Erik Helin wrote: >> Hi all, >> >> please review this small patch that makes the `gradlew` script respect git's >> `http.proxy` setting. >> >> Testing: >> - Manual testing of `sh gradlew` >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > Check if git exists Looks good! Actually, looks like it doesn't build. :) ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/586Changes requested by rwestberg (Reviewer). From ehelin at openjdk.java.net Thu Apr 16 15:53:23 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 16 Apr 2020 15:53:23 GMT Subject: [Integrated] RFR: skara: add aliases for publish and proxy In-Reply-To: References: Message-ID: <8bbd9023-5413-42b9-b31b-d12813c3ad71@openjdk.org> Changeset: b60f393c Author: Erik Helin Date: 2020-04-16 15:53:08 +0000 URL: https://git.openjdk.java.net/skara/commit/b60f393c skara: add aliases for publish and proxy Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitSkara.java ! skara.gitconfig From pliden at openjdk.java.net Thu Apr 16 18:24:50 2020 From: pliden at openjdk.java.net (Per =?UTF-8?B?TGlkw6lu?=) Date: Thu, 16 Apr 2020 18:24:50 GMT Subject: RFR: cli: add git-proxy tool In-Reply-To: References: Message-ID: On Thu, 16 Apr 2020 11:57:39 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a small new tool: `git-proxy`. `git-proxy` > can be used to set up the `HTTPS_PROXY` and `HTTP_PROXY` environment > variables based on either the `http.proxy` configuration setting or the `-c > http.proxy=` argument. Finally `git-proxy` will also set up the > `GIT_SSH_COMMAND` environment variable to use the `CONNECT` method for tunneling > SSH over an HTTP proxy. > > Testing: > - manual testing of `git-proxy` > - `make test` passes on Linux x64 > > Thanks, > Erik cli/src/main/java/org/openjdk/skara/cli/GitProxy.java line 58: > 57: } > 58: > 59: public static void main(String[] args) throws IOException, InterruptedException { It looks like both these methods are unused? ------------- PR: https://git.openjdk.java.net/skara/pull/585 From magnus.ihse.bursie at oracle.com Fri Apr 17 06:57:38 2020 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Fri, 17 Apr 2020 08:57:38 +0200 Subject: Email subject line formatting In-Reply-To: <20200414113234.9902763@eggemoggin.niobe.net> References: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> <20200414113234.9902763@eggemoggin.niobe.net> Message-ID: On 2020-04-14 20:32, mark.reinhold at oracle.com wrote: > 2020/4/14 1:18:20 -0700, magnus.ihse.bursie at oracle.com: >> On 2020-04-14 09:58, Magnus Ihse Bursie wrote: >> ... >>> Perhaps Jon is onto something that we should be more aggressive in how >>> the subject line is rewritten. When a change is actually integrated, >>> it is technically no longer a "RFR", so maybe rewrite to "Integrate: >>> Bug description ..." instead? As long as the In-Reply-To mail header >>> is correct, mail software should get the threading right regardless of >>> subject. > That would be preferable. > >> I also realise that on projects where a commit can be pushed without a >> review, the commit message is sent out as "FYI: Bug description...". >> This has also confused me, since it sounded like someone wanted to >> inform me about something, and not an auto-generated commit mail. Using >> "Integrated: Bug description..." would be beneficial here as well, I think. > Is that always the case? Or is there still the option (per-project, > I?d assume) to get the traditional ?git: jdk/jdk: 87654321: ...? style > of message for commits that are not formally reviewed? I don't know. I'm just passively following some of the projects that have migrated, and I started noticing these "FYI" mails some time ago, so I guess it's an option for the project to turn them on or not. Someone in the Skara team is probably better suited to answer that question. /Magnus > > - Mark From erik.helin at oracle.com Fri Apr 17 08:46:33 2020 From: erik.helin at oracle.com (Erik Helin) Date: Fri, 17 Apr 2020 10:46:33 +0200 Subject: Email subject line formatting In-Reply-To: <20200414113234.9902763@eggemoggin.niobe.net> References: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> <20200414113234.9902763@eggemoggin.niobe.net> Message-ID: <70afb55c-7f19-5b55-b33f-ff17099fc907@oracle.com> On 4/14/20 8:32 PM, mark.reinhold at oracle.com wrote: > 2020/4/14 1:18:20 -0700, magnus.ihse.bursie at oracle.com: >> On 2020-04-14 09:58, Magnus Ihse Bursie wrote: >> ... >>> >>> Perhaps Jon is onto something that we should be more aggressive in how >>> the subject line is rewritten. When a change is actually integrated, >>> it is technically no longer a "RFR", so maybe rewrite to "Integrate: >>> Bug description ..." instead? As long as the In-Reply-To mail header >>> is correct, mail software should get the threading right regardless of >>> subject. > > That would be preferable. I asked David to send the e-mail to see if there we could find consensus around the e-mail prefixes, and it seems like we have done just that :) Both me and Robin are personally fine with rewriting the subject line more aggressively, we both use MUAs that thread based on the "In-Reply-To" and "References" headers. I would just like to point out that several MUAs do *not* thread solely on the "In-Reply-To" and "References" headers, the most notable one being the Gmail browser based MUA accessible at https://www.gmail.com. On 4/14/20 8:32 PM, mark.reinhold at oracle.com wrote: >> On 2020-04-14 09:58, Magnus Ihse Bursie wrote: >> I also realise that on projects where a commit can be pushed without a >> review, the commit message is sent out as "FYI: Bug description...". >> This has also confused me, since it sounded like someone wanted to >> inform me about something, and not an auto-generated commit mail. Using >> "Integrated: Bug description..." would be beneficial here as well, I think. > > Is that always the case? Or is there still the option (per-project, > I?d assume) to get the traditional ?git: jdk/jdk: 87654321: ...? style > of message for commits that are not formally reviewed? It seems like there is some confusion here :) Skara features two ways of notifying people following a mailing list that a patch has been integrated: - the "traditional" notification e-mails that Mark refers to above. These e-mails look exactly as their Mercurial counterparts. - a reply to the review thread stating the that the patch now has been integrated. It is the subject line of these e-mails that we have been discussing. This kind of notification e-mail is new with Skara, they have no Mercurial counterpart. The second kind of notification is meant to help maintainers quickly skim a mailing list. With a MUA that threads correctly it is very quick to see whether the patch presented in an "RFR" thread has been integrated or not. An OpenJDK project can choose the kind of e-mail notifications they want to be sent to the project's mailing list. Some projects want both of the above notifications, some projects feel that the reply to the review thread is sufficient. Some projects use separate mailing lists for the traditional notification emails and "RFR" emails, those have opted to use both kind of notifications. Now, what are those e-mails prefixed with "FYI" that Magnus mentioned? We use the "FYI" prefix instead of "RFR" when the bots send an email for a pull request that has already been integrated. Since the bots are polling they might encounter a pull request that was very quickly integrated. This is most likely to happen for OpenJDK projects that do not require reviews, where Committers can integrate their own pull requests as soon as they are created (given that they pass jcheck). Using the prefix "RFR" for this scenario felt wrong, since it is not a request for review (the pull request has already been integrated). We therefore opted for the "FYI" prefix to signal that we are conveying information for something that has already happened. You can compare this situation to one where you pushed a changeset and retroactively send an e-mail with the webrev to a project's mailing list. This is an orthogonal feature to any kind of notification e-mail being sent for the integration. Thanks, Erik From ehelin at openjdk.java.net Fri Apr 17 08:52:50 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 17 Apr 2020 08:52:50 GMT Subject: RFR: cli: add git-proxy tool In-Reply-To: References: Message-ID: On Thu, 16 Apr 2020 18:22:38 GMT, Per Lid?n wrote: >> Hi all, >> >> please review this patch that adds a small new tool: `git-proxy`. `git-proxy` >> can be used to set up the `HTTPS_PROXY` and `HTTP_PROXY` environment >> variables based on either the `http.proxy` configuration setting or the `-c >> http.proxy=` argument. Finally `git-proxy` will also set up the >> `GIT_SSH_COMMAND` environment variable to use the `CONNECT` method for tunneling >> SSH over an HTTP proxy. >> >> Testing: >> - manual testing of `git-proxy` >> - `make test` passes on Linux x64 >> >> Thanks, >> Erik > > cli/src/main/java/org/openjdk/skara/cli/GitProxy.java line 58: > >> 57: } >> 58: >> 59: public static void main(String[] args) throws IOException, InterruptedException { > > It looks like both these methods are unused? Oops, yes ?? They are remnants from a prototype, before I realized I could just utilize the `HttpProxy` class. ------------- PR: https://git.openjdk.java.net/skara/pull/585 From ehelin at openjdk.java.net Fri Apr 17 09:08:14 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 17 Apr 2020 09:08:14 GMT Subject: [Rev 02] RFR: build: respect git's http.proxy setting In-Reply-To: References: Message-ID: > Hi all, > > please review this small patch that makes the `gradlew` script respect git's > `http.proxy` setting. > > Testing: > - Manual testing of `sh gradlew` > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Ignore exit status of `git config` ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/586/files - new: https://git.openjdk.java.net/skara/pull/586/files/549837f8..b3c3dc50 Webrevs: - full: https://webrevs.openjdk.java.net/skara/586/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/586/webrev.01-02 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/586.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/586/head:pull/586 PR: https://git.openjdk.java.net/skara/pull/586 From ehelin at openjdk.java.net Fri Apr 17 09:34:21 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 17 Apr 2020 09:34:21 GMT Subject: [Rev 01] RFR: build: respect git's http.proxy setting In-Reply-To: References: <9g_RJrHK1vcXxKWpayDaOZSoLlt2JUorW1pjX3k4tUk=.41de5611-b2a4-4d9c-b2a1-2ea0fe13a43a@github.com> Message-ID: On Thu, 16 Apr 2020 15:00:47 GMT, Robin Westberg wrote: >> Erik Helin has updated the pull request incrementally with one additional commit since the last revision: >> >> Check if git exists > > Actually, looks like it doesn't build. :) @rwestberg now it builds! ?? ------------- PR: https://git.openjdk.java.net/skara/pull/586 From rwestberg at openjdk.java.net Fri Apr 17 09:38:00 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 17 Apr 2020 09:38:00 GMT Subject: [Rev 02] RFR: build: respect git's http.proxy setting In-Reply-To: References: Message-ID: On Fri, 17 Apr 2020 09:08:14 GMT, Erik Helin wrote: >> Hi all, >> >> please review this small patch that makes the `gradlew` script respect git's >> `http.proxy` setting. >> >> Testing: >> - Manual testing of `sh gradlew` >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > Ignore exit status of `git config` Great! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/586 From ehelin at openjdk.java.net Fri Apr 17 09:43:33 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 17 Apr 2020 09:43:33 GMT Subject: [Integrated] RFR: build: respect git's http.proxy setting In-Reply-To: References: Message-ID: <8c4031d3-f49f-4bdc-af16-0a8b6ba5ab01@openjdk.org> Changeset: ec3635cb Author: Erik Helin Date: 2020-04-17 09:43:20 +0000 URL: https://git.openjdk.java.net/skara/commit/ec3635cb build: respect git's http.proxy setting Reviewed-by: rwestberg ! gradlew From ehelin at openjdk.java.net Fri Apr 17 09:48:31 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 17 Apr 2020 09:48:31 GMT Subject: RFR: proxy: remove dead code Message-ID: Hi all, please review this trivial patch that removes some unused code. Thanks to @pliden for noticing! Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - proxy: remove dead code Changes: https://git.openjdk.java.net/skara/pull/588/files Webrev: https://webrevs.openjdk.java.net/skara/588/webrev.00 Stats: 26 lines in 1 file changed: 0 ins; 26 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/588.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/588/head:pull/588 PR: https://git.openjdk.java.net/skara/pull/588 From pliden at openjdk.java.net Fri Apr 17 09:48:39 2020 From: pliden at openjdk.java.net (Per =?UTF-8?B?TGlkw6lu?=) Date: Fri, 17 Apr 2020 09:48:39 GMT Subject: RFR: proxy: remove dead code In-Reply-To: References: Message-ID: On Fri, 17 Apr 2020 09:42:51 GMT, Erik Helin wrote: > Hi all, > > please review this trivial patch that removes some unused code. Thanks to > @pliden for noticing! > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- PR: https://git.openjdk.java.net/skara/pull/588 From magnus.ihse.bursie at oracle.com Fri Apr 17 09:58:18 2020 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Fri, 17 Apr 2020 11:58:18 +0200 Subject: Email subject line formatting In-Reply-To: <70afb55c-7f19-5b55-b33f-ff17099fc907@oracle.com> References: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> <20200414113234.9902763@eggemoggin.niobe.net> <70afb55c-7f19-5b55-b33f-ff17099fc907@oracle.com> Message-ID: On 2020-04-17 10:46, Erik Helin wrote: > On 4/14/20 8:32 PM, mark.reinhold at oracle.com wrote: >> 2020/4/14 1:18:20 -0700, magnus.ihse.bursie at oracle.com: >>> On 2020-04-14 09:58, Magnus Ihse Bursie wrote: >>> ... >>>> >>>> Perhaps Jon is onto something that we should be more aggressive in how >>>> the subject line is rewritten. When a change is actually integrated, >>>> it is technically no longer a "RFR", so maybe rewrite to "Integrate: >>>> Bug description ..." instead? As long as the In-Reply-To mail header >>>> is correct, mail software should get the threading right regardless of >>>> subject. >> >> That would be preferable. > > I asked David to send the e-mail to see if there we could find > consensus around the e-mail prefixes, and it seems like we have done > just that :) > > Both me and Robin are personally fine with rewriting the subject line > more aggressively, we both use MUAs that thread based on the > "In-Reply-To" and "References" headers. I would just like to point out > that several MUAs do *not* thread solely on the "In-Reply-To" and > "References" headers, the most notable one being the Gmail browser > based MUA accessible at https://www.gmail.com. Well, screw them. They can always use emacs instead. ;-) But seriously, would gmail have problem handling a thread properly if you change the subject to be prefixed "Integrated: JDK-xxx ..." rather than "Re: [integrated] RFR: JDK-xxx ..."? It could be worth testing. If this special case is handled ok, then it's not really an issue if the general threading is borked by gmail. > > On 4/14/20 8:32 PM, mark.reinhold at oracle.com wrote: > >> On 2020-04-14 09:58, Magnus Ihse Bursie wrote: >>> I also realise that on projects where a commit can be pushed without a >>> review, the commit message is sent out as "FYI: Bug description...". >>> This has also confused me, since it sounded like someone wanted to >>> inform me about something, and not an auto-generated commit mail. Using >>> "Integrated: Bug description..." would be beneficial here as well, I >>> think. >> >> Is that always the case?? Or is there still the option (per-project, >> I?d assume) to get the traditional ?git: jdk/jdk: 87654321: ...? style >> of message for commits that are not formally reviewed? > > It seems like there is some confusion here :) Skara features two ways > of notifying people following a mailing list that a patch has been > integrated: > > - the "traditional" notification e-mails that Mark refers to above. > ? These e-mails look exactly as their Mercurial counterparts. > - a reply to the review thread stating the that the patch now has been > ? integrated. It is the subject line of these e-mails that we have been > ? discussing. This kind of notification e-mail is new with Skara, they > ? have no Mercurial counterpart. > > The second kind of notification is meant to help maintainers quickly > skim a mailing list. With a MUA that threads correctly it is very > quick to see whether the patch presented in an "RFR" thread has been > integrated or not. > > An OpenJDK project can choose the kind of e-mail notifications they > want to be sent to the project's mailing list. Some projects want both > of the above notifications, some projects feel that the reply to the > review thread is sufficient. Some projects use separate mailing lists > for the traditional notification emails and "RFR" emails, those have > opted to use both kind of notifications. > > Now, what are those e-mails prefixed with "FYI" that Magnus mentioned? > We use the "FYI" prefix instead of "RFR" when the bots send an email > for a pull request that has already been integrated. Since the bots > are polling they might encounter a pull request that was very quickly > integrated. This is most likely to happen for OpenJDK projects that do > not require reviews, where Committers can integrate their own pull > requests as soon as they are created (given that they pass jcheck). > Using the prefix "RFR" for this scenario felt wrong, since it is not a > request for review (the pull request has already been integrated). We > therefore opted for the "FYI" prefix to signal that we are conveying > information for something that has already happened. You can compare > this situation to one where you pushed a changeset and retroactively > send an e-mail with the webrev to a project's mailing list. This is an > orthogonal feature to any kind of notification e-mail being sent for > the integration. I think their function was understood, and reasonable. I was merely reacting to the choice of the new tag "FYI" here, which to me implicated a general informational message ("FYI: hg.openjdk.java.net is down right now"), rather than a source revision operation. It also struck me that these mails are, in some way, the very same thing as the end result mail of a RFR thread. It's like a RFR but without the request for the reviews. :-) I thought it might make sense to treat both these kinds of mail the same, and use "Integrated:" as prefix for them both. As an added benefit, you would be able to search for "Integrated:" in a project mailbox, and see all integrations, both those that were pushed directly and those that were out for review. This would perhaps mean that the "git:" update mail would not be needed for those projects, since it would just duplicate this information. /Magnus > > Thanks, > Erik From rwestberg at openjdk.java.net Fri Apr 17 09:58:29 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 17 Apr 2020 09:58:29 GMT Subject: RFR: proxy: remove dead code In-Reply-To: References: Message-ID: On Fri, 17 Apr 2020 09:42:51 GMT, Erik Helin wrote: > Hi all, > > please review this trivial patch that removes some unused code. Thanks to > @pliden for noticing! > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good to me too! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/588 From ehelin at openjdk.java.net Fri Apr 17 11:01:23 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 17 Apr 2020 11:01:23 GMT Subject: [Integrated] RFR: proxy: remove dead code In-Reply-To: References: Message-ID: Changeset: 29691254 Author: Erik Helin Date: 2020-04-17 11:01:09 +0000 URL: https://git.openjdk.java.net/skara/commit/29691254 proxy: remove dead code Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitProxy.java From rwestberg at openjdk.java.net Fri Apr 17 15:30:05 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 17 Apr 2020 15:30:05 GMT Subject: RFR: Improve handling of squash and rebase of PRs Message-ID: Hi all, Please review this change that improves how we perform squashing and rebasing before doing the final integration. Instead of using squash / rebase, simply merge the latest state of the target branch. Use the final state (tree) to create the commit, and specify the proper parents. This has the benefit of working for merge PRs as well. Best regards, Robin ------------- Commit messages: - Proper validation of merge sources - Initial implementation Changes: https://git.openjdk.java.net/skara/pull/589/files Webrev: https://webrevs.openjdk.java.net/skara/589/webrev.00 Stats: 437 lines in 12 files changed: 265 ins; 132 del; 40 mod Patch: https://git.openjdk.java.net/skara/pull/589.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/589/head:pull/589 PR: https://git.openjdk.java.net/skara/pull/589 From kcr at openjdk.java.net Fri Apr 17 15:44:39 2020 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Fri, 17 Apr 2020 15:44:39 GMT Subject: RFR: Improve handling of squash and rebase of PRs In-Reply-To: References: Message-ID: <8n7yAXJImhZh6Z08_C0HGoG_mm7d_cYKEKxi3kwXuvs=.fae5fc04-a1d5-4516-8237-17e43c38b839@github.com> On Fri, 17 Apr 2020 15:22:26 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that improves how we perform squashing and rebasing before doing the final integration. > Instead of using squash / rebase, simply merge the latest state of the target branch. Use the final state (tree) to > create the commit, and specify the proper parents. This has the benefit of working for merge PRs as well. Best regards, > Robin I presume that there will be no change in the commit that is produced for non-merge PRs? ------------- PR: https://git.openjdk.java.net/skara/pull/589 From manc at google.com Fri Apr 17 19:36:45 2020 From: manc at google.com (Man Cao) Date: Fri, 17 Apr 2020 12:36:45 -0700 Subject: "/covered" command for OCA In-Reply-To: <887af6d9-dbc8-aa8d-ad6b-2b8e50a98227@oracle.com> References: <887af6d9-dbc8-aa8d-ad6b-2b8e50a98227@oracle.com> Message-ID: Thanks for the answer! -Man On Thu, Apr 16, 2020 at 8:00 AM Dalibor Topic wrote: > Hi Man, > > On 16.04.2020 03:59, Man Cao wrote: > > Is it a manual process to verify OCA behind the scene? > > For /covered, typically there is a manual component in the process. > > > Are there further > > steps to follow? > > No, that's fine. We take it from there. > > cheers, > dalibor topic > -- > Dalibor Topic > Consulting Product Manager > Phone: +494089091214 <+49%2040%2089091214> <+49%2040%2089091214>>, Mobile: +491737185961 <+49%20173%207185961> > >, Video: dalibor.topic at oracle.com > > > Oracle Global Services Germany GmbH > Hauptverwaltung: Riesstr. 25, D-80992 M?nchen > Registergericht: Amtsgericht M?nchen, HRB 246209 > Gesch?ftsf?hrer: Ralf Herrmann > > From rwestberg at openjdk.java.net Mon Apr 20 04:23:20 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 20 Apr 2020 04:23:20 GMT Subject: RFR: Improve handling of squash and rebase of PRs In-Reply-To: <8n7yAXJImhZh6Z08_C0HGoG_mm7d_cYKEKxi3kwXuvs=.fae5fc04-a1d5-4516-8237-17e43c38b839@github.com> References: <8n7yAXJImhZh6Z08_C0HGoG_mm7d_cYKEKxi3kwXuvs=.fae5fc04-a1d5-4516-8237-17e43c38b839@github.com> Message-ID: On Fri, 17 Apr 2020 15:42:33 GMT, Kevin Rushforth wrote: >> Hi all, >> >> Please review this change that improves how we perform squashing and rebasing before doing the final integration. >> Instead of using squash / rebase, simply merge the latest state of the target branch. Use the final state (tree) to >> create the commit, and specify the proper parents. This has the benefit of working for merge PRs as well. Best regards, >> Robin > > I presume that there will be no change in the commit that is produced for non-merge PRs? Certainly, there will be no difference in what is committed, the actual commit object will just be generated more efficiently. ------------- PR: https://git.openjdk.java.net/skara/pull/589 From ehelin at openjdk.java.net Mon Apr 20 06:34:51 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 20 Apr 2020 06:34:51 GMT Subject: RFR: Improve handling of squash and rebase of PRs In-Reply-To: References: Message-ID: On Fri, 17 Apr 2020 15:22:26 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that improves how we perform squashing and rebasing before doing the final integration. > Instead of using squash / rebase, simply merge the latest state of the target branch. Use the final state (tree) to > create the commit, and specify the proper parents. This has the benefit of working for merge PRs as well. Best regards, > Robin Wow @rwestberg, this PR is :partying_face:?? Very nice work to re-use the same logic for both regular squashed + rebased commits _and_ for merge commits ?? ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/589 From rwestberg at openjdk.java.net Mon Apr 20 06:47:02 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 20 Apr 2020 06:47:02 GMT Subject: [Integrated] RFR: Improve handling of squash and rebase of PRs In-Reply-To: References: Message-ID: <9f472273-6506-459e-9227-7ac186936e5a@openjdk.org> Changeset: 15cf5f69 Author: Robin Westberg Date: 2020-04-20 06:46:50 +0000 URL: https://git.openjdk.java.net/skara/commit/15cf5f69 Improve handling of squash and rebase of PRs 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/CheckTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java ! jcheck/src/test/java/org/openjdk/skara/jcheck/TestRepository.java ! vcs/src/main/java/org/openjdk/skara/vcs/ReadOnlyRepository.java ! vcs/src/main/java/org/openjdk/skara/vcs/Repository.java + vcs/src/main/java/org/openjdk/skara/vcs/Tree.java ! vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java ! vcs/src/main/java/org/openjdk/skara/vcs/hg/HgRepository.java From rwestberg at openjdk.java.net Mon Apr 20 09:10:55 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 20 Apr 2020 09:10:55 GMT Subject: RFR: 374: Do not show integration message when PR has merge conflict Message-ID: <-X--C3AQ9Y46jN4HmivOWbpAlTBPa27GVrtQrRGifyA=.1cc993c4-a3ef-45c7-a384-488f7fd9ee9c@github.com> Hi all, Please review this change that waits with posting the integration ready message if a PR has a merge conflict. Best regards, Robin ------------- Commit messages: - Don't say ready for integration if there is a conflict Changes: https://git.openjdk.java.net/skara/pull/590/files Webrev: https://webrevs.openjdk.java.net/skara/590/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-374 Stats: 30 lines in 2 files changed: 0 ins; 10 del; 20 mod Patch: https://git.openjdk.java.net/skara/pull/590.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/590/head:pull/590 PR: https://git.openjdk.java.net/skara/pull/590 From ehelin at openjdk.java.net Mon Apr 20 11:39:01 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 20 Apr 2020 11:39:01 GMT Subject: RFR: 374: Do not show integration message when PR has merge conflict In-Reply-To: <-X--C3AQ9Y46jN4HmivOWbpAlTBPa27GVrtQrRGifyA=.1cc993c4-a3ef-45c7-a384-488f7fd9ee9c@github.com> References: <-X--C3AQ9Y46jN4HmivOWbpAlTBPa27GVrtQrRGifyA=.1cc993c4-a3ef-45c7-a384-488f7fd9ee9c@github.com> Message-ID: <6UucToDb6lB0OQUeHHKQlKE6-OqMl-nAkvb1T92Pi1w=.04066fbe-b7d9-437f-84ce-882055c2b0bc@github.com> On Mon, 20 Apr 2020 09:03:20 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that waits with posting the integration ready message if a PR has a merge conflict. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/590 From rwestberg at openjdk.java.net Mon Apr 20 11:45:07 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 20 Apr 2020 11:45:07 GMT Subject: [Integrated] RFR: 374: Do not show integration message when PR has merge conflict In-Reply-To: <-X--C3AQ9Y46jN4HmivOWbpAlTBPa27GVrtQrRGifyA=.1cc993c4-a3ef-45c7-a384-488f7fd9ee9c@github.com> References: <-X--C3AQ9Y46jN4HmivOWbpAlTBPa27GVrtQrRGifyA=.1cc993c4-a3ef-45c7-a384-488f7fd9ee9c@github.com> Message-ID: Changeset: 7b79f857 Author: Robin Westberg Date: 2020-04-20 11:44:48 +0000 URL: https://git.openjdk.java.net/skara/commit/7b79f857 374: Do not show integration message when PR has merge conflict Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java From rwestberg at openjdk.java.net Tue Apr 21 14:12:00 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 21 Apr 2020 14:12:00 GMT Subject: RFR: 375: Improve Merge PR RFR email Message-ID: Hi all, Please review this change that improves the RFR emails sent out for Merge PRs. Best regards, Robin ------------- Commit messages: - Avoid emitting empty webrevs - Generate merge webrevs from the to-be-final merge commit - Move reusable parts of PullRequestInstance into forge Changes: https://git.openjdk.java.net/skara/pull/591/files Webrev: https://webrevs.openjdk.java.net/skara/591/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-375 Stats: 1059 lines in 14 files changed: 588 ins; 386 del; 85 mod Patch: https://git.openjdk.java.net/skara/pull/591.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/591/head:pull/591 PR: https://git.openjdk.java.net/skara/pull/591 From rwestberg at openjdk.java.net Wed Apr 22 07:46:35 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Apr 2020 07:46:35 GMT Subject: RFR: Fix problem with specifying a single issue with shorthand syntax Message-ID: <8og8qgTAwwAEB3qTrgh8tmKTtiSg11Z9DSsFIYAIhgc=.a6e7b130-8e6f-4376-bd23-42a596c89308@github.com> Hi all, Please review this small change that fixes a problem with specifying a single issue to the `/issues` (or `/solves`) command using the shorthand syntax. Best regards, Robin ------------- Commit messages: - Fix problem with specifying a single issue with shorthand syntax Changes: https://git.openjdk.java.net/skara/pull/592/files Webrev: https://webrevs.openjdk.java.net/skara/592/webrev.00 Stats: 14 lines in 2 files changed: 12 ins; 2 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/592.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/592/head:pull/592 PR: https://git.openjdk.java.net/skara/pull/592 From rwestberg at openjdk.java.net Wed Apr 22 08:35:40 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Apr 2020 08:35:40 GMT Subject: RFR: Python 3 compatibility for mercurial extension Message-ID: Hi all, Please review this change that makes the mercurial extension python 3 compatible. Best regards, Robin ------------- Commit messages: - Python 3 compatibility Changes: https://git.openjdk.java.net/skara/pull/593/files Webrev: https://webrevs.openjdk.java.net/skara/593/webrev.00 Stats: 28 lines in 1 file changed: 0 ins; 0 del; 28 mod Patch: https://git.openjdk.java.net/skara/pull/593.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/593/head:pull/593 PR: https://git.openjdk.java.net/skara/pull/593 From ehelin at openjdk.java.net Wed Apr 22 09:39:16 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 22 Apr 2020 09:39:16 GMT Subject: RFR: Python 3 compatibility for mercurial extension In-Reply-To: References: Message-ID: <1bs1V6N9nzurL9ygpIyPsE8SJOUaX199xhawvI5wXT4=.de086fc4-934d-4e46-9b1c-1919b03da372@github.com> On Wed, 22 Apr 2020 08:28:46 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that makes the mercurial extension python 3 compatible. > > Best regards, > Robin Looks good, thanks for fixing this! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/593 From ehelin at openjdk.java.net Wed Apr 22 09:39:45 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 22 Apr 2020 09:39:45 GMT Subject: RFR: Fix problem with specifying a single issue with shorthand syntax In-Reply-To: <8og8qgTAwwAEB3qTrgh8tmKTtiSg11Z9DSsFIYAIhgc=.a6e7b130-8e6f-4376-bd23-42a596c89308@github.com> References: <8og8qgTAwwAEB3qTrgh8tmKTtiSg11Z9DSsFIYAIhgc=.a6e7b130-8e6f-4376-bd23-42a596c89308@github.com> Message-ID: On Wed, 22 Apr 2020 07:39:08 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that fixes a problem with specifying a single issue to the `/issues` (or `/solves`) > command using the shorthand syntax. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/592 From rwestberg at openjdk.java.net Wed Apr 22 10:08:15 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Apr 2020 10:08:15 GMT Subject: RFR: mirror-bot: use to repo to restrict concurrency In-Reply-To: References: Message-ID: On Wed, 22 Apr 2020 10:00:05 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the mirror bot use the `to` repository for > determining if whether multiple mirror work items can run concurrently. This > means the also must the `to` directory for creating its storage. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/594 From ehelin at openjdk.java.net Wed Apr 22 10:08:15 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 22 Apr 2020 10:08:15 GMT Subject: RFR: mirror-bot: use to repo to restrict concurrency Message-ID: Hi all, please review this patch that makes the mirror bot use the `to` repository for determining if whether multiple mirror work items can run concurrently. This means the also must the `to` directory for creating its storage. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - mirror-bot: use to repo to restrict concurrency Changes: https://git.openjdk.java.net/skara/pull/594/files Webrev: https://webrevs.openjdk.java.net/skara/594/webrev.00 Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/594.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/594/head:pull/594 PR: https://git.openjdk.java.net/skara/pull/594 From ehelin at openjdk.java.net Wed Apr 22 11:24:59 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 22 Apr 2020 11:24:59 GMT Subject: [Integrated] RFR: mirror-bot: use to repo to restrict concurrency In-Reply-To: References: Message-ID: Changeset: 65cf0c47 Author: Erik Helin Date: 2020-04-22 11:24:44 +0000 URL: https://git.openjdk.java.net/skara/commit/65cf0c47 mirror-bot: use to repo to restrict concurrency Reviewed-by: rwestberg ! bots/mirror/src/main/java/org/openjdk/skara/bots/mirror/MirrorBot.java From rwestberg at openjdk.java.net Wed Apr 22 11:26:59 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Apr 2020 11:26:59 GMT Subject: [Integrated] RFR: Fix problem with specifying a single issue with shorthand syntax In-Reply-To: <8og8qgTAwwAEB3qTrgh8tmKTtiSg11Z9DSsFIYAIhgc=.a6e7b130-8e6f-4376-bd23-42a596c89308@github.com> References: <8og8qgTAwwAEB3qTrgh8tmKTtiSg11Z9DSsFIYAIhgc=.a6e7b130-8e6f-4376-bd23-42a596c89308@github.com> Message-ID: <81ab82af-bd5b-4d27-9930-dbaaa0da02a2@openjdk.org> Changeset: ef0c6f6c Author: Robin Westberg Date: 2020-04-22 11:26:39 +0000 URL: https://git.openjdk.java.net/skara/commit/ef0c6f6c Fix problem with specifying a single issue with shorthand syntax Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/IssueCommand.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/IssueTests.java From rwestberg at openjdk.java.net Wed Apr 22 13:31:54 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Apr 2020 13:31:54 GMT Subject: [Rev 01] RFR: 375: Improve Merge PR RFR email In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that improves the RFR emails sent out for Merge PRs. > > Best regards, > Robin Robin Westberg has updated the pull request incrementally with two additional commits since the last revision: - Rename to PullRequestUtils - Make PullRequestInstance simpler ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/591/files - new: https://git.openjdk.java.net/skara/pull/591/files/d79fbf2f..47abde8e Webrevs: - full: https://webrevs.openjdk.java.net/skara/591/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/591/webrev.00-01 Stats: 553 lines in 11 files changed: 217 ins; 229 del; 107 mod Patch: https://git.openjdk.java.net/skara/pull/591.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/591/head:pull/591 PR: https://git.openjdk.java.net/skara/pull/591 From rwestberg at openjdk.java.net Wed Apr 22 13:37:10 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 22 Apr 2020 13:37:10 GMT Subject: [Rev 02] RFR: 375: Improve Merge PR RFR email In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that improves the RFR emails sent out for Merge PRs. > > Best regards, > Robin Robin Westberg has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains six commits: - Merge remote-tracking branch 'upstream/master' into merge_pr_rfr # Conflicts: # bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java - Rename to PullRequestUtils - Make PullRequestInstance simpler - Avoid emitting empty webrevs - Generate merge webrevs from the to-be-final merge commit - Move reusable parts of PullRequestInstance into forge ------------- Changes: https://git.openjdk.java.net/skara/pull/591/files Webrev: https://webrevs.openjdk.java.net/skara/591/webrev.02 Stats: 1074 lines in 14 files changed: 578 ins; 388 del; 108 mod Patch: https://git.openjdk.java.net/skara/pull/591.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/591/head:pull/591 PR: https://git.openjdk.java.net/skara/pull/591 From mark.reinhold at oracle.com Wed Apr 22 17:23:17 2020 From: mark.reinhold at oracle.com (mark.reinhold at oracle.com) Date: Wed, 22 Apr 2020 10:23:17 -0700 Subject: Email subject line formatting In-Reply-To: References: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> <20200414113234.9902763@eggemoggin.niobe.net> <70afb55c-7f19-5b55-b33f-ff17099fc907@oracle.com> Message-ID: <20200422102317.318371634@eggemoggin.niobe.net> 2020/4/17 2:58:18 -0700, magnus.ihse.bursie at oracle.com: > On 2020-04-17 10:46, Erik Helin wrote: >> ... >> >> Both me and Robin are personally fine with rewriting the subject line >> more aggressively, we both use MUAs that thread based on the >> "In-Reply-To" and "References" headers. I would just like to point out >> that several MUAs do *not* thread solely on the "In-Reply-To" and >> "References" headers, the most notable one being the Gmail browser >> based MUA accessible at https://www.gmail.com. > > Well, screw them. They can always use emacs instead. ;-) > > But seriously, would gmail have problem handling a thread properly if > you change the subject to be prefixed "Integrated: JDK-xxx ..." rather > than "Re: [integrated] RFR: JDK-xxx ..."? It could be worth testing. If > this special case is handled ok, then it's not really an issue if the > general threading is borked by gmail. Let?s not do the wrong thing just to appease a broken MUA, no matter how popular it might be. >> ... >> >> Now, what are those e-mails prefixed with "FYI" that Magnus mentioned? >> We use the "FYI" prefix instead of "RFR" when the bots send an email >> for a pull request that has already been integrated. Since the bots >> are polling they might encounter a pull request that was very quickly >> integrated. This is most likely to happen for OpenJDK projects that do >> not require reviews, where Committers can integrate their own pull >> requests as soon as they are created (given that they pass jcheck). So, theoretically, if the bots didn?t poll but were perfectly in sync with GitHub then these ?FYI? messages wouldn?t be needed? >> Using the prefix "RFR" for this scenario felt wrong, since it is not a >> request for review (the pull request has already been integrated). We >> therefore opted for the "FYI" prefix to signal that we are conveying >> information for something that has already happened. You can compare >> this situation to one where you pushed a changeset and retroactively >> send an e-mail with the webrev to a project's mailing list. This is an >> orthogonal feature to any kind of notification e-mail being sent for >> the integration. > > I think their function was understood, and reasonable. I was merely > reacting to the choice of the new tag "FYI" here, which to me implicated > a general informational message ("FYI: hg.openjdk.java.net is down right > now"), rather than a source revision operation. I had no idea what their function was, but now I do (thanks!). I agree with Magnus that the ?FYI? prefix is confusing. > It also struck me that these mails are, in some way, the very same thing > as the end result mail of a RFR thread. It's like a RFR but without the > request for the reviews. :-) I thought it might make sense to treat both > these kinds of mail the same, and use "Integrated:" as prefix for them > both. As an added benefit, you would be able to search for "Integrated:" > in a project mailbox, and see all integrations, both those that were > pushed directly and those that were out for review. Makes sense to me. > This would perhaps > mean that the "git:" update mail would not be needed for those projects, > since it would just duplicate this information. I think there?s still value in the ?git:? style messages, particularly for people who want to follow the stream of updates to a repo without having to scan every RFR thread for a terminal ?Integrated? message. - Mark From kevin.rushforth at oracle.com Wed Apr 22 17:36:56 2020 From: kevin.rushforth at oracle.com (Kevin Rushforth) Date: Wed, 22 Apr 2020 10:36:56 -0700 Subject: Email subject line formatting In-Reply-To: <20200422102317.318371634@eggemoggin.niobe.net> References: <3b83157d-3570-129f-d4a7-028c6872885d@oracle.com> <20200414113234.9902763@eggemoggin.niobe.net> <70afb55c-7f19-5b55-b33f-ff17099fc907@oracle.com> <20200422102317.318371634@eggemoggin.niobe.net> Message-ID: On 4/22/2020 10:23 AM, mark.reinhold at oracle.com wrote: >> This would perhaps >> mean that the "git:" update mail would not be needed for those projects, >> since it would just duplicate this information. > I think there?s still value in the ?git:? style messages, particularly > for people who want to follow the stream of updates to a repo without > having to scan every RFR thread for a terminal ?Integrated? message. > I completely agree. This also allows projects to send their commit notifications to a separate alias from the discussion RFR alias(es). This will likely prove especially useful for a project like the jdk where there are multiple "sub-project" RFR aliases (core-libs-dev, hotspot-dev, etc.). Having the "git:" style messages go to a "changes" mailing list will be very helpful. -- Kevin From rwestberg at openjdk.java.net Thu Apr 23 04:07:32 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Apr 2020 04:07:32 GMT Subject: [Rev 03] RFR: 375: Improve Merge PR RFR email In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that improves the RFR emails sent out for Merge PRs. > > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Make PullRequestUtils static ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/591/files - new: https://git.openjdk.java.net/skara/pull/591/files/3f1cc035..f35e09f6 Webrevs: - full: https://webrevs.openjdk.java.net/skara/591/webrev.03 - incr: https://webrevs.openjdk.java.net/skara/591/webrev.02-03 Stats: 71 lines in 11 files changed: 6 ins; 28 del; 37 mod Patch: https://git.openjdk.java.net/skara/pull/591.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/591/head:pull/591 PR: https://git.openjdk.java.net/skara/pull/591 From rwestberg at openjdk.java.net Thu Apr 23 04:49:51 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Apr 2020 04:49:51 GMT Subject: [Integrated] RFR: Python 3 compatibility for mercurial extension In-Reply-To: References: Message-ID: Changeset: 0c381067 Author: Robin Westberg Date: 2020-04-23 04:49:37 +0000 URL: https://git.openjdk.java.net/skara/commit/0c381067 Python 3 compatibility for mercurial extension Reviewed-by: ehelin ! skara.py From rwestberg at openjdk.java.net Thu Apr 23 04:56:52 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Apr 2020 04:56:52 GMT Subject: [Rev 04] RFR: 375: Improve Merge PR RFR email In-Reply-To: References: Message-ID: <8yyYHBgLGZ4ZhlamCCQ12t9hszrE37Rkwu2JiqQXTP4=.505e914e-980b-42d9-8590-46d569e318ab@github.com> > Hi all, > > Please review this change that improves the RFR emails sent out for Merge PRs. > > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Simplify the parent calculation for merge PRs ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/591/files - new: https://git.openjdk.java.net/skara/pull/591/files/f35e09f6..45d2e500 Webrevs: - full: https://webrevs.openjdk.java.net/skara/591/webrev.04 - incr: https://webrevs.openjdk.java.net/skara/591/webrev.03-04 Stats: 66 lines in 2 files changed: 14 ins; 27 del; 25 mod Patch: https://git.openjdk.java.net/skara/pull/591.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/591/head:pull/591 PR: https://git.openjdk.java.net/skara/pull/591 From rwestberg at openjdk.java.net Thu Apr 23 07:07:59 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Apr 2020 07:07:59 GMT Subject: [Integrated] RFR: 375: Improve Merge PR RFR email In-Reply-To: References: Message-ID: Changeset: b7f30b58 Author: Robin Westberg Date: 2020-04-23 07:07:45 +0000 URL: https://git.openjdk.java.net/skara/commit/b7f30b58 375: Improve Merge PR RFR email 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/ArchiveMessages.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.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/CheckablePullRequest.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/PullRequestInstance.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/SponsorCommand.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java + forge/src/main/java/org/openjdk/skara/forge/CommitFailure.java ! forge/src/main/java/org/openjdk/skara/forge/HostedRepositoryPool.java + forge/src/main/java/org/openjdk/skara/forge/PullRequestUtils.java From ehelin at openjdk.java.net Thu Apr 23 07:08:37 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Apr 2020 07:08:37 GMT Subject: [Rev 04] RFR: 375: Improve Merge PR RFR email In-Reply-To: <8yyYHBgLGZ4ZhlamCCQ12t9hszrE37Rkwu2JiqQXTP4=.505e914e-980b-42d9-8590-46d569e318ab@github.com> References: <8yyYHBgLGZ4ZhlamCCQ12t9hszrE37Rkwu2JiqQXTP4=.505e914e-980b-42d9-8590-46d569e318ab@github.com> Message-ID: On Thu, 23 Apr 2020 04:56:52 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that improves the RFR emails sent out for Merge PRs. >> >> Best regards, >> Robin > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Simplify the parent calculation for merge PRs Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/591 From ehelin at openjdk.java.net Thu Apr 23 08:43:00 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Apr 2020 08:43:00 GMT Subject: git: openjdk/skara: gitlab: avoid NPE in GitLabForgeFactory.create Message-ID: <9e150216-48d3-4fe7-8569-c21c07b9715b@openjdk.org> Changeset: 97113b1a Author: Erik Helin Date: 2020-04-23 08:42:45 +0000 URL: https://git.openjdk.java.net/skara/commit/97113b1a gitlab: avoid NPE in GitLabForgeFactory.create Reviewed-by: rwestberg ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabForgeFactory.java From ehelin at openjdk.java.net Thu Apr 23 08:43:30 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Apr 2020 08:43:30 GMT Subject: RFR: gitlab: avoid NPE in GitLabForgeFactory.create Message-ID: Hi all, please review this small patch that fixes an NPE in `GitLabForgeFactory.create`. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - gitlab: avoid NPE in GitLabForgeFactory.create Changes: https://git.openjdk.java.net/skara/pull/595/files Webrev: https://webrevs.openjdk.java.net/skara/595/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/595.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/595/head:pull/595 PR: https://git.openjdk.java.net/skara/pull/595 From rwestberg at openjdk.java.net Thu Apr 23 08:43:30 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Apr 2020 08:43:30 GMT Subject: RFR: gitlab: avoid NPE in GitLabForgeFactory.create In-Reply-To: References: Message-ID: On Thu, 23 Apr 2020 08:35:33 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that fixes an NPE in `GitLabForgeFactory.create`. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/595 From ehelin at openjdk.java.net Thu Apr 23 09:43:02 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Apr 2020 09:43:02 GMT Subject: RFR: skara: add hint about help for commands Message-ID: Hi all, please review this small patch that adds information on how to show more help for individual commands to `git skara help`. Testing: - Manually running `git skara help` Thanks, Erik ------------- Commit messages: - skara: add hint about help for commands Changes: https://git.openjdk.java.net/skara/pull/596/files Webrev: https://webrevs.openjdk.java.net/skara/596/webrev.00 Stats: 4 lines in 1 file changed: 4 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/596.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/596/head:pull/596 PR: https://git.openjdk.java.net/skara/pull/596 From rwestberg at openjdk.java.net Thu Apr 23 09:43:02 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Apr 2020 09:43:02 GMT Subject: RFR: skara: add hint about help for commands In-Reply-To: References: Message-ID: On Thu, 23 Apr 2020 09:35:08 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds information on how to show more help > for individual commands to `git skara help`. > > Testing: > - Manually running `git skara help` > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/596 From ehelin at openjdk.java.net Thu Apr 23 10:18:26 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Apr 2020 10:18:26 GMT Subject: [Integrated] RFR: skara: add hint about help for commands In-Reply-To: References: Message-ID: <842fae61-7763-461f-b03d-c3cb815c0f6e@openjdk.org> Changeset: 341fcfee Author: Erik Helin Date: 2020-04-23 10:18:16 +0000 URL: https://git.openjdk.java.net/skara/commit/341fcfee skara: add hint about help for commands Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitSkara.java From ehelin at openjdk.java.net Thu Apr 23 10:22:59 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Apr 2020 10:22:59 GMT Subject: RFR: 377: Remove special handling of failed-auto-merge label Message-ID: Hi all, please review this patch that makes merge pull requests created by the openjdk-bot to get the proper "RFR:" prefix. The pull requests generated by the bot are as real as any other pull request ?? Thanks, Erik ------------- Commit messages: - skara-377 Changes: https://git.openjdk.java.net/skara/pull/597/files Webrev: https://webrevs.openjdk.java.net/skara/597/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-377 Stats: 2 lines in 1 file changed: 0 ins; 2 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/597.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/597/head:pull/597 PR: https://git.openjdk.java.net/skara/pull/597 From rwestberg at openjdk.java.net Thu Apr 23 10:25:55 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Apr 2020 10:25:55 GMT Subject: RFR: 377: Remove special handling of failed-auto-merge label In-Reply-To: References: Message-ID: On Thu, 23 Apr 2020 10:15:26 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes merge pull requests created by the > openjdk-bot to get the proper "RFR:" prefix. The pull requests generated by the > bot are as real as any other pull request ?? > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/597 From ehelin at openjdk.java.net Thu Apr 23 10:44:59 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Apr 2020 10:44:59 GMT Subject: [Integrated] RFR: 377: Remove special handling of failed-auto-merge label In-Reply-To: References: Message-ID: <3f5dcb51-92cf-4b05-a44d-fde6c8dcfef7@openjdk.org> Changeset: 4984c98f Author: Erik Helin Date: 2020-04-23 10:44:44 +0000 URL: https://git.openjdk.java.net/skara/commit/4984c98f 377: Remove special handling of failed-auto-merge label Reviewed-by: rwestberg ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java From rwestberg at openjdk.java.net Thu Apr 23 13:38:52 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Apr 2020 13:38:52 GMT Subject: RFR: 378: Create merge conflict webrevs for "merge style" PRs without merge commit Message-ID: Hi all, Please review this change that creates a webrev containing only the merge conflicts for merge PRs that conflict with their target. Best regards, Robin ------------- Commit messages: - Create conflict webrevs Changes: https://git.openjdk.java.net/skara/pull/598/files Webrev: https://webrevs.openjdk.java.net/skara/598/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-378 Stats: 131 lines in 4 files changed: 126 ins; 2 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/598.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/598/head:pull/598 PR: https://git.openjdk.java.net/skara/pull/598 From ehelin at openjdk.java.net Thu Apr 23 14:10:53 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 23 Apr 2020 14:10:53 GMT Subject: RFR: 378: Create merge conflict webrevs for "merge style" PRs without merge commit In-Reply-To: References: Message-ID: On Thu, 23 Apr 2020 13:10:58 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that creates a webrev containing only the merge conflicts for merge PRs that conflict with > their target. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/598 From rwestberg at openjdk.java.net Thu Apr 23 14:24:23 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 23 Apr 2020 14:24:23 GMT Subject: [Integrated] RFR: 378: Create merge conflict webrevs for "merge style" PRs without merge commit In-Reply-To: References: Message-ID: Changeset: bd3b96da Author: Robin Westberg Date: 2020-04-23 14:23:58 +0000 URL: https://git.openjdk.java.net/skara/commit/bd3b96da 378: Create merge conflict webrevs for "merge style" PRs without merge commit 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/ArchiveMessages.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevDescription.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java From ehelin at openjdk.java.net Fri Apr 24 09:27:24 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Apr 2020 09:27:24 GMT Subject: RFR: cli: add trees command Message-ID: Hi all, please review this patch that adds [trees](https://hg.openjdk.java.net/code-tools/trees) functionality to Skara. This is mainly for those who want to use Skara for working with Mercurial today and are missing the trees functionality, but I also added a couple of trees "commands" like `tstatus`. `tpull` etc. to `skara.gitconfig`. Testing: - Manual testing of both Mercurial and Git trees commands Thanks, Erik ------------- Commit messages: - cli: add trees command Changes: https://git.openjdk.java.net/skara/pull/599/files Webrev: https://webrevs.openjdk.java.net/skara/599/webrev.00 Stats: 222 lines in 5 files changed: 210 ins; 0 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/599.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/599/head:pull/599 PR: https://git.openjdk.java.net/skara/pull/599 From rwestberg at openjdk.java.net Fri Apr 24 09:31:03 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Apr 2020 09:31:03 GMT Subject: RFR: cli: add trees command In-Reply-To: References: Message-ID: On Fri, 24 Apr 2020 09:23:30 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds > [trees](https://hg.openjdk.java.net/code-tools/trees) functionality to Skara. > This is mainly for those who want to use Skara for working with Mercurial today > and are missing the trees functionality, but I also added a couple of trees > "commands" like `tstatus`. `tpull` etc. to `skara.gitconfig`. > > Testing: > - Manual testing of both Mercurial and Git trees commands > > Thanks, > Erik Good stuff! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/599 From ehelin at openjdk.java.net Fri Apr 24 11:26:38 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Apr 2020 11:26:38 GMT Subject: [Integrated] RFR: cli: add trees command In-Reply-To: References: Message-ID: <20321522-29ec-4220-9b92-cca730dc762a@openjdk.org> Changeset: 8d9b6e98 Author: Erik Helin Date: 2020-04-24 11:26:24 +0000 URL: https://git.openjdk.java.net/skara/commit/8d9b6e98 cli: add trees command Reviewed-by: rwestberg ! cli/build.gradle ! cli/src/main/java/org/openjdk/skara/cli/GitSkara.java + cli/src/main/java/org/openjdk/skara/cli/GitTrees.java ! skara.gitconfig ! skara.py From ehelin at openjdk.java.net Fri Apr 24 11:45:14 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Apr 2020 11:45:14 GMT Subject: RFR: merge-bot: allow specs to define dependencies Message-ID: <4yCCWYpfhuK_pLngneoqts6ABzAqNmNWLxhrLesXecE=.b7be480f-2409-45d3-820e-b75ff76577a2@github.com> Hi all, please review this patch that allow the specifications for the merge bot to: 1. Have a name 2. Specify the names of other specifications as dependencies The above means that the merge bot now can express a bit more complicated merges, such as "only merge the branch `feature` into branch `demo` if the merge of branch `feature-vm` into branch `feature` _and_ the merge of branch `feature-lang` into branch `feature` succeeded". Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - merge-bot: allow specs to define dependencies Changes: https://git.openjdk.java.net/skara/pull/600/files Webrev: https://webrevs.openjdk.java.net/skara/600/webrev.00 Stats: 59 lines in 2 files changed: 52 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/600.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/600/head:pull/600 PR: https://git.openjdk.java.net/skara/pull/600 From rwestberg at openjdk.java.net Fri Apr 24 11:45:14 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Apr 2020 11:45:14 GMT Subject: RFR: merge-bot: allow specs to define dependencies In-Reply-To: <4yCCWYpfhuK_pLngneoqts6ABzAqNmNWLxhrLesXecE=.b7be480f-2409-45d3-820e-b75ff76577a2@github.com> References: <4yCCWYpfhuK_pLngneoqts6ABzAqNmNWLxhrLesXecE=.b7be480f-2409-45d3-820e-b75ff76577a2@github.com> Message-ID: On Fri, 24 Apr 2020 11:39:35 GMT, Erik Helin wrote: > Hi all, > > please review this patch that allow the specifications for the merge bot to: > > 1. Have a name > 2. Specify the names of other specifications as dependencies > > The above means that the merge bot now can express a bit more complicated > merges, such as "only merge the branch `feature` into branch `demo` if the merge > of branch `feature-vm` into branch `feature` _and_ the merge of branch > `feature-lang` into branch `feature` succeeded". > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/600 From ehelin at openjdk.java.net Fri Apr 24 12:34:20 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Apr 2020 12:34:20 GMT Subject: [Rev 01] RFR: merge-bot: allow specs to define dependencies In-Reply-To: <4yCCWYpfhuK_pLngneoqts6ABzAqNmNWLxhrLesXecE=.b7be480f-2409-45d3-820e-b75ff76577a2@github.com> References: <4yCCWYpfhuK_pLngneoqts6ABzAqNmNWLxhrLesXecE=.b7be480f-2409-45d3-820e-b75ff76577a2@github.com> Message-ID: > Hi all, > > please review this patch that allow the specifications for the merge bot to: > > 1. Have a name > 2. Specify the names of other specifications as dependencies > > The above means that the merge bot now can express a bit more complicated > merges, such as "only merge the branch `feature` into branch `demo` if the merge > of branch `feature-vm` into branch `feature` _and_ the merge of branch > `feature-lang` into branch `feature` succeeded". > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Add tests ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/600/files - new: https://git.openjdk.java.net/skara/pull/600/files/9753233f..6ff97178 Webrevs: - full: https://webrevs.openjdk.java.net/skara/600/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/600/webrev.00-01 Stats: 181 lines in 1 file changed: 181 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/600.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/600/head:pull/600 PR: https://git.openjdk.java.net/skara/pull/600 From ehelin at openjdk.java.net Fri Apr 24 12:38:45 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Apr 2020 12:38:45 GMT Subject: [Integrated] RFR: merge-bot: allow specs to define dependencies In-Reply-To: <4yCCWYpfhuK_pLngneoqts6ABzAqNmNWLxhrLesXecE=.b7be480f-2409-45d3-820e-b75ff76577a2@github.com> References: <4yCCWYpfhuK_pLngneoqts6ABzAqNmNWLxhrLesXecE=.b7be480f-2409-45d3-820e-b75ff76577a2@github.com> Message-ID: <770494f0-728f-45e3-beb4-74b375ae7fdb@openjdk.org> Changeset: 2dca7b7f Author: Erik Helin Date: 2020-04-24 12:38:31 +0000 URL: https://git.openjdk.java.net/skara/commit/2dca7b7f merge-bot: allow specs to define dependencies 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 magnus.ihse.bursie at oracle.com Fri Apr 24 12:41:26 2020 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Fri, 24 Apr 2020 14:41:26 +0200 Subject: RFR: cli: add trees command In-Reply-To: References: Message-ID: <0fe8e83a-48ff-bc34-f630-1754f3a89a9b@oracle.com> Interesting idea. I think you missed a proper implementation of tconfig, though, if you want backwards compatibility: magnusi at sthihse:/localhome/hg/jdk-ALT$ hg tconfig --help hg tconfig [OPTION]... [SUBTREE]... list or change the subtrees configuration ??? One of five operations can be selected: ??? --list :??? list the configured subtrees; this is the default if no other ??????????????? operation is selected. ??? --add :???? add the specified subtrees to the configuration. ??? --del :???? delete the specified subtrees from the configuration. Use ??????????????? --del --all to delete all subtrees. ??? --set :???? set the subtree configuration to the specified subtrees. Use ??????????????? --set --walk to walk the filesystem rooted at REPO and set ??????????????? the subtree configuration to the discovered repos. Use ??????????????? --depth to write the subtree configuration depth-most, so ??????????????? that each subtree is defined within the nearest enclosing ??????????????? repository.? Note that --walk and --depth may be used ??????????????? together. ??? --expand :? list the value of config items from the [trees] section. Items ??????????????? in the [trees] section can be defined in terms of other items ??????????????? in the [trees] section; tconfig --expand shows the ??????????????? recursively expanded value.? It returns 0 if at least one ??????????????? config item was found; otherwise it returns 1. ??? Note that with the slight exception of --set --depth, this command does ??? not recurse into subtrees; it operates only on the current repository. ??? (To recursively list subtrees, use the tlist command.) options: ?-a --add?????????? add the specified SUBTREEs to config ??? --all?????????? with --del, delete all subtrees from config ?-d --del?????????? delete the specified SUBTREEs from config ?-e --expand??????? recursively expand config items in the [trees] section ?-l --list????????? list the configured subtrees ??? --depth???????? store subtree configuration depth-most ?-s --set?????????? set the subtree config to SUBTREEs ??? --tns NAMESPACE trees namespace to use ?-w --walk????????? walk the filesystem to discover subtrees ??? --mq??????????? operate on patch repository (some details hidden, use --verbose to show complete help) Your code seems to do automatic configuration, which is probably an improvment :-) (but not backwards compatibility). It's also unclear what the "tconfig = tree config" alias means. It's not at all clear that we want or need backwards compatibility here. But if not, then the tconfig command should probably be removed. /Magnus On 2020-04-24 11:27, Erik Helin wrote: > Hi all, > > please review this patch that adds > [trees](https://hg.openjdk.java.net/code-tools/trees) functionality to Skara. > This is mainly for those who want to use Skara for working with Mercurial today > and are missing the trees functionality, but I also added a couple of trees > "commands" like `tstatus`. `tpull` etc. to `skara.gitconfig`. > > Testing: > - Manual testing of both Mercurial and Git trees commands > > Thanks, > Erik > > ------------- > > Commit messages: > - cli: add trees command > > Changes: https://git.openjdk.java.net/skara/pull/599/files > Webrev: https://webrevs.openjdk.java.net/skara/599/webrev.00 > Stats: 222 lines in 5 files changed: 210 ins; 0 del; 12 mod > Patch: https://git.openjdk.java.net/skara/pull/599.diff > Fetch: git fetch https://git.openjdk.java.net/skara pull/599/head:pull/599 > > PR: https://git.openjdk.java.net/skara/pull/599 From rwestberg at openjdk.java.net Fri Apr 24 12:50:20 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Apr 2020 12:50:20 GMT Subject: RFR: Avoid setting ignoreFailures for the test report Message-ID: <1ByZO74aIwN1lVAbHGwv00rWYbC0uYv-J2ugfHIQ8h4=.8dd17a8e-6d68-4518-bb49-400d41824c5c@github.com> Hi all, Please review this change that drops the logic for setting ignoreFailures when building the testReport target, as this doesn't work properly, and currently hides failures in CI. Best regards, Robin ------------- Commit messages: - Avoid setting ignoreFailures for now Changes: https://git.openjdk.java.net/skara/pull/601/files Webrev: https://webrevs.openjdk.java.net/skara/601/webrev.00 Stats: 17 lines in 1 file changed: 0 ins; 17 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/601.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/601/head:pull/601 PR: https://git.openjdk.java.net/skara/pull/601 From erik.helin at oracle.com Fri Apr 24 12:55:56 2020 From: erik.helin at oracle.com (Erik Helin) Date: Fri, 24 Apr 2020 14:55:56 +0200 Subject: RFR: cli: add trees command In-Reply-To: <0fe8e83a-48ff-bc34-f630-1754f3a89a9b@oracle.com> References: <0fe8e83a-48ff-bc34-f630-1754f3a89a9b@oracle.com> Message-ID: <44041ad2-c5ad-b161-5783-c46058d68300@oracle.com> On 4/24/20 2:41 PM, Magnus Ihse Bursie wrote: > Interesting idea. I think you missed a proper implementation of tconfig, > though, if you want backwards compatibility: > > Your code seems to do automatic configuration, which is probably an > improvment :-) (but not backwards compatibility). Yes, I should have mentioned this in the RFR email. To me there are two problems with original trees.py "tconfig" command: 1. It removes the ability to run the Mercurial command "config" for a set of trees, since the name "tconfig" is already taken by trees.py own "tconfig" command. 2. I don't see any reason why trees.py forces the user to run tconfig prior to running any other trees command (such as "tstatus"). If a user runs "tstatus" then it is obvious that they want to run the command "status" for all trees, so we might as well find all the trees by then if we haven't done it before. > It's also unclear what the "tconfig = tree config" alias means. It means that `tconfig` is an alias that runs the command `trees config` :) "config" is a command in Git, just as it is in Mercurial, so "tconfig" here simply means "run the command 'config' in all trees". > It's not at all clear that we want or need backwards compatibility here. > But if not, then the tconfig command should probably be removed. For the reasons listed above I think we should break backwards compatibility here, particularly since the workaround is very easy: you no longer have to run tconfig --set --walk :) Or did I miss something? Thanks, Erik > /Magnus > > On 2020-04-24 11:27, Erik Helin wrote: >> Hi all, >> >> please review this patch that adds >> [trees](https://hg.openjdk.java.net/code-tools/trees) functionality to >> Skara. >> This is mainly for those who want to use Skara for working with >> Mercurial today >> and are missing the trees functionality, but I also added a couple of >> trees >> "commands" like `tstatus`. `tpull` etc. to `skara.gitconfig`. >> >> Testing: >> - Manual testing of both Mercurial and Git trees commands >> >> Thanks, >> Erik >> >> ------------- >> >> Commit messages: >> ? - cli: add trees command >> >> Changes: https://git.openjdk.java.net/skara/pull/599/files >> ? Webrev: https://webrevs.openjdk.java.net/skara/599/webrev.00 >> ?? Stats: 222 lines in 5 files changed: 210 ins; 0 del; 12 mod >> ?? Patch: https://git.openjdk.java.net/skara/pull/599.diff >> ?? Fetch: git fetch https://git.openjdk.java.net/skara >> pull/599/head:pull/599 >> >> PR: https://git.openjdk.java.net/skara/pull/599 > From rwestberg at openjdk.java.net Fri Apr 24 13:41:37 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Apr 2020 13:41:37 GMT Subject: [Rev 01] RFR: Avoid setting ignoreFailures for the test report In-Reply-To: <1ByZO74aIwN1lVAbHGwv00rWYbC0uYv-J2ugfHIQ8h4=.8dd17a8e-6d68-4518-bb49-400d41824c5c@github.com> References: <1ByZO74aIwN1lVAbHGwv00rWYbC0uYv-J2ugfHIQ8h4=.8dd17a8e-6d68-4518-bb49-400d41824c5c@github.com> Message-ID: <3xdpkMzb4TKnMulGQhFaL8TJodAljQYff_qTB7WQzNE=.6bac1ae2-27c8-4877-91cc-442cfa74fbf3@github.com> > Hi all, > > Please review this change that drops the logic for setting ignoreFailures when building the testReport target, as this > doesn't work properly, and currently hides failures in CI. > Best regards, > Robin Robin Westberg has updated the pull request incrementally with two additional commits since the last revision: - Fix trailing whitespace - Fix failing mailinglist bridge bot tests ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/601/files - new: https://git.openjdk.java.net/skara/pull/601/files/3cace479..64223fd7 Webrevs: - full: https://webrevs.openjdk.java.net/skara/601/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/601/webrev.00-01 Stats: 79 lines in 1 file changed: 5 ins; 68 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/601.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/601/head:pull/601 PR: https://git.openjdk.java.net/skara/pull/601 From rwestberg at openjdk.java.net Fri Apr 24 13:46:53 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Apr 2020 13:46:53 GMT Subject: [Rev 02] RFR: Avoid setting ignoreFailures for the test report In-Reply-To: <1ByZO74aIwN1lVAbHGwv00rWYbC0uYv-J2ugfHIQ8h4=.8dd17a8e-6d68-4518-bb49-400d41824c5c@github.com> References: <1ByZO74aIwN1lVAbHGwv00rWYbC0uYv-J2ugfHIQ8h4=.8dd17a8e-6d68-4518-bb49-400d41824c5c@github.com> Message-ID: > Hi all, > > Please review this change that drops the logic for setting ignoreFailures when building the testReport target, as this > doesn't work properly, and currently hides failures in CI. > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Fix failing mergebot test ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/601/files - new: https://git.openjdk.java.net/skara/pull/601/files/64223fd7..961a5c74 Webrevs: - full: https://webrevs.openjdk.java.net/skara/601/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/601/webrev.01-02 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/601.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/601/head:pull/601 PR: https://git.openjdk.java.net/skara/pull/601 From ehelin at openjdk.java.net Fri Apr 24 14:12:34 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 24 Apr 2020 14:12:34 GMT Subject: [Rev 02] RFR: Avoid setting ignoreFailures for the test report In-Reply-To: References: <1ByZO74aIwN1lVAbHGwv00rWYbC0uYv-J2ugfHIQ8h4=.8dd17a8e-6d68-4518-bb49-400d41824c5c@github.com> Message-ID: On Fri, 24 Apr 2020 13:46:53 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that drops the logic for setting ignoreFailures when building the testReport target, as this >> doesn't work properly, and currently hides failures in CI. >> Best regards, >> Robin > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Fix failing mergebot test Looks good, thanks for fixing! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/601 From rwestberg at openjdk.java.net Fri Apr 24 14:16:36 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 24 Apr 2020 14:16:36 GMT Subject: [Integrated] RFR: Avoid setting ignoreFailures for the test report In-Reply-To: <1ByZO74aIwN1lVAbHGwv00rWYbC0uYv-J2ugfHIQ8h4=.8dd17a8e-6d68-4518-bb49-400d41824c5c@github.com> References: <1ByZO74aIwN1lVAbHGwv00rWYbC0uYv-J2ugfHIQ8h4=.8dd17a8e-6d68-4518-bb49-400d41824c5c@github.com> Message-ID: <4ce4aec5-f1b6-4092-bc40-136cb68af91b@openjdk.org> Changeset: 75f257ef Author: Robin Westberg Date: 2020-04-24 14:16:22 +0000 URL: https://git.openjdk.java.net/skara/commit/75f257ef Avoid setting ignoreFailures for the test report Reviewed-by: ehelin ! bots/merge/src/test/java/org/openjdk/skara/bots/merge/MergeBotTests.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java ! build.gradle From rwestberg at openjdk.java.net Mon Apr 27 09:00:46 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 09:00:46 GMT Subject: RFR: 382: List commits that have been pushed in integration message Message-ID: Hi all, Please review this change that lists the commits that have been pushed since the PR was created (up to 10). Best regards, Robin ------------- Commit messages: - List up to 10 commits if rebase is needed Changes: https://git.openjdk.java.net/skara/pull/602/files Webrev: https://webrevs.openjdk.java.net/skara/602/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-382 Stats: 35 lines in 7 files changed: 29 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/602.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/602/head:pull/602 PR: https://git.openjdk.java.net/skara/pull/602 From ehelin at openjdk.java.net Mon Apr 27 09:18:24 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 09:18:24 GMT Subject: RFR: 382: List commits that have been pushed in integration message In-Reply-To: References: Message-ID: On Mon, 27 Apr 2020 08:57:05 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that lists the commits that have been pushed since the PR was created (up to 10). > > Best regards, > Robin Looks good in general, just one minor question and one minor comment ?? bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 447: > 446: divergingCommits.stream() > 447: .limit(10) > 448: .forEach(c -> message.append(" * ").append(c.hash().hex()).append(": > ").append(c.message().get(0)).append("\n")); Will this be the most recent or the oldest 10 diverging commits? bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 450: > 449: if (divergingCommits.size() > 10) { > 450: message.append(" * ... full list: ").append(pr.repository().webUrl(baseHash.hex(), > pr.targetRef())).append("\n"); 451: } Can we say something like `* ... and 5 more: `? ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/602 From rwestberg at openjdk.java.net Mon Apr 27 09:21:36 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 09:21:36 GMT Subject: RFR: 382: List commits that have been pushed in integration message In-Reply-To: References: Message-ID: On Mon, 27 Apr 2020 09:16:11 GMT, Erik Helin wrote: >> Hi all, >> >> Please review this change that lists the commits that have been pushed since the PR was created (up to 10). >> >> Best regards, >> Robin > > Looks good in general, just one minor question and one minor comment ?? Thanks for reviewing! > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 447: > >> 446: divergingCommits.stream() >> 447: .limit(10) >> 448: .forEach(c -> message.append(" * ").append(c.hash().hex()).append(": >> ").append(c.message().get(0)).append("\n")); > > Will this be the most recent or the oldest 10 diverging commits? This should give the 10 most recent. > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 450: > >> 449: if (divergingCommits.size() > 10) { >> 450: message.append(" * ... full list: ").append(pr.repository().webUrl(baseHash.hex(), >> pr.targetRef())).append("\n"); 451: } > > Can we say something like `* ... and 5 more: `? Sure, but the link itself should show a full list, right? ------------- PR: https://git.openjdk.java.net/skara/pull/602 From ehelin at openjdk.java.net Mon Apr 27 09:40:54 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 09:40:54 GMT Subject: RFR: 382: List commits that have been pushed in integration message In-Reply-To: References: Message-ID: On Mon, 27 Apr 2020 09:18:26 GMT, Robin Westberg wrote: >> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 447: >> >>> 446: divergingCommits.stream() >>> 447: .limit(10) >>> 448: .forEach(c -> message.append(" * ").append(c.hash().hex()).append(": >>> ").append(c.message().get(0)).append("\n")); >> >> Will this be the most recent or the oldest 10 diverging commits? > > This should give the 10 most recent. Sounds good ?? >> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 450: >> >>> 449: if (divergingCommits.size() > 10) { >>> 450: message.append(" * ... full list: ").append(pr.repository().webUrl(baseHash.hex(), >>> pr.targetRef())).append("\n"); 451: } >> >> Can we say something like `* ... and 5 more: `? > > Sure, but the link itself should show a full list, right? Yeah, I think that is the best ------------- PR: https://git.openjdk.java.net/skara/pull/602 From rwestberg at openjdk.java.net Mon Apr 27 09:50:06 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 09:50:06 GMT Subject: [Rev 01] RFR: 382: List commits that have been pushed in integration message In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that lists the commits that have been pushed since the PR was created (up to 10). > > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Update wording of linked commits ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/602/files - new: https://git.openjdk.java.net/skara/pull/602/files/683aad54..0f332fd7 Webrevs: - full: https://webrevs.openjdk.java.net/skara/602/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/602/webrev.00-01 Stats: 2 lines in 1 file changed: 1 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/602.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/602/head:pull/602 PR: https://git.openjdk.java.net/skara/pull/602 From rwestberg at openjdk.java.net Mon Apr 27 09:52:45 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 09:52:45 GMT Subject: [Integrated] RFR: 382: List commits that have been pushed in integration message In-Reply-To: References: Message-ID: Changeset: 9bf3f5cb Author: Robin Westberg Date: 2020-04-27 09:52:32 +0000 URL: https://git.openjdk.java.net/skara/commit/9bf3f5cb 382: List commits that have been pushed in integration message Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java ! bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryHostedRepository.java ! forge/src/main/java/org/openjdk/skara/forge/HostedRepository.java ! forge/src/main/java/org/openjdk/skara/forge/github/GitHubRepository.java ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java ! test/src/main/java/org/openjdk/skara/test/TestHostedRepository.java From ehelin at openjdk.java.net Mon Apr 27 09:53:24 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 09:53:24 GMT Subject: [Rev 01] RFR: 382: List commits that have been pushed in integration message In-Reply-To: References: Message-ID: On Mon, 27 Apr 2020 09:50:06 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that lists the commits that have been pushed since the PR was created (up to 10). >> >> Best regards, >> Robin > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Update wording of linked commits Looks solid now ?? ! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/602 From rwestberg at openjdk.java.net Mon Apr 27 10:00:15 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 10:00:15 GMT Subject: RFR: 376: Link to commits when number of commits exceeds 10 Message-ID: Hi all, Please review this change that adds a link to further commits in RFR emails when the list exceeds 10. Best regards, Robin ------------- Commit messages: - Link to excess commits in RFR mails Changes: https://git.openjdk.java.net/skara/pull/603/files Webrev: https://webrevs.openjdk.java.net/skara/603/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-376 Stats: 38 lines in 2 files changed: 16 ins; 4 del; 18 mod Patch: https://git.openjdk.java.net/skara/pull/603.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/603/head:pull/603 PR: https://git.openjdk.java.net/skara/pull/603 From ehelin at openjdk.java.net Mon Apr 27 10:10:34 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 10:10:34 GMT Subject: RFR: 376: Link to commits when number of commits exceeds 10 In-Reply-To: References: Message-ID: On Mon, 27 Apr 2020 09:55:43 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that adds a link to further commits in RFR emails when the list exceeds 10. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/603 From rwestberg at openjdk.java.net Mon Apr 27 10:44:26 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 10:44:26 GMT Subject: [Integrated] RFR: 376: Link to commits when number of commits exceeds 10 In-Reply-To: References: Message-ID: <9318f4a9-7f2a-409b-9374-d6d080c11424@openjdk.org> Changeset: db5254e5 Author: Robin Westberg Date: 2020-04-27 10:44:13 +0000 URL: https://git.openjdk.java.net/skara/commit/db5254e5 376: Link to commits when number of commits exceeds 10 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/ArchiveMessages.java From rwestberg at openjdk.java.net Mon Apr 27 11:50:54 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 11:50:54 GMT Subject: RFR: merge-bot: specs can have prerequisites In-Reply-To: <7bX2amT2YGA-UFeF0ocMYKbqWFnPYy0T5hoEA2ZgG8I=.20602421-f7c8-4417-81c3-9eceb79f1052@github.com> References: <7bX2amT2YGA-UFeF0ocMYKbqWFnPYy0T5hoEA2ZgG8I=.20602421-f7c8-4417-81c3-9eceb79f1052@github.com> Message-ID: On Mon, 27 Apr 2020 11:45:00 GMT, Erik Helin wrote: > Hi all, > > please review this pull request that allows specifications for the merge bot to > have other repositories as prerequisites. Having a repository as a prerequisite > mean that the specification will not be executed if a repository that is a > prerequisite has any pull requests open due to automatic merge conflicts. > > Testing: > - `make test` passes on Linux x64 > - added a new unit test > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/604 From ehelin at openjdk.java.net Mon Apr 27 11:49:00 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 11:49:00 GMT Subject: RFR: merge-bot: specs can have prerequisites Message-ID: <7bX2amT2YGA-UFeF0ocMYKbqWFnPYy0T5hoEA2ZgG8I=.20602421-f7c8-4417-81c3-9eceb79f1052@github.com> Hi all, please review this pull request that allows specifications for the merge bot to have other repositories as prerequisites. Having a repository as a prerequisite mean that the specification will not be executed if a repository that is a prerequisite has any pull requests open due to automatic merge conflicts. Testing: - `make test` passes on Linux x64 - added a new unit test Thanks, Erik ------------- Commit messages: - merge-bot: specs can have prerequisites Changes: https://git.openjdk.java.net/skara/pull/604/files Webrev: https://webrevs.openjdk.java.net/skara/604/webrev.00 Stats: 207 lines in 3 files changed: 180 ins; 9 del; 18 mod Patch: https://git.openjdk.java.net/skara/pull/604.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/604/head:pull/604 PR: https://git.openjdk.java.net/skara/pull/604 From ehelin at openjdk.java.net Mon Apr 27 11:57:59 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 11:57:59 GMT Subject: [Integrated] RFR: merge-bot: specs can have prerequisites In-Reply-To: <7bX2amT2YGA-UFeF0ocMYKbqWFnPYy0T5hoEA2ZgG8I=.20602421-f7c8-4417-81c3-9eceb79f1052@github.com> References: <7bX2amT2YGA-UFeF0ocMYKbqWFnPYy0T5hoEA2ZgG8I=.20602421-f7c8-4417-81c3-9eceb79f1052@github.com> Message-ID: <8af805ec-381c-4fe1-8afc-3ebdb0d64a18@openjdk.org> Changeset: 0c2920e3 Author: Erik Helin Date: 2020-04-27 11:57:43 +0000 URL: https://git.openjdk.java.net/skara/commit/0c2920e3 merge-bot: specs can have prerequisites 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 ehelin at openjdk.java.net Mon Apr 27 11:59:44 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 11:59:44 GMT Subject: RFR: merge-bot: specs can have prerequisites In-Reply-To: References: <7bX2amT2YGA-UFeF0ocMYKbqWFnPYy0T5hoEA2ZgG8I=.20602421-f7c8-4417-81c3-9eceb79f1052@github.com> Message-ID: On Mon, 27 Apr 2020 11:48:48 GMT, Robin Westberg wrote: >> Hi all, >> >> please review this pull request that allows specifications for the merge bot to >> have other repositories as prerequisites. Having a repository as a prerequisite >> mean that the specification will not be executed if a repository that is a >> prerequisite has any pull requests open due to automatic merge conflicts. >> >> Testing: >> - `make test` passes on Linux x64 >> - added a new unit test >> >> Thanks, >> Erik > > Looks good! Thanks Robin for reviewing! ------------- PR: https://git.openjdk.java.net/skara/pull/604 From rwestberg at openjdk.java.net Mon Apr 27 13:20:16 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 13:20:16 GMT Subject: RFR: 386: Move PR notification handling to the mailing list bridge Message-ID: Hi all, Please review this change that moves the handling of PR integration notices from the notifier to the mailing list bridge. The notifier will continue to post the traditional `git:` messages only. This change also makes it easier to change the prefix handling, as this is now done in a single place. It also checks if a PR has been integrated "manually" by a user with write access that uses the web UI integration button. Best regards, Robin ------------- Commit messages: - Remove unused prefix handling from the notifier - Let the mlbridge post integrated notices for PRs - Drop notifier support for posting in PR threads Changes: https://git.openjdk.java.net/skara/pull/605/files Webrev: https://webrevs.openjdk.java.net/skara/605/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-386 Stats: 471 lines in 9 files changed: 141 ins; 301 del; 29 mod Patch: https://git.openjdk.java.net/skara/pull/605.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/605/head:pull/605 PR: https://git.openjdk.java.net/skara/pull/605 From ehelin at openjdk.java.net Mon Apr 27 13:21:47 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:21:47 GMT Subject: git: openjdk/skara: merge-bot: provide default values in conf Message-ID: Changeset: ba64ec79 Author: Erik Helin Date: 2020-04-27 13:21:33 +0000 URL: https://git.openjdk.java.net/skara/commit/ba64ec79 merge-bot: provide default values in conf Reviewed-by: rwestberg ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBotFactory.java ! json/src/main/java/org/openjdk/skara/json/JSONObject.java ! json/src/main/java/org/openjdk/skara/json/JSONValue.java From ehelin at openjdk.java.net Mon Apr 27 13:23:14 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:23:14 GMT Subject: RFR: 386: Move PR notification handling to the mailing list bridge In-Reply-To: References: Message-ID: On Mon, 27 Apr 2020 13:16:26 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that moves the handling of PR integration notices from the notifier to the mailing list > bridge. The notifier will continue to post the traditional `git:` messages only. This change also makes it easier to > change the prefix handling, as this is now done in a single place. It also checks if a PR has been integrated > "manually" by a user with write access that uses the web UI integration button. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/605 From rwestberg at openjdk.java.net Mon Apr 27 13:24:44 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 13:24:44 GMT Subject: FYI: merge-bot: provide default values in conf In-Reply-To: References: Message-ID: On Mon, 27 Apr 2020 13:17:48 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes `MergeBotFactory` provide default > values for specification fields in the configures. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good, perhaps a little unit test would have been nice too, but can do that later. :) ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/606 From ehelin at openjdk.java.net Mon Apr 27 13:24:44 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:24:44 GMT Subject: FYI: merge-bot: provide default values in conf Message-ID: Hi all, please review this small patch that makes `MergeBotFactory` provide default values for specification fields in the configures. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - merge-bot: provide default values in conf Changes: https://git.openjdk.java.net/skara/pull/606/files Webrev: https://webrevs.openjdk.java.net/skara/606/webrev.00 Stats: 12 lines in 3 files changed: 9 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/606.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/606/head:pull/606 PR: https://git.openjdk.java.net/skara/pull/606 From rwestberg at openjdk.java.net Mon Apr 27 13:30:47 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 13:30:47 GMT Subject: [Integrated] RFR: 386: Move PR notification handling to the mailing list bridge In-Reply-To: References: Message-ID: <8c16454e-d5db-4564-adee-0ff6d9cc29d8@openjdk.org> Changeset: 08888a5e Author: Robin Westberg Date: 2020-04-27 13:30:29 +0000 URL: https://git.openjdk.java.net/skara/commit/08888a5e 386: Move PR notification handling to the mailing list bridge 388: Notification bot does not recognize a "Merged" PR 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/ArchiveMessages.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/MailingListUpdater.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/MailingListUpdaterBuilder.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 Mon Apr 27 13:44:35 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 13:44:35 GMT Subject: [Integrated] RFR: 375: Improve Merge PR RFR email In-Reply-To: References: Message-ID: On Tue, 21 Apr 2020 14:03:42 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that improves the RFR emails sent out for Merge PRs. > > Best regards, > Robin This pull request has now been integrated. Changeset: b7f30b58 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/b7f30b58 Stats: 1079 lines in 16 files changed: 406 ins; 561 del; 112 mod 375: Improve Merge PR RFR email Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/591 From ehelin at openjdk.java.net Mon Apr 27 13:44:27 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:44:27 GMT Subject: [Integrated] RFR: cli: add trees command In-Reply-To: References: Message-ID: On Fri, 24 Apr 2020 09:23:30 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds > [trees](https://hg.openjdk.java.net/code-tools/trees) functionality to Skara. > This is mainly for those who want to use Skara for working with Mercurial today > and are missing the trees functionality, but I also added a couple of trees > "commands" like `tstatus`. `tpull` etc. to `skara.gitconfig`. > > Testing: > - Manual testing of both Mercurial and Git trees commands > > Thanks, > Erik This pull request has now been integrated. Changeset: 8d9b6e98 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/8d9b6e98 Stats: 222 lines in 5 files changed: 0 ins; 210 del; 12 mod cli: add trees command Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/599 From rwestberg at openjdk.java.net Mon Apr 27 13:44:38 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 13:44:38 GMT Subject: [Integrated] RFR: Fix problem with specifying a single issue with shorthand syntax In-Reply-To: <8og8qgTAwwAEB3qTrgh8tmKTtiSg11Z9DSsFIYAIhgc=.a6e7b130-8e6f-4376-bd23-42a596c89308@github.com> References: <8og8qgTAwwAEB3qTrgh8tmKTtiSg11Z9DSsFIYAIhgc=.a6e7b130-8e6f-4376-bd23-42a596c89308@github.com> Message-ID: On Wed, 22 Apr 2020 07:39:08 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that fixes a problem with specifying a single issue to the `/issues` (or `/solves`) > command using the shorthand syntax. > Best regards, > Robin This pull request has now been integrated. Changeset: ef0c6f6c Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/ef0c6f6c Stats: 14 lines in 2 files changed: 2 ins; 12 del; 0 mod Fix problem with specifying a single issue with shorthand syntax Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/592 From rwestberg at openjdk.java.net Mon Apr 27 13:44:22 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 13:44:22 GMT Subject: [Integrated] RFR: 376: Link to commits when number of commits exceeds 10 In-Reply-To: References: Message-ID: On Mon, 27 Apr 2020 09:55:43 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that adds a link to further commits in RFR emails when the list exceeds 10. > > Best regards, > Robin This pull request has now been integrated. Changeset: db5254e5 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/db5254e5 Stats: 38 lines in 2 files changed: 4 ins; 16 del; 18 mod 376: Link to commits when number of commits exceeds 10 Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/603 From ehelin at openjdk.java.net Mon Apr 27 13:44:42 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:44:42 GMT Subject: [Integrated] RFR: proxy: remove dead code In-Reply-To: References: Message-ID: On Fri, 17 Apr 2020 09:42:51 GMT, Erik Helin wrote: > Hi all, > > please review this trivial patch that removes some unused code. Thanks to > @pliden for noticing! > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 29691254 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/29691254 Stats: 26 lines in 1 file changed: 26 ins; 0 del; 0 mod proxy: remove dead code Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/588 From rwestberg at openjdk.java.net Mon Apr 27 13:45:06 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 13:45:06 GMT Subject: [Integrated] RFR: Avoid setting ignoreFailures for the test report In-Reply-To: <1ByZO74aIwN1lVAbHGwv00rWYbC0uYv-J2ugfHIQ8h4=.8dd17a8e-6d68-4518-bb49-400d41824c5c@github.com> References: <1ByZO74aIwN1lVAbHGwv00rWYbC0uYv-J2ugfHIQ8h4=.8dd17a8e-6d68-4518-bb49-400d41824c5c@github.com> Message-ID: On Fri, 24 Apr 2020 12:46:51 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that drops the logic for setting ignoreFailures when building the testReport target, as this > doesn't work properly, and currently hides failures in CI. > Best regards, > Robin This pull request has now been integrated. Changeset: 75f257ef Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/75f257ef Stats: 97 lines in 3 files changed: 85 ins; 5 del; 7 mod Avoid setting ignoreFailures for the test report Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/601 From rwestberg at openjdk.java.net Mon Apr 27 13:44:19 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 13:44:19 GMT Subject: [Integrated] RFR: 386: Move PR notification handling to the mailing list bridge In-Reply-To: References: Message-ID: On Mon, 27 Apr 2020 13:16:26 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that moves the handling of PR integration notices from the notifier to the mailing list > bridge. The notifier will continue to post the traditional `git:` messages only. This change also makes it easier to > change the prefix handling, as this is now done in a single place. It also checks if a PR has been integrated > "manually" by a user with write access that uses the web UI integration button. > Best regards, > Robin This pull request has now been integrated. Changeset: 08888a5e Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/08888a5e Stats: 469 lines in 9 files changed: 299 ins; 139 del; 31 mod 386: Move PR notification handling to the mailing list bridge 388: Notification bot does not recognize a "Merged" PR Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/605 From ehelin at openjdk.java.net Mon Apr 27 13:45:03 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:45:03 GMT Subject: [Integrated] FYI: merge-bot: provide default values in conf In-Reply-To: References: Message-ID: On Mon, 27 Apr 2020 13:17:48 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes `MergeBotFactory` provide default > values for specification fields in the configures. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: ba64ec79 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/ba64ec79 Stats: 12 lines in 3 files changed: 0 ins; 9 del; 3 mod merge-bot: provide default values in conf Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/606 From ehelin at openjdk.java.net Mon Apr 27 13:44:50 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:44:50 GMT Subject: [Integrated] RFR: 364: The bots should not fetch tags by default In-Reply-To: References: Message-ID: On Thu, 16 Apr 2020 08:51:29 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the bots *not* fetch tags by default. > Fetching tags should be an explicit action, not something that happens as a side > effect of fetching commits. > > Testing: > - `make test` on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 2139bf5f Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/2139bf5f Stats: 52 lines in 15 files changed: 0 ins; 28 del; 24 mod 364: The bots should not fetch tags by default Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/583 From ehelin at openjdk.java.net Mon Apr 27 13:45:14 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:45:14 GMT Subject: [Integrated] RFR: gitlab: avoid NPE in GitLabForgeFactory.create In-Reply-To: References: Message-ID: On Thu, 23 Apr 2020 08:35:33 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that fixes an NPE in `GitLabForgeFactory.create`. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 97113b1a Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/97113b1a Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod gitlab: avoid NPE in GitLabForgeFactory.create Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/595 From ehelin at openjdk.java.net Mon Apr 27 13:45:26 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:45:26 GMT Subject: [Integrated] RFR: merge-bot: no need to force push In-Reply-To: References: Message-ID: On Thu, 16 Apr 2020 06:40:37 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes the merge bot no longer use force > pushes. The redesigned merge bot has no need for force pushes, all "from" > branches (branches in bot's fork) will have a unique name, so there should never > be a conflict when pushing. > > Testing: > - `make test` on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: fe828df4 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/fe828df4 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod merge-bot: no need to force push Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/582 From rwestberg at openjdk.java.net Mon Apr 27 13:45:37 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 13:45:37 GMT Subject: [Integrated] RFR: 378: Create merge conflict webrevs for "merge style" PRs without merge commit In-Reply-To: References: Message-ID: On Thu, 23 Apr 2020 13:10:58 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that creates a webrev containing only the merge conflicts for merge PRs that conflict with > their target. > Best regards, > Robin This pull request has now been integrated. Changeset: bd3b96da Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/bd3b96da Stats: 130 lines in 4 files changed: 1 ins; 125 del; 4 mod 378: Create merge conflict webrevs for "merge style" PRs without merge commit Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/598 From ehelin at openjdk.java.net Mon Apr 27 13:45:34 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:45:34 GMT Subject: [Integrated] RFR: merge-bot: specs can have prerequisites In-Reply-To: <7bX2amT2YGA-UFeF0ocMYKbqWFnPYy0T5hoEA2ZgG8I=.20602421-f7c8-4417-81c3-9eceb79f1052@github.com> References: <7bX2amT2YGA-UFeF0ocMYKbqWFnPYy0T5hoEA2ZgG8I=.20602421-f7c8-4417-81c3-9eceb79f1052@github.com> Message-ID: On Mon, 27 Apr 2020 11:45:00 GMT, Erik Helin wrote: > Hi all, > > please review this pull request that allows specifications for the merge bot to > have other repositories as prerequisites. Having a repository as a prerequisite > mean that the specification will not be executed if a repository that is a > prerequisite has any pull requests open due to automatic merge conflicts. > > Testing: > - `make test` passes on Linux x64 > - added a new unit test > > Thanks, > Erik This pull request has now been integrated. Changeset: 0c2920e3 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/0c2920e3 Stats: 207 lines in 3 files changed: 9 ins; 180 del; 18 mod merge-bot: specs can have prerequisites Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/604 From ehelin at openjdk.java.net Mon Apr 27 13:44:30 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:44:30 GMT Subject: [Integrated] RFR: 377: Remove special handling of failed-auto-merge label In-Reply-To: References: Message-ID: On Thu, 23 Apr 2020 10:15:26 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes merge pull requests created by the > openjdk-bot to get the proper "RFR:" prefix. The pull requests generated by the > bot are as real as any other pull request ?? > > Thanks, > Erik This pull request has now been integrated. Changeset: 4984c98f Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/4984c98f Stats: 2 lines in 1 file changed: 2 ins; 0 del; 0 mod 377: Remove special handling of failed-auto-merge label Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/597 From ehelin at openjdk.java.net Mon Apr 27 13:45:22 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:45:22 GMT Subject: [Integrated] RFR: build: respect git's http.proxy setting In-Reply-To: References: Message-ID: On Thu, 16 Apr 2020 13:42:49 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes the `gradlew` script respect git's > `http.proxy` setting. > > Testing: > - Manual testing of `sh gradlew` > > Thanks, > Erik This pull request has now been integrated. Changeset: ec3635cb Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/ec3635cb Stats: 13 lines in 1 file changed: 0 ins; 13 del; 0 mod build: respect git's http.proxy setting Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/586 From rwestberg at openjdk.java.net Mon Apr 27 13:44:53 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 13:44:53 GMT Subject: [Integrated] RFR: Failed merge commit message should not throw, but report a failure In-Reply-To: References: Message-ID: On Wed, 15 Apr 2020 11:13:16 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that makes sure that a failing "merge" jcheck does not throw, but properly reports an error. > > Best regards, > Robin This pull request has now been integrated. Changeset: 1ba3260b Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/1ba3260b Stats: 59 lines in 2 files changed: 0 ins; 58 del; 1 mod Failed merge commit message should not throw, but report a failure Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/580 From ehelin at openjdk.java.net Mon Apr 27 13:45:10 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:45:10 GMT Subject: [Integrated] RFR: merge-bot: allow specs to define dependencies In-Reply-To: <4yCCWYpfhuK_pLngneoqts6ABzAqNmNWLxhrLesXecE=.b7be480f-2409-45d3-820e-b75ff76577a2@github.com> References: <4yCCWYpfhuK_pLngneoqts6ABzAqNmNWLxhrLesXecE=.b7be480f-2409-45d3-820e-b75ff76577a2@github.com> Message-ID: On Fri, 24 Apr 2020 11:39:35 GMT, Erik Helin wrote: > Hi all, > > please review this patch that allow the specifications for the merge bot to: > > 1. Have a name > 2. Specify the names of other specifications as dependencies > > The above means that the merge bot now can express a bit more complicated > merges, such as "only merge the branch `feature` into branch `demo` if the merge > of branch `feature-vm` into branch `feature` _and_ the merge of branch > `feature-lang` into branch `feature` succeeded". > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 2dca7b7f Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/2dca7b7f Stats: 240 lines in 3 files changed: 0 ins; 233 del; 7 mod merge-bot: allow specs to define dependencies Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/600 From rwestberg at openjdk.java.net Mon Apr 27 13:45:18 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 27 Apr 2020 13:45:18 GMT Subject: [Integrated] RFR: Python 3 compatibility for mercurial extension In-Reply-To: References: Message-ID: On Wed, 22 Apr 2020 08:28:46 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that makes the mercurial extension python 3 compatible. > > Best regards, > Robin This pull request has now been integrated. Changeset: 0c381067 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/0c381067 Stats: 28 lines in 1 file changed: 0 ins; 0 del; 28 mod Python 3 compatibility for mercurial extension Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/593 From ehelin at openjdk.java.net Mon Apr 27 13:44:46 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 27 Apr 2020 13:44:46 GMT Subject: [Integrated] RFR: skara: add aliases for publish and proxy In-Reply-To: References: Message-ID: On Thu, 16 Apr 2020 14:44:26 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that aliases for `git-publish` and `git-proxy` > to `skara.gitconfig`. > > Testing: > - Manual testing of `git publish` and `git proxy` > > Thanks, > Erik This pull request has now been integrated. Changeset: b60f393c Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/b60f393c Stats: 5 lines in 2 files changed: 0 ins; 3 del; 2 mod skara: add aliases for publish and proxy Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/587 From rwestberg at openjdk.java.net Tue Apr 28 04:30:43 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 04:30:43 GMT Subject: RFR: Avoid posting integrated notices for old RFR threads Message-ID: Hi all, Please review this change that checks for a "legacy" integration notice before posting an integration notice again, to improve the transition from the old notifier to the new one. Best regards, Robin ------------- Commit messages: - Avoid posting integrated notices for old RFR threads Changes: https://git.openjdk.java.net/skara/pull/607/files Webrev: https://webrevs.openjdk.java.net/skara/607/webrev.00 Stats: 88 lines in 2 files changed: 85 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/607.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/607/head:pull/607 PR: https://git.openjdk.java.net/skara/pull/607 From rwestberg at openjdk.java.net Tue Apr 28 04:32:19 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 04:32:19 GMT Subject: RFR: Improve error message for non-authors creating Merge PRs Message-ID: Hi all, Please review this small change that improves the error message when a non-author tries to create a Merge PR. Best regards, Robin ------------- Commit messages: - Improve error message Changes: https://git.openjdk.java.net/skara/pull/608/files Webrev: https://webrevs.openjdk.java.net/skara/608/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/608.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/608/head:pull/608 PR: https://git.openjdk.java.net/skara/pull/608 From ehelin at openjdk.java.net Tue Apr 28 04:43:11 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Apr 2020 04:43:11 GMT Subject: RFR: Avoid posting integrated notices for old RFR threads In-Reply-To: References: Message-ID: On Tue, 28 Apr 2020 04:26:58 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that checks for a "legacy" integration notice before posting an integration notice again, to > improve the transition from the old notifier to the new one. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/607 From ehelin at openjdk.java.net Tue Apr 28 04:43:51 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Apr 2020 04:43:51 GMT Subject: RFR: Improve error message for non-authors creating Merge PRs In-Reply-To: References: Message-ID: On Tue, 28 Apr 2020 04:28:52 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that improves the error message when a non-author tries to create a Merge PR. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/608 From rwestberg at openjdk.java.net Tue Apr 28 04:44:45 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 04:44:45 GMT Subject: [Integrated] RFR: Avoid posting integrated notices for old RFR threads In-Reply-To: References: Message-ID: <735bf63d-7556-40c8-90ef-dae27b3aa82b@openjdk.org> Changeset: 364d5fb6 Author: Robin Westberg Date: 2020-04-28 04:44:29 +0000 URL: https://git.openjdk.java.net/skara/commit/364d5fb6 Avoid posting integrated notices for old RFR threads Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java From rwestberg at openjdk.java.net Tue Apr 28 04:55:03 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 04:55:03 GMT Subject: [Integrated] RFR: 374: Do not show integration message when PR has merge conflict In-Reply-To: <-X--C3AQ9Y46jN4HmivOWbpAlTBPa27GVrtQrRGifyA=.1cc993c4-a3ef-45c7-a384-488f7fd9ee9c@github.com> References: <-X--C3AQ9Y46jN4HmivOWbpAlTBPa27GVrtQrRGifyA=.1cc993c4-a3ef-45c7-a384-488f7fd9ee9c@github.com> Message-ID: On Mon, 20 Apr 2020 09:03:20 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that waits with posting the integration ready message if a PR has a merge conflict. > > Best regards, > Robin This pull request has now been integrated. Changeset: 7b79f857 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/7b79f857 Stats: 30 lines in 2 files changed: 10 ins; 0 del; 20 mod 374: Do not show integration message when PR has merge conflict Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/590 From ehelin at openjdk.java.net Tue Apr 28 04:55:07 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Apr 2020 04:55:07 GMT Subject: [Integrated] RFR: cli: add git-proxy tool In-Reply-To: References: Message-ID: On Thu, 16 Apr 2020 11:57:39 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a small new tool: `git-proxy`. `git-proxy` > can be used to set up the `HTTPS_PROXY` and `HTTP_PROXY` environment > variables based on either the `http.proxy` configuration setting or the `-c > http.proxy=` argument. Finally `git-proxy` will also set up the > `GIT_SSH_COMMAND` environment variable to use the `CONNECT` method for tunneling > SSH over an HTTP proxy. > > Testing: > - manual testing of `git-proxy` > - `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 87aeddea Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/87aeddea Stats: 158 lines in 3 files changed: 0 ins; 157 del; 1 mod cli: add git-proxy tool Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/585 From rwestberg at openjdk.java.net Tue Apr 28 04:54:46 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 04:54:46 GMT Subject: [Integrated] RFR: Avoid posting integrated notices for old RFR threads In-Reply-To: References: Message-ID: On Tue, 28 Apr 2020 04:26:58 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that checks for a "legacy" integration notice before posting an integration notice again, to > improve the transition from the old notifier to the new one. > Best regards, > Robin This pull request has now been integrated. Changeset: 364d5fb6 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/364d5fb6 Stats: 88 lines in 2 files changed: 0 ins; 85 del; 3 mod Avoid posting integrated notices for old RFR threads Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/607 From ehelin at openjdk.java.net Tue Apr 28 04:54:58 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Apr 2020 04:54:58 GMT Subject: [Integrated] RFR: skara: add hint about help for commands In-Reply-To: References: Message-ID: On Thu, 23 Apr 2020 09:35:08 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds information on how to show more help > for individual commands to `git skara help`. > > Testing: > - Manually running `git skara help` > > Thanks, > Erik This pull request has now been integrated. Changeset: 341fcfee Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/341fcfee Stats: 4 lines in 1 file changed: 0 ins; 4 del; 0 mod skara: add hint about help for commands Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/596 From rwestberg at openjdk.java.net Tue Apr 28 04:55:10 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 04:55:10 GMT Subject: [Integrated] RFR: 362: Only amend merge commits that has the target branch as parent In-Reply-To: References: Message-ID: <4a5QLUMaQh7m5k5dNEF5RtIKnAqG-ic5JWQJVxbRsjI=.79220fa4-427b-48fc-a39f-a38dccf53cb0@github.com> On Thu, 16 Apr 2020 10:17:20 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that avoids performing automatic rebasing of Merge PRs, as that doesn't work correctly in all > cases. > Best regards, > Robin This pull request has now been integrated. Changeset: fed35009 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/fed35009 Stats: 37 lines in 4 files changed: 0 ins; 22 del; 15 mod 362: Only amend merge commits that has the target branch as parent Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/584 From rwestberg at openjdk.java.net Tue Apr 28 04:54:55 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 04:54:55 GMT Subject: [Integrated] RFR: 382: List commits that have been pushed in integration message In-Reply-To: References: Message-ID: On Mon, 27 Apr 2020 08:57:05 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that lists the commits that have been pushed since the PR was created (up to 10). > > Best regards, > Robin This pull request has now been integrated. Changeset: 9bf3f5cb Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/9bf3f5cb Stats: 36 lines in 7 files changed: 0 ins; 30 del; 6 mod 382: List commits that have been pushed in integration message Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/602 From rwestberg at openjdk.java.net Tue Apr 28 04:55:30 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 04:55:30 GMT Subject: [Integrated] RFR: 360: Always show instructions for atomic integrations In-Reply-To: References: Message-ID: On Wed, 15 Apr 2020 11:14:39 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that always shows the option of making an atomic (no automatic rebase) integration. > > Best regards, > Robin This pull request has now been integrated. Changeset: f6d9f4e2 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/f6d9f4e2 Stats: 17 lines in 2 files changed: 0 ins; 11 del; 6 mod 360: Always show instructions for atomic integrations Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/581 From ehelin at openjdk.java.net Tue Apr 28 04:55:19 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Apr 2020 04:55:19 GMT Subject: [Integrated] RFR: mirror-bot: use to repo to restrict concurrency In-Reply-To: References: Message-ID: On Wed, 22 Apr 2020 10:00:05 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the mirror bot use the `to` repository for > determining if whether multiple mirror work items can run concurrently. This > means the also must the `to` directory for creating its storage. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 65cf0c47 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/65cf0c47 Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod mirror-bot: use to repo to restrict concurrency Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/594 From rwestberg at openjdk.java.net Tue Apr 28 04:55:41 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 04:55:41 GMT Subject: [Integrated] RFR: Improve handling of squash and rebase of PRs In-Reply-To: References: Message-ID: On Fri, 17 Apr 2020 15:22:26 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that improves how we perform squashing and rebasing before doing the final integration. > Instead of using squash / rebase, simply merge the latest state of the target branch. Use the final state (tree) to > create the commit, and specify the proper parents. This has the benefit of working for merge PRs as well. Best regards, > Robin This pull request has now been integrated. Changeset: 15cf5f69 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/15cf5f69 Stats: 437 lines in 12 files changed: 132 ins; 265 del; 40 mod Improve handling of squash and rebase of PRs Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/589 From rwestberg at openjdk.java.net Tue Apr 28 05:01:11 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 05:01:11 GMT Subject: [Integrated] RFR: Improve error message for non-authors creating Merge PRs In-Reply-To: References: Message-ID: On Tue, 28 Apr 2020 04:28:52 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that improves the error message when a non-author tries to create a Merge PR. > > Best regards, > Robin This pull request has now been integrated. Changeset: 1a0aaa61 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/1a0aaa61 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Improve error message for non-authors creating Merge PRs Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/608 From rwestberg at openjdk.java.net Tue Apr 28 05:32:16 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 05:32:16 GMT Subject: RFR: Proper detection of legacy integration comment Message-ID: Hi all, Please review this small change that updates the legacy integration pattern to match all forms of previously posted comments. Best regards, Robin ------------- Commit messages: - Take optional markdown escapes into account Changes: https://git.openjdk.java.net/skara/pull/609/files Webrev: https://webrevs.openjdk.java.net/skara/609/webrev.00 Stats: 3 lines in 2 files changed: 0 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/609.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/609/head:pull/609 PR: https://git.openjdk.java.net/skara/pull/609 From duke at openjdk.java.net Tue Apr 28 06:35:15 2020 From: duke at openjdk.java.net (J.Duke) Date: Tue, 28 Apr 2020 06:35:15 GMT Subject: RFR: Proper detection of legacy integration comment In-Reply-To: References: Message-ID: On Tue, 28 Apr 2020 05:28:23 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that updates the legacy integration pattern to match all forms of previously posted > comments. > Best regards, > Robin Looks good! ------------- Marked as reviewed by duke (no project role). PR: https://git.openjdk.java.net/skara/pull/609 From ehelin at openjdk.java.net Tue Apr 28 06:50:35 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Apr 2020 06:50:35 GMT Subject: RFR: Proper detection of legacy integration comment In-Reply-To: References: Message-ID: On Tue, 28 Apr 2020 05:28:23 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that updates the legacy integration pattern to match all forms of previously posted > comments. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/609 From rwestberg at openjdk.java.net Tue Apr 28 06:58:15 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 06:58:15 GMT Subject: [Integrated] RFR: Proper detection of legacy integration comment In-Reply-To: References: Message-ID: On Tue, 28 Apr 2020 05:28:23 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that updates the legacy integration pattern to match all forms of previously posted > comments. > Best regards, > Robin This pull request has now been integrated. Changeset: b2ea62e5 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/b2ea62e5 Stats: 3 lines in 2 files changed: 0 ins; 0 del; 3 mod Proper detection of legacy integration comment Reviewed-by: duke, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/609 From ehelin at openjdk.java.net Tue Apr 28 09:30:33 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Apr 2020 09:30:33 GMT Subject: RFR: 365: Allows "merge style" PRs to have title of "Merge repo:tag" In-Reply-To: References: Message-ID: <3lBuAJdDiM6onhI_cAXHwCEIfILd9ScI2KkoOin1ByU=.c6b4cd90-ebd6-4082-99ef-bd2e9274490c@github.com> On Tue, 28 Apr 2020 09:24:22 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that improves the merge sourcing for merge PRs and allows tags to be used as a source. > > Best regards, > Robin Very nice patch, looks great! ?? ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/610 From rwestberg at openjdk.java.net Tue Apr 28 09:30:33 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 09:30:33 GMT Subject: RFR: 365: Allows "merge style" PRs to have title of "Merge repo:tag" Message-ID: Hi all, Please review this change that improves the merge sourcing for merge PRs and allows tags to be used as a source. Best regards, Robin ------------- Commit messages: - Improve merge source parsing, add tag support Changes: https://git.openjdk.java.net/skara/pull/610/files Webrev: https://webrevs.openjdk.java.net/skara/610/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-365 Stats: 176 lines in 3 files changed: 119 ins; 30 del; 27 mod Patch: https://git.openjdk.java.net/skara/pull/610.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/610/head:pull/610 PR: https://git.openjdk.java.net/skara/pull/610 From rwestberg at openjdk.java.net Tue Apr 28 09:35:47 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 09:35:47 GMT Subject: [Integrated] RFR: 365: Allows "merge style" PRs to have title of "Merge repo:tag" In-Reply-To: References: Message-ID: On Tue, 28 Apr 2020 09:24:22 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that improves the merge sourcing for merge PRs and allows tags to be used as a source. > > Best regards, > Robin This pull request has now been integrated. Changeset: 572b1c48 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/572b1c48 Stats: 176 lines in 3 files changed: 30 ins; 119 del; 27 mod 365: Allows "merge style" PRs to have title of "Merge repo:tag" Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/610 From rwestberg at openjdk.java.net Tue Apr 28 10:14:16 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 10:14:16 GMT Subject: RFR: Use a simpler way to detect legacy notifications Message-ID: Hi all, Please review this small change that uses a more robust way to detect if a commit in a PR has been served by the old mailing list notifier. Best regards, Robin ------------- Commit messages: - Use a simpler way to detect when a legacy notification could have been issued Changes: https://git.openjdk.java.net/skara/pull/611/files Webrev: https://webrevs.openjdk.java.net/skara/611/webrev.00 Stats: 20 lines in 2 files changed: 4 ins; 8 del; 8 mod Patch: https://git.openjdk.java.net/skara/pull/611.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/611/head:pull/611 PR: https://git.openjdk.java.net/skara/pull/611 From ehelin at openjdk.java.net Tue Apr 28 11:27:07 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Apr 2020 11:27:07 GMT Subject: RFR: Use a simpler way to detect legacy notifications In-Reply-To: References: Message-ID: On Tue, 28 Apr 2020 10:10:39 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that uses a more robust way to detect if a commit in a PR has been served by the old > mailing list notifier. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/611 From rwestberg at openjdk.java.net Tue Apr 28 11:30:27 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 11:30:27 GMT Subject: [Integrated] RFR: Use a simpler way to detect legacy notifications In-Reply-To: References: Message-ID: On Tue, 28 Apr 2020 10:10:39 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that uses a more robust way to detect if a commit in a PR has been served by the old > mailing list notifier. > Best regards, > Robin This pull request has now been integrated. Changeset: 9bf5625d Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/9bf5625d Stats: 20 lines in 2 files changed: 8 ins; 4 del; 8 mod Use a simpler way to detect legacy notifications Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/611 From ehelin at openjdk.java.net Tue Apr 28 13:55:30 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Apr 2020 13:55:30 GMT Subject: RFR: trees: add treconfigure command Message-ID: <8-igbkgPrAlDGUTJwLteXzT1vpdQsxx4AFKq2vkf3Kk=.3aa61abb-554f-4a96-98ec-fe3f59352ff6@github.com> Hi all, please review this patch that adds the `hg/git treconfigure` command. The `treconfigure` can be used to re-initialize the trees configuration for a set of repositories. This is useful when a user has, either by mistake or on purpose, renamed and/or moved a repository in a "forest". _Note_: the existing `trees.py` extension offered the command `hg tconfig`, but that command clashes with the `config` command present in both `hg` and `git` (a user can't run the command `config` in all repositories in a "forest"). For the Skara port of `trees.py` I opted to instead provide the `treconfigure` command to avoid name clashes. Testing: - Manual testing of `git treconfigure` and `hg treconfigure` Thanks, Erik ------------- Commit messages: - trees: add treconfigure command Changes: https://git.openjdk.java.net/skara/pull/612/files Webrev: https://webrevs.openjdk.java.net/skara/612/webrev.00 Stats: 60 lines in 3 files changed: 56 ins; 1 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/612.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/612/head:pull/612 PR: https://git.openjdk.java.net/skara/pull/612 From rwestberg at openjdk.java.net Tue Apr 28 14:17:42 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 28 Apr 2020 14:17:42 GMT Subject: RFR: trees: add treconfigure command In-Reply-To: <8-igbkgPrAlDGUTJwLteXzT1vpdQsxx4AFKq2vkf3Kk=.3aa61abb-554f-4a96-98ec-fe3f59352ff6@github.com> References: <8-igbkgPrAlDGUTJwLteXzT1vpdQsxx4AFKq2vkf3Kk=.3aa61abb-554f-4a96-98ec-fe3f59352ff6@github.com> Message-ID: On Tue, 28 Apr 2020 13:51:55 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `hg/git treconfigure` command. The > `treconfigure` can be used to re-initialize the trees configuration for a set of > repositories. This is useful when a user has, either by mistake or on purpose, > renamed and/or moved a repository in a "forest". > > _Note_: the existing `trees.py` extension offered the command `hg tconfig`, but > that command clashes with the `config` command present in both `hg` and `git` (a > user can't run the command `config` in all repositories in a "forest"). For the > Skara port of `trees.py` I opted to instead provide the `treconfigure` command > to avoid name clashes. > > Testing: > - Manual testing of `git treconfigure` and `hg treconfigure` > > Thanks, > Erik Tr?s bien! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/612 From ehelin at openjdk.java.net Tue Apr 28 14:58:32 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 28 Apr 2020 14:58:32 GMT Subject: [Integrated] RFR: trees: add treconfigure command In-Reply-To: <8-igbkgPrAlDGUTJwLteXzT1vpdQsxx4AFKq2vkf3Kk=.3aa61abb-554f-4a96-98ec-fe3f59352ff6@github.com> References: <8-igbkgPrAlDGUTJwLteXzT1vpdQsxx4AFKq2vkf3Kk=.3aa61abb-554f-4a96-98ec-fe3f59352ff6@github.com> Message-ID: On Tue, 28 Apr 2020 13:51:55 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `hg/git treconfigure` command. The > `treconfigure` can be used to re-initialize the trees configuration for a set of > repositories. This is useful when a user has, either by mistake or on purpose, > renamed and/or moved a repository in a "forest". > > _Note_: the existing `trees.py` extension offered the command `hg tconfig`, but > that command clashes with the `config` command present in both `hg` and `git` (a > user can't run the command `config` in all repositories in a "forest"). For the > Skara port of `trees.py` I opted to instead provide the `treconfigure` command > to avoid name clashes. > > Testing: > - Manual testing of `git treconfigure` and `hg treconfigure` > > Thanks, > Erik This pull request has now been integrated. Changeset: 735d0a6c Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/735d0a6c Stats: 60 lines in 3 files changed: 1 ins; 56 del; 3 mod trees: add treconfigure command Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/612 From ehelin at openjdk.java.net Wed Apr 29 06:53:25 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 29 Apr 2020 06:53:25 GMT Subject: RFR: build: update JUnit to 5.6.2 Message-ID: Hi all, please review this patch that updates JUnit (API and engine) to 5.6.2 and JUnit platform to 1.6.2. Testing: - `sh gradlew test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - build: update JUnit to 5.6.2 Changes: https://git.openjdk.java.net/skara/pull/613/files Webrev: https://webrevs.openjdk.java.net/skara/613/webrev.00 Stats: 7 lines in 2 files changed: 0 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/613.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/613/head:pull/613 PR: https://git.openjdk.java.net/skara/pull/613 From ehelin at openjdk.java.net Wed Apr 29 07:23:33 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 29 Apr 2020 07:23:33 GMT Subject: [Integrated] RFR: build: update JUnit to 5.6.2 In-Reply-To: References: Message-ID: On Wed, 29 Apr 2020 06:49:25 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates JUnit (API and engine) to 5.6.2 and JUnit > platform to 1.6.2. > > Testing: > - `sh gradlew test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: ad1bc216 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/ad1bc216 Stats: 7 lines in 2 files changed: 0 ins; 0 del; 7 mod build: update JUnit to 5.6.2 Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/613 From rwestberg at openjdk.java.net Wed Apr 29 07:23:33 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 29 Apr 2020 07:23:33 GMT Subject: RFR: build: update JUnit to 5.6.2 In-Reply-To: References: Message-ID: <2ksp1VuAelOiEY0b2l6EayiQdYcAAjUMwaNkYaAIgfA=.568fefb5-51a9-4de7-b262-f91b41b38eb8@github.com> On Wed, 29 Apr 2020 06:49:25 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates JUnit (API and engine) to 5.6.2 and JUnit > platform to 1.6.2. > > Testing: > - `sh gradlew test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/613 From ehelin at openjdk.java.net Wed Apr 29 07:45:55 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 29 Apr 2020 07:45:55 GMT Subject: RFR: build: update to Gradle 6.3 Message-ID: Hi all, please review this patch that updates Gradle to version 6.3. Testing: - `sh gradlew images` - `sh gradlew test` Thanks, Erik ------------- Commit messages: - build: update to Gradle 6.3 Changes: https://git.openjdk.java.net/skara/pull/614/files Webrev: https://webrevs.openjdk.java.net/skara/614/webrev.00 Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/614.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/614/head:pull/614 PR: https://git.openjdk.java.net/skara/pull/614 From rwestberg at openjdk.java.net Wed Apr 29 07:45:55 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 29 Apr 2020 07:45:55 GMT Subject: RFR: build: update to Gradle 6.3 In-Reply-To: References: Message-ID: On Wed, 29 Apr 2020 07:41:07 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates Gradle to version 6.3. > > Testing: > - `sh gradlew images` > - `sh gradlew test` > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/614 From ehelin at openjdk.java.net Wed Apr 29 07:49:41 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 29 Apr 2020 07:49:41 GMT Subject: [Integrated] RFR: build: update to Gradle 6.3 In-Reply-To: References: Message-ID: On Wed, 29 Apr 2020 07:41:07 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates Gradle to version 6.3. > > Testing: > - `sh gradlew images` > - `sh gradlew test` > > Thanks, > Erik This pull request has now been integrated. Changeset: 25e653db Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/25e653db Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod build: update to Gradle 6.3 Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/614 From ehelin at openjdk.java.net Wed Apr 29 08:54:31 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 29 Apr 2020 08:54:31 GMT Subject: RFR: build: update to JDK 14.0.1 Message-ID: Hi all, please review this patch that updates the JDK for Skara to version 14.0.1. Testing: - `sh gradlew images` - `sh gradlew test` Thanks, Erik ------------- Commit messages: - build: update to JDK 14.0.1 Changes: https://git.openjdk.java.net/skara/pull/615/files Webrev: https://webrevs.openjdk.java.net/skara/615/webrev.00 Stats: 14 lines in 3 files changed: 0 ins; 0 del; 14 mod Patch: https://git.openjdk.java.net/skara/pull/615.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/615/head:pull/615 PR: https://git.openjdk.java.net/skara/pull/615 From rwestberg at openjdk.java.net Wed Apr 29 08:54:31 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 29 Apr 2020 08:54:31 GMT Subject: RFR: build: update to JDK 14.0.1 In-Reply-To: References: Message-ID: On Wed, 29 Apr 2020 08:49:52 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates the JDK for Skara to version 14.0.1. > > Testing: > - `sh gradlew images` > - `sh gradlew test` > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/615 From ehelin at openjdk.java.net Wed Apr 29 09:02:11 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 29 Apr 2020 09:02:11 GMT Subject: [Integrated] RFR: build: update to JDK 14.0.1 In-Reply-To: References: Message-ID: On Wed, 29 Apr 2020 08:49:52 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates the JDK for Skara to version 14.0.1. > > Testing: > - `sh gradlew images` > - `sh gradlew test` > > Thanks, > Erik This pull request has now been integrated. Changeset: b63ea1c9 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/b63ea1c9 Stats: 14 lines in 3 files changed: 0 ins; 0 del; 14 mod build: update to JDK 14.0.1 Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/615 From joe.darcy at oracle.com Thu Apr 30 23:15:28 2020 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 30 Apr 2020 16:15:28 -0700 Subject: Invitation to Project Skara update, Thursday May 7, 2020 at 8:30 am PST (UTC-8) / 4:30 pm GMT (UTC+0) / 5:30 pm CET (UTC+1) Message-ID: <883c0164-cdef-af90-6c42-74ab9277058b@oracle.com> Hello, Project Skara has been investigating migrating from Mercurial to Git for the OpenJDK Community's source code management needs. [1] Please join the Skara team for an update on this work on Thursday May 7 at ???? 8:30 am PST (UTC-8) / 4:30 pm GMT (UTC+0) / 5:30 pm CET (UTC+1) The update will discuss OpenJDK projects that have transitioned to using the Skara tooling, features of that tooling, and the future roadmap. The meeting will be hosted on Zoom; connection details below. Cheers, -Joe [1] https://wiki.openjdk.java.net/display/SKARA; also see JEPs, JEP 357: "Migrate from Mercurial to Git" (http://openjdk.java.net/jeps/357) and JEP 369: "Migrate to GitHub." (http://openjdk.java.net/jeps/369). -=-=-=-=-=- Topic: Project Skara Update Time: May 7, 2020 08:30 AM Pacific Time (US and Canada) Single click URL to join Zoom: https://oracle.zoom.us/j/95373614916?pwd=NzlXZTllZExWMkh2bDhzOUlDV1BsZz09 Meeting ID: 953 7361 4916 Password: 012487 One tap mobile +16699006833,,95373614916# US (San Jose) +12532158782,,95373614916# US (Tacoma) Dial by your location ??????? +1 669 900 6833 US (San Jose) ??????? +1 253 215 8782 US (Tacoma) ??????? +1 346 248 7799 US (Houston) ??????? +1 301 715 8592 US (Germantown) ??????? +1 312 626 6799 US (Chicago) ??????? +1 646 558 8656 US (New York) Meeting ID: 953 7361 4916 Password: 012487 Find your local number: https://oracle.zoom.us/u/a2RlbxyZ4 Join by SIP 95373614916 at zoomcrc.com Join by H.323 162.255.37.11 (US West) 162.255.36.11 (US East) 115.114.131.7 (India Mumbai) 115.114.115.7 (India Hyderabad) 213.19.144.110 (EMEA) 103.122.166.55 (Australia) 209.9.211.110 (Hong Kong ?China) 64.211.144.160 (Brazil) 69.174.57.160 (Canada) 207.226.132.110 (Japan) Meeting ID: 953 7361 4916 Password: 012487