From github.com+5106647+oscerd at openjdk.java.net Mon Feb 1 14:59:41 2021 From: github.com+5106647+oscerd at openjdk.java.net (Andrea Cosentino) Date: Mon, 1 Feb 2021 14:59:41 GMT Subject: RFR: Build: Update to JDK 15.0.2 Message-ID: Hello all, Just a little PR for upgrading to JDK 15.0.2. make images passed fine and make test too. Thank you ------------- Commit messages: - Build: Update to JDK 15.0.2 Changes: https://git.openjdk.java.net/skara/pull/989/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=989&range=00 Stats: 14 lines in 3 files changed: 0 ins; 0 del; 14 mod Patch: https://git.openjdk.java.net/skara/pull/989.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/989/head:pull/989 PR: https://git.openjdk.java.net/skara/pull/989 From github.com+5106647+oscerd at openjdk.java.net Mon Feb 1 14:59:42 2021 From: github.com+5106647+oscerd at openjdk.java.net (Andrea Cosentino) Date: Mon, 1 Feb 2021 14:59:42 GMT Subject: RFR: Build: Update to JDK 15.0.2 In-Reply-To: References: Message-ID: On Wed, 20 Jan 2021 17:40:45 GMT, Andrea Cosentino wrote: > Hello all, > > Just a little PR for upgrading to JDK 15.0.2. > > make images passed fine and make test too. > > Thank you I believe I'm covered under the blanket Red Hat agreement ------------- PR: https://git.openjdk.java.net/skara/pull/989 From github.com+5106647+oscerd at openjdk.java.net Mon Feb 1 14:59:42 2021 From: github.com+5106647+oscerd at openjdk.java.net (Andrea Cosentino) Date: Mon, 1 Feb 2021 14:59:42 GMT Subject: RFR: Build: Update to JDK 15.0.2 In-Reply-To: References: Message-ID: <8unQVlbL9bxE-Bs409zTdS7_VtqcBN0f1P-Jm40Pxaw=.7aa53ffe-1d1f-42a6-9d7d-51d18b574e7e@github.com> On Wed, 20 Jan 2021 18:19:23 GMT, Andrea Cosentino wrote: >> Hello all, >> >> Just a little PR for upgrading to JDK 15.0.2. >> >> make images passed fine and make test too. >> >> Thank you > > I believe I'm covered under the blanket Red Hat agreement Am I supposed to do something now? ------------- PR: https://git.openjdk.java.net/skara/pull/989 From github.com+28612+gunnarmorling at openjdk.java.net Mon Feb 1 14:59:42 2021 From: github.com+28612+gunnarmorling at openjdk.java.net (Gunnar Morling) Date: Mon, 1 Feb 2021 14:59:42 GMT Subject: RFR: Build: Update to JDK 15.0.2 In-Reply-To: <8unQVlbL9bxE-Bs409zTdS7_VtqcBN0f1P-Jm40Pxaw=.7aa53ffe-1d1f-42a6-9d7d-51d18b574e7e@github.com> References: <8unQVlbL9bxE-Bs409zTdS7_VtqcBN0f1P-Jm40Pxaw=.7aa53ffe-1d1f-42a6-9d7d-51d18b574e7e@github.com> Message-ID: On Thu, 28 Jan 2021 18:07:35 GMT, Andrea Cosentino wrote: >> I believe I'm covered under the blanket Red Hat agreement > > Am I supposed to do something now? Hey @robilad, could you kick off the OCA verification for fellow Red Hatter @oscerd? ------------- PR: https://git.openjdk.java.net/skara/pull/989 From github.com+5106647+oscerd at openjdk.java.net Mon Feb 1 14:59:42 2021 From: github.com+5106647+oscerd at openjdk.java.net (Andrea Cosentino) Date: Mon, 1 Feb 2021 14:59:42 GMT Subject: RFR: Build: Update to JDK 15.0.2 In-Reply-To: References: <8unQVlbL9bxE-Bs409zTdS7_VtqcBN0f1P-Jm40Pxaw=.7aa53ffe-1d1f-42a6-9d7d-51d18b574e7e@github.com> Message-ID: On Fri, 29 Jan 2021 13:50:19 GMT, Gunnar Morling wrote: >> Am I supposed to do something now? > > Hey @robilad, could you kick off the OCA verification for fellow Red Hatter @oscerd? Thanks @gunnarmorling :-) ------------- PR: https://git.openjdk.java.net/skara/pull/989 From robilad at openjdk.java.net Mon Feb 1 15:06:06 2021 From: robilad at openjdk.java.net (Dalibor Topic) Date: Mon, 1 Feb 2021 15:06:06 GMT Subject: RFR: Build: Update to JDK 15.0.2 In-Reply-To: References: <8unQVlbL9bxE-Bs409zTdS7_VtqcBN0f1P-Jm40Pxaw=.7aa53ffe-1d1f-42a6-9d7d-51d18b574e7e@github.com> Message-ID: On Fri, 29 Jan 2021 13:50:49 GMT, Andrea Cosentino wrote: >> Hey @robilad, could you kick off the OCA verification for fellow Red Hatter @oscerd? > > Thanks @gunnarmorling :-) Thanks, I have marked the account as verified. ------------- PR: https://git.openjdk.java.net/skara/pull/989 From ehelin at openjdk.java.net Tue Feb 2 11:44:35 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 2 Feb 2021 11:44:35 GMT Subject: RFR: Build: Update to JDK 15.0.2 In-Reply-To: References: <8unQVlbL9bxE-Bs409zTdS7_VtqcBN0f1P-Jm40Pxaw=.7aa53ffe-1d1f-42a6-9d7d-51d18b574e7e@github.com> Message-ID: On Fri, 29 Jan 2021 13:50:49 GMT, Andrea Cosentino wrote: >> Hey @robilad, could you kick off the OCA verification for fellow Red Hatter @oscerd? > > Thanks @gunnarmorling :-) Thanks for contributing @oscerd! Would you mind enabling GitHub Actions in your [fork](https://github.com/oscerd/skara/actions) so that the CI tests can be run? Thanks! Erik ------------- PR: https://git.openjdk.java.net/skara/pull/989 From github.com+5106647+oscerd at openjdk.java.net Tue Feb 2 11:44:35 2021 From: github.com+5106647+oscerd at openjdk.java.net (Andrea Cosentino) Date: Tue, 2 Feb 2021 11:44:35 GMT Subject: RFR: Build: Update to JDK 15.0.2 In-Reply-To: References: <8unQVlbL9bxE-Bs409zTdS7_VtqcBN0f1P-Jm40Pxaw=.7aa53ffe-1d1f-42a6-9d7d-51d18b574e7e@github.com> Message-ID: On Tue, 2 Feb 2021 10:52:40 GMT, Erik Helin wrote: >> Thanks @gunnarmorling :-) > > Thanks for contributing @oscerd! Would you mind enabling GitHub Actions in your [fork](https://github.com/oscerd/skara/actions) so that the CI tests can be run? > > Thanks! > Erik @edvbld Done ------------- PR: https://git.openjdk.java.net/skara/pull/989 From github.com+5106647+oscerd at openjdk.java.net Tue Feb 2 11:44:35 2021 From: github.com+5106647+oscerd at openjdk.java.net (Andrea Cosentino) Date: Tue, 2 Feb 2021 11:44:35 GMT Subject: RFR: Build: Update to JDK 15.0.2 In-Reply-To: References: <8unQVlbL9bxE-Bs409zTdS7_VtqcBN0f1P-Jm40Pxaw=.7aa53ffe-1d1f-42a6-9d7d-51d18b574e7e@github.com> Message-ID: On Tue, 2 Feb 2021 10:53:47 GMT, Andrea Cosentino wrote: >> Thanks for contributing @oscerd! Would you mind enabling GitHub Actions in your [fork](https://github.com/oscerd/skara/actions) so that the CI tests can be run? >> >> Thanks! >> Erik > > @edvbld Done I don't know if there is something else to do on my side. ------------- PR: https://git.openjdk.java.net/skara/pull/989 From ihse at openjdk.java.net Tue Feb 2 12:16:09 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 2 Feb 2021 12:16:09 GMT Subject: RFR: 868: Skara should ignore .gitconfig and /etc/gitconfig Message-ID: Skara is already ignoring .hgrc for mercurial, but the corresponding solution for git was never put in place. I also fixed a problem where an error condition would cause an infinite loop, which I ran into during testing. ------------- Commit messages: - 868: Skara should ignore .gitconfig and /etc/gitconfig Changes: https://git.openjdk.java.net/skara/pull/997/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=997&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-868 Stats: 48 lines in 5 files changed: 40 ins; 0 del; 8 mod Patch: https://git.openjdk.java.net/skara/pull/997.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/997/head:pull/997 PR: https://git.openjdk.java.net/skara/pull/997 From ehelin at openjdk.java.net Tue Feb 2 13:25:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 2 Feb 2021 13:25:45 GMT Subject: RFR: 868: Skara should ignore .gitconfig and /etc/gitconfig In-Reply-To: References: Message-ID: On Tue, 2 Feb 2021 12:13:16 GMT, Magnus Ihse Bursie wrote: > Skara is already ignoring .hgrc for mercurial, but the corresponding solution for git was never put in place. > > I also fixed a problem where an error condition would cause an infinite loop, which I ran into during testing. @magicus thanks for contributing! What do you think about adding a unit test to `RepositoryTests.java`? ------------- PR: https://git.openjdk.java.net/skara/pull/997 From rwestberg at openjdk.java.net Tue Feb 2 13:40:28 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 2 Feb 2021 13:40:28 GMT Subject: RFR: Update the readme to include IntelliJ setup instructions Message-ID: Adds a section on how to build and test Skara using IntelliJ IDEA. ------------- Commit messages: - Update readme to include IntelliJ setup Changes: https://git.openjdk.java.net/skara/pull/998/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=998&range=00 Stats: 12 lines in 2 files changed: 10 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/998.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/998/head:pull/998 PR: https://git.openjdk.java.net/skara/pull/998 From rwestberg at openjdk.java.net Tue Feb 2 13:44:35 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 2 Feb 2021 13:44:35 GMT Subject: RFR: Update the readme to include IntelliJ setup instructions [v2] In-Reply-To: References: Message-ID: > Adds a section on how to build and test Skara using IntelliJ IDEA. Robin Westberg has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. The pull request contains one new commit since the last revision: Update readme to include IntelliJ setup ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/998/files - new: https://git.openjdk.java.net/skara/pull/998/files/16591a58..58f33fd7 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=998&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=998&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/998.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/998/head:pull/998 PR: https://git.openjdk.java.net/skara/pull/998 From ihse at openjdk.java.net Tue Feb 2 13:45:46 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 2 Feb 2021 13:45:46 GMT Subject: RFR: 868: Skara should ignore .gitconfig and /etc/gitconfig [v2] In-Reply-To: References: Message-ID: > Skara is already ignoring .hgrc for mercurial, but the corresponding solution for git was never put in place. > > I also fixed a problem where an error condition would cause an infinite loop, which I ran into during testing. Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: Empty commit to re-trigger GHA. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/997/files - new: https://git.openjdk.java.net/skara/pull/997/files/6b062d56..d7a13059 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=997&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=997&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/997.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/997/head:pull/997 PR: https://git.openjdk.java.net/skara/pull/997 From ihse at openjdk.java.net Tue Feb 2 13:53:03 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 2 Feb 2021 13:53:03 GMT Subject: RFR: 868: Skara should ignore .gitconfig and /etc/gitconfig In-Reply-To: References: Message-ID: On Tue, 2 Feb 2021 13:23:34 GMT, Erik Helin wrote: >> Skara is already ignoring .hgrc for mercurial, but the corresponding solution for git was never put in place. >> >> I also fixed a problem where an error condition would cause an infinite loop, which I ran into during testing. > > @magicus thanks for contributing! What do you think about adding a unit test to `RepositoryTests.java`? @edvbld What exactly do you propose to test in the unit test? This is really solving a problem with the environment -- the tests fail when I run as my user due to conflicting modifications in my `~/.gitconfig`. I can't really modify the users personal gitconfig file in a unit test. The only thing I could really think if is verifying that `git config -l` is empty. Hm, maybe that's a good idea... ------------- PR: https://git.openjdk.java.net/skara/pull/997 From ehelin at openjdk.java.net Tue Feb 2 13:55:19 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 2 Feb 2021 13:55:19 GMT Subject: RFR: Update the readme to include IntelliJ setup instructions [v2] In-Reply-To: References: Message-ID: On Tue, 2 Feb 2021 13:44:35 GMT, Robin Westberg wrote: >> Adds a section on how to build and test Skara using IntelliJ IDEA. > > Robin Westberg has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. The pull request contains one new commit since the last revision: > > Update readme to include IntelliJ setup README.md line 229: > 227: the terminal, which will download a suitable JDK. Configure IntelliJ to use it > 228: at `File?? Project Structure?? Platform Settings?? SDKs?? +?? Add > 229: JDK...???/.jdk/openjdk-15.0.1_osx-x64_bin/jdk-15.0.1.jdk/Contents/Home`. Maybe generalize this a bit for Windows and/or Linux users? Or just state something like "On macOS this would be configured like the following ..."? README.md line 226: > 224: IDE when working on Skara you can simply open the root folder and the project > 225: should be automatically imported. You will need to configure a Platform SDK that > 226: is JDK 14 or above. Either set this up manually, or [build](#building) once from We are using JDK 15 now ?? ------------- PR: https://git.openjdk.java.net/skara/pull/998 From rwestberg at openjdk.java.net Tue Feb 2 14:35:23 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 2 Feb 2021 14:35:23 GMT Subject: RFR: Update the readme to include IntelliJ setup instructions [v2] In-Reply-To: References: Message-ID: <8f4TmiOoEINivTFuc73Pf6Hz28ScBRTtYkQl912nBIg=.1dc0a090-7a1f-465c-9ae2-dc3d5198c5bd@github.com> On Tue, 2 Feb 2021 13:53:06 GMT, Erik Helin wrote: >> Robin Westberg has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. The pull request contains one new commit since the last revision: >> >> Update readme to include IntelliJ setup > > README.md line 226: > >> 224: IDE when working on Skara you can simply open the root folder and the project >> 225: should be automatically imported. You will need to configure a Platform SDK that >> 226: is JDK 14 or above. Either set this up manually, or [build](#building) once from > > We are using JDK 15 now ?? Sure, but the `Building` section still says that 14 or later is needed, and I guess that is still actually true. :) > README.md line 229: > >> 227: the terminal, which will download a suitable JDK. Configure IntelliJ to use it >> 228: at `File?? Project Structure?? Platform Settings?? SDKs?? +?? Add >> 229: JDK...???/.jdk/openjdk-15.0.1_osx-x64_bin/jdk-15.0.1.jdk/Contents/Home`. > > Maybe generalize this a bit for Windows and/or Linux users? Or just state something like "On macOS this would be configured like the following ..."? Makes sense, I'll reword it. ------------- PR: https://git.openjdk.java.net/skara/pull/998 From rwestberg at openjdk.java.net Tue Feb 2 16:00:36 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 2 Feb 2021 16:00:36 GMT Subject: RFR: Update the readme to include IntelliJ setup instructions [v3] In-Reply-To: References: Message-ID: > Adds a section on how to build and test Skara using IntelliJ IDEA. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Clarify JDK location ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/998/files - new: https://git.openjdk.java.net/skara/pull/998/files/58f33fd7..b75f0a86 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=998&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=998&range=01-02 Stats: 5 lines in 1 file changed: 3 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/998.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/998/head:pull/998 PR: https://git.openjdk.java.net/skara/pull/998 From ehelin at openjdk.java.net Tue Feb 2 18:04:06 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 2 Feb 2021 18:04:06 GMT Subject: RFR: checkout: fetch origin before checking out branch Message-ID: Hi all, please review this small patch that ensures that we fetches the remote `origin` before checking the source branch in the `checkout` bot. This is to ensure that the we have a local ref to the source branch in case we are are operating on a local Git repository that hasn't been updated in a while. Thanks, Erik ------------- Commit messages: - checkout: fetch origin before checking out branch Changes: https://git.openjdk.java.net/skara/pull/999/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=999&range=00 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/999.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/999/head:pull/999 PR: https://git.openjdk.java.net/skara/pull/999 From ehelin at openjdk.java.net Tue Feb 2 18:16:51 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 2 Feb 2021 18:16:51 GMT Subject: RFR: build: add convenience target for bots Message-ID: Hi all, please review this patch that adds a convenience target for building and extracting a image for the bots. A developer can now just run `sh gradlew bots` (or `make bots`) and find an extracted image under `bots/bin`. Testing: - [x] Tested locally on Linux x64 Thanks, Erik ------------- Commit messages: - build: add convenience target for bots Changes: https://git.openjdk.java.net/skara/pull/1000/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1000&range=00 Stats: 18 lines in 2 files changed: 17 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1000.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1000/head:pull/1000 PR: https://git.openjdk.java.net/skara/pull/1000 From rwestberg at openjdk.java.net Wed Feb 3 07:51:54 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 3 Feb 2021 07:51:54 GMT Subject: RFR: checkout: fetch origin before checking out branch In-Reply-To: References: Message-ID: On Tue, 2 Feb 2021 18:00:51 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that ensures that we fetches the remote `origin` before checking the source branch in the `checkout` bot. This is to ensure that the we have a local ref to the source branch in case we are are operating on a local Git repository that hasn't been updated in a while. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/999 From rwestberg at openjdk.java.net Wed Feb 3 07:52:51 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 3 Feb 2021 07:52:51 GMT Subject: RFR: build: add convenience target for bots In-Reply-To: References: Message-ID: On Tue, 2 Feb 2021 18:14:02 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a convenience target for building and extracting a image for the bots. A developer can now just run `sh gradlew bots` (or `make bots`) and find an extracted image under `bots/bin`. > > Testing: > - [x] Tested locally on Linux x64 > > Thanks, > Erik Looks good! And congratulations on pull request number 1000! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1000 From erik.helin at oracle.com Wed Feb 3 08:47:54 2021 From: erik.helin at oracle.com (Erik Helin) Date: Wed, 3 Feb 2021 09:47:54 +0100 Subject: CFV: New Skara Committer: Magnus Ihse Bursie Message-ID: I hereby nominate Magnus Ihse Bursie to Skara Committer. Magnus has contributed five patches to Skara [0], primarily fixing issues with CLI tools and libraries. Magnus has demonstrated a solid understanding of the Skara code and libraries, disciplined testing and of course brings many years of experience from his work in OpenJDK. Magnus is the lead of the build infrastructure project, is Reviewer in multiple other OpenJDK projects and is also an OpenJDK Member. Votes are due by Feb 17 09:00 AM UTC. Only current Skara Committers [1] are eligible to vote on this nomination. Votes must be cast in the open by replying to this mailing list. For Lazy Consensus voting instructions, see [2]. Erik [0] http://git.openjdk.java.net/skara [1] http://openjdk.java.net/census [2] http://openjdk.java.net/projects/#committer-vote From erik.helin at oracle.com Wed Feb 3 08:48:31 2021 From: erik.helin at oracle.com (Erik Helin) Date: Wed, 3 Feb 2021 09:48:31 +0100 Subject: CFV: New Skara Committer: Magnus Ihse Bursie In-Reply-To: References: Message-ID: Vote: yes Erik On 2/3/21 9:47 AM, Erik Helin wrote: > I hereby nominate Magnus Ihse Bursie to Skara Committer. > > Magnus has contributed five patches to Skara [0], primarily fixing > issues with CLI tools and libraries. Magnus has demonstrated a solid > understanding of the Skara code and libraries, disciplined testing and > of course brings many years of experience from his work in OpenJDK. > Magnus is the lead of the build infrastructure project, is Reviewer in > multiple other OpenJDK projects and is also an OpenJDK Member. > > Votes are due by Feb 17 09:00 AM UTC. > > Only current Skara Committers [1] are eligible to vote > on this nomination.? Votes must be cast in the open by replying > to this mailing list. > > For Lazy Consensus voting instructions, see [2]. > > Erik > > [0] http://git.openjdk.java.net/skara > [1] http://openjdk.java.net/census > [2] http://openjdk.java.net/projects/#committer-vote From robin.westberg at oracle.com Wed Feb 3 08:54:17 2021 From: robin.westberg at oracle.com (Robin Westberg) Date: Wed, 3 Feb 2021 09:54:17 +0100 Subject: CFV: New Skara Committer: Magnus Ihse Bursie In-Reply-To: References: Message-ID: Vote: yes Best regards, Robin > On 3 Feb 2021, at 09:48, Erik Helin wrote: > > Vote: yes > > Erik > > On 2/3/21 9:47 AM, Erik Helin wrote: >> I hereby nominate Magnus Ihse Bursie to Skara Committer. >> Magnus has contributed five patches to Skara [0], primarily fixing issues with CLI tools and libraries. Magnus has demonstrated a solid understanding of the Skara code and libraries, disciplined testing and of course brings many years of experience from his work in OpenJDK. Magnus is the lead of the build infrastructure project, is Reviewer in multiple other OpenJDK projects and is also an OpenJDK Member. >> Votes are due by Feb 17 09:00 AM UTC. >> Only current Skara Committers [1] are eligible to vote >> on this nomination. Votes must be cast in the open by replying >> to this mailing list. >> For Lazy Consensus voting instructions, see [2]. >> Erik >> [0] http://git.openjdk.java.net/skara >> [1] http://openjdk.java.net/census >> [2] http://openjdk.java.net/projects/#committer-vote From ehelin at openjdk.java.net Wed Feb 3 09:12:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 3 Feb 2021 09:12:56 GMT Subject: Integrated: build: add convenience target for bots In-Reply-To: References: Message-ID: On Tue, 2 Feb 2021 18:14:02 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a convenience target for building and extracting a image for the bots. A developer can now just run `sh gradlew bots` (or `make bots`) and find an extracted image under `bots/bin`. > > Testing: > - [x] Tested locally on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 0b6b051d Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/0b6b051d Stats: 18 lines in 2 files changed: 17 ins; 0 del; 1 mod build: add convenience target for bots Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1000 From ehelin at openjdk.java.net Wed Feb 3 09:13:31 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 3 Feb 2021 09:13:31 GMT Subject: Integrated: checkout: fetch origin before checking out branch In-Reply-To: References: Message-ID: On Tue, 2 Feb 2021 18:00:51 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that ensures that we fetches the remote `origin` before checking the source branch in the `checkout` bot. This is to ensure that the we have a local ref to the source branch in case we are are operating on a local Git repository that hasn't been updated in a while. > > Thanks, > Erik This pull request has now been integrated. Changeset: a0b7057a Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/a0b7057a Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod checkout: fetch origin before checking out branch Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/999 From ehelin at openjdk.java.net Wed Feb 3 09:13:43 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 3 Feb 2021 09:13:43 GMT Subject: RFR: Update the readme to include IntelliJ setup instructions [v3] In-Reply-To: References: Message-ID: On Tue, 2 Feb 2021 16:00:36 GMT, Robin Westberg wrote: >> Adds a section on how to build and test Skara using IntelliJ IDEA. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Clarify JDK location Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/998 From ehelin at openjdk.java.net Wed Feb 3 09:13:44 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 3 Feb 2021 09:13:44 GMT Subject: RFR: Update the readme to include IntelliJ setup instructions [v2] In-Reply-To: <8f4TmiOoEINivTFuc73Pf6Hz28ScBRTtYkQl912nBIg=.1dc0a090-7a1f-465c-9ae2-dc3d5198c5bd@github.com> References: <8f4TmiOoEINivTFuc73Pf6Hz28ScBRTtYkQl912nBIg=.1dc0a090-7a1f-465c-9ae2-dc3d5198c5bd@github.com> Message-ID: On Tue, 2 Feb 2021 14:32:57 GMT, Robin Westberg wrote: >> README.md line 226: >> >>> 224: IDE when working on Skara you can simply open the root folder and the project >>> 225: should be automatically imported. You will need to configure a Platform SDK that >>> 226: is JDK 14 or above. Either set this up manually, or [build](#building) once from >> >> We are using JDK 15 now ?? > > Sure, but the `Building` section still says that 14 or later is needed, and I guess that is still actually true. :) Ok, sure, I agree. ------------- PR: https://git.openjdk.java.net/skara/pull/998 From rwestberg at openjdk.java.net Wed Feb 3 09:15:22 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 3 Feb 2021 09:15:22 GMT Subject: RFR: 880: Map jdk.jpackage to core-libs-dev In-Reply-To: References: Message-ID: On Fri, 29 Jan 2021 22:23:17 GMT, Kevin Rushforth wrote: > The `jpackage` tool moved from the `jdk.incubator.jpackage` module to `jdk.jpackage` in JDK 16. The `jdk.json` config file needs to be updated accordingly so that `jpackage` reviews are sent to `core-libs-dev`. Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/996 From ehelin at openjdk.java.net Wed Feb 3 09:15:37 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 3 Feb 2021 09:15:37 GMT Subject: RFR: Build: Update to JDK 15.0.2 In-Reply-To: References: <8unQVlbL9bxE-Bs409zTdS7_VtqcBN0f1P-Jm40Pxaw=.7aa53ffe-1d1f-42a6-9d7d-51d18b574e7e@github.com> Message-ID: On Tue, 2 Feb 2021 11:36:31 GMT, Andrea Cosentino wrote: >> @edvbld Done > > I don't know if there is something else to do on my side. @oscerd you can just merge the `master` branch into your branch `jdk-15.0.2` (the merge commit will be automatically squashed when we integrate your changes, so don't worry). Then push the merge commit, then the GitHub Actions will be triggered ?? ------------- PR: https://git.openjdk.java.net/skara/pull/989 From ehelin at openjdk.java.net Wed Feb 3 09:19:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 3 Feb 2021 09:19:45 GMT Subject: RFR: 868: Skara should ignore .gitconfig and /etc/gitconfig In-Reply-To: References: Message-ID: On Tue, 2 Feb 2021 13:50:56 GMT, Magnus Ihse Bursie wrote: >> @magicus thanks for contributing! What do you think about adding a unit test to `RepositoryTests.java`? > > @edvbld What exactly do you propose to test in the unit test? This is really solving a problem with the environment -- the tests fail when I run as my user due to conflicting modifications in my `~/.gitconfig`. I can't really modify the users personal gitconfig file in a unit test. The only thing I could really think if is verifying that `git config -l` is empty. Hm, maybe that's a good idea... @magicus can't you run a test that asserts that `user.name` is empty? Almost everyone configures `user.name` (Git sort-of requires it for commits). In a CI environment the test will of course be trivially correct since we never setup `user.name`, but the test will be accurate when run on developer's personal machines. ------------- PR: https://git.openjdk.java.net/skara/pull/997 From alanb at openjdk.java.net Wed Feb 3 09:38:39 2021 From: alanb at openjdk.java.net (Alan Bateman) Date: Wed, 3 Feb 2021 09:38:39 GMT Subject: RFR: 880: Map jdk.jpackage to core-libs-dev In-Reply-To: References: Message-ID: On Fri, 29 Jan 2021 22:23:17 GMT, Kevin Rushforth wrote: > The `jpackage` tool moved from the `jdk.incubator.jpackage` module to `jdk.jpackage` in JDK 16. The `jdk.json` config file needs to be updated accordingly so that `jpackage` reviews are sent to `core-libs-dev`. config/mailinglist/rules/jdk.json line 226: > 224: "src/jdk.incubator.foreign/", > 225: "src/jdk.jpackage/", > 226: "src/jdk.internal.jvmstat/", core-libs-dev has been used to discuss the jpackage tool although it's not really core libraries. I've often thought it should have had its own list. Several other values in core-libs could be pruned: make/jdk/src/classes/build/tools/jdwpgen is serviceability-dev src/jdk.accessibility is client libs, swing-dev? test/jdk/javax/accessibility is client libs, swing-dev? src/jdk.internal.jvmstat is serviceability-dev src/jdk.jconsole is serviceability-dev src/java.smartcardio is security-dev ------------- PR: https://git.openjdk.java.net/skara/pull/996 From ihse at openjdk.java.net Wed Feb 3 09:46:54 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Wed, 3 Feb 2021 09:46:54 GMT Subject: RFR: 868: Skara should ignore .gitconfig and /etc/gitconfig In-Reply-To: References: Message-ID: On Wed, 3 Feb 2021 09:17:38 GMT, Erik Helin wrote: >> @edvbld What exactly do you propose to test in the unit test? This is really solving a problem with the environment -- the tests fail when I run as my user due to conflicting modifications in my `~/.gitconfig`. I can't really modify the users personal gitconfig file in a unit test. The only thing I could really think if is verifying that `git config -l` is empty. Hm, maybe that's a good idea... > > @magicus can't you run a test that asserts that `user.name` is empty? Almost everyone configures `user.name` (Git sort-of requires it for commits). In a CI environment the test will of course be trivially correct since we never setup `user.name`, but the test will be accurate when run on developer's personal machines. If `user.name` is set, then `git config -l` will not be empty. :) ------------- PR: https://git.openjdk.java.net/skara/pull/997 From rwestberg at openjdk.java.net Wed Feb 3 09:53:24 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 3 Feb 2021 09:53:24 GMT Subject: Integrated: Update the readme to include IntelliJ setup instructions In-Reply-To: References: Message-ID: <1ljco0Ar83w4KJGNQcdvbWPm-1Rp9VUex5jaQrzaP4E=.2400dee7-9f7d-4953-8139-f7be4521df91@github.com> On Tue, 2 Feb 2021 13:37:38 GMT, Robin Westberg wrote: > Adds a section on how to build and test Skara using IntelliJ IDEA. This pull request has now been integrated. Changeset: 3c18e067 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/3c18e067 Stats: 15 lines in 2 files changed: 13 ins; 0 del; 2 mod Update the readme to include IntelliJ setup instructions Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/998 From github.com+5106647+oscerd at openjdk.java.net Wed Feb 3 10:14:40 2021 From: github.com+5106647+oscerd at openjdk.java.net (Andrea Cosentino) Date: Wed, 3 Feb 2021 10:14:40 GMT Subject: RFR: Build: Update to JDK 15.0.2 [v2] In-Reply-To: References: Message-ID: > Hello all, > > Just a little PR for upgrading to JDK 15.0.2. > > make images passed fine and make test too. > > Thank you Andrea Cosentino has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains one additional commit since the last revision: Build: Update to JDK 15.0.2 ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/989/files - new: https://git.openjdk.java.net/skara/pull/989/files/02430fb1..2a28e266 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=989&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=989&range=00-01 Stats: 585 lines in 23 files changed: 454 ins; 49 del; 82 mod Patch: https://git.openjdk.java.net/skara/pull/989.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/989/head:pull/989 PR: https://git.openjdk.java.net/skara/pull/989 From github.com+5106647+oscerd at openjdk.java.net Wed Feb 3 10:14:40 2021 From: github.com+5106647+oscerd at openjdk.java.net (Andrea Cosentino) Date: Wed, 3 Feb 2021 10:14:40 GMT Subject: RFR: Build: Update to JDK 15.0.2 In-Reply-To: References: <8unQVlbL9bxE-Bs409zTdS7_VtqcBN0f1P-Jm40Pxaw=.7aa53ffe-1d1f-42a6-9d7d-51d18b574e7e@github.com> Message-ID: On Wed, 3 Feb 2021 09:13:07 GMT, Erik Helin wrote: >> I don't know if there is something else to do on my side. > > @oscerd you can just merge the `master` branch into your branch `jdk-15.0.2` (the merge commit will be automatically squashed when we integrate your changes, so don't worry). Then push the merge commit, then the GitHub Actions will be triggered ?? Done ------------- PR: https://git.openjdk.java.net/skara/pull/989 From jorn.vernee at oracle.com Wed Feb 3 11:08:27 2021 From: jorn.vernee at oracle.com (Jorn Vernee) Date: Wed, 3 Feb 2021 12:08:27 +0100 Subject: CFV: New Skara Committer: Magnus Ihse Bursie In-Reply-To: References: Message-ID: <7af31e53-f112-0b83-d95b-fbf00305f40f@oracle.com> Vote: yes Jorn On 03/02/2021 09:47, Erik Helin wrote: > I hereby nominate Magnus Ihse Bursie to Skara Committer. > > Magnus has contributed five patches to Skara [0], primarily fixing > issues with CLI tools and libraries. Magnus has demonstrated a solid > understanding of the Skara code and libraries, disciplined testing and > of course brings many years of experience from his work in OpenJDK. > Magnus is the lead of the build infrastructure project, is Reviewer in > multiple other OpenJDK projects and is also an OpenJDK Member. > > Votes are due by Feb 17 09:00 AM UTC. > > Only current Skara Committers [1] are eligible to vote > on this nomination.? Votes must be cast in the open by replying > to this mailing list. > > For Lazy Consensus voting instructions, see [2]. > > Erik > > [0] http://git.openjdk.java.net/skara > [1] http://openjdk.java.net/census > [2] http://openjdk.java.net/projects/#committer-vote From ihse at openjdk.java.net Wed Feb 3 11:18:06 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Wed, 3 Feb 2021 11:18:06 GMT Subject: RFR: 868: Skara should ignore .gitconfig and /etc/gitconfig [v3] In-Reply-To: References: Message-ID: <0FFP_nbpYyijI9TPVmzPN6vHPS3W6M8hkgN06me149A=.bed6d03d-062c-43db-b0ab-86e5cd4cc2c3@github.com> > Skara is already ignoring .hgrc for mercurial, but the corresponding solution for git was never put in place. > > I also fixed a problem where an error condition would cause an infinite loop, which I ran into during testing. Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: Add unit test to verify that we block user/system configs. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/997/files - new: https://git.openjdk.java.net/skara/pull/997/files/d7a13059..96e82612 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=997&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=997&range=01-02 Stats: 55 lines in 3 files changed: 45 ins; 3 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/997.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/997/head:pull/997 PR: https://git.openjdk.java.net/skara/pull/997 From github.com+5106647+oscerd at openjdk.java.net Wed Feb 3 13:29:36 2021 From: github.com+5106647+oscerd at openjdk.java.net (Andrea Cosentino) Date: Wed, 3 Feb 2021 13:29:36 GMT Subject: RFR: Build: Update to JDK 15.0.2 In-Reply-To: References: <8unQVlbL9bxE-Bs409zTdS7_VtqcBN0f1P-Jm40Pxaw=.7aa53ffe-1d1f-42a6-9d7d-51d18b574e7e@github.com> Message-ID: On Wed, 3 Feb 2021 10:12:09 GMT, Andrea Cosentino wrote: >> @oscerd you can just merge the `master` branch into your branch `jdk-15.0.2` (the merge commit will be automatically squashed when we integrate your changes, so don't worry). Then push the merge commit, then the GitHub Actions will be triggered ?? > > Done Thanks for helpin on the workflow. All seems to be ok. ------------- PR: https://git.openjdk.java.net/skara/pull/989 From tim.bell at oracle.com Wed Feb 3 16:19:59 2021 From: tim.bell at oracle.com (tim.bell at oracle.com) Date: Wed, 3 Feb 2021 08:19:59 -0800 Subject: CFV: New Skara Committer: Magnus Ihse Bursie In-Reply-To: References: Message-ID: <72e8130f-efb2-ca8b-5260-5d4c1fc20001@oracle.com> Vote: yes Tim On 2/3/21 00:47, Erik Helin wrote: > I hereby nominate Magnus Ihse Bursie to Skara Committer. From joe.darcy at oracle.com Wed Feb 3 17:04:21 2021 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 3 Feb 2021 09:04:21 -0800 Subject: CFV: New Skara Committer: Magnus Ihse Bursie In-Reply-To: References: Message-ID: <93697281-f666-7f04-d1ff-620c84681a36@oracle.com> Vote: yes On 2/3/2021 12:47 AM, Erik Helin wrote: > I hereby nominate Magnus Ihse Bursie to Skara Committer. > > Magnus has contributed five patches to Skara [0], primarily fixing > issues with CLI tools and libraries. Magnus has demonstrated a solid > understanding of the Skara code and libraries, disciplined testing and > of course brings many years of experience from his work in OpenJDK. > Magnus is the lead of the build infrastructure project, is Reviewer in > multiple other OpenJDK projects and is also an OpenJDK Member. > > Votes are due by Feb 17 09:00 AM UTC. > > Only current Skara Committers [1] are eligible to vote > on this nomination.? Votes must be cast in the open by replying > to this mailing list. > > For Lazy Consensus voting instructions, see [2]. > > Erik > > [0] http://git.openjdk.java.net/skara > [1] http://openjdk.java.net/census > [2] http://openjdk.java.net/projects/#committer-vote From ehelin at openjdk.java.net Thu Feb 4 09:46:39 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 4 Feb 2021 09:46:39 GMT Subject: RFR: checkout: use to repo name as path to marks Message-ID: Hi all, please review this small patch that makes the `checkout` bot use the filename of the to path as the path for storing marks (compared to using the name of the from repo). Thanks, Erik ------------- Commit messages: - checkout: use to repo name as path to marks Changes: https://git.openjdk.java.net/skara/pull/1001/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1001&range=00 Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1001.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1001/head:pull/1001 PR: https://git.openjdk.java.net/skara/pull/1001 From rwestberg at openjdk.java.net Thu Feb 4 09:46:39 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 4 Feb 2021 09:46:39 GMT Subject: RFR: checkout: use to repo name as path to marks In-Reply-To: References: Message-ID: <3fRRwRRGw1pZPeabfxlN9pRLL0FcsL4bRMk_3yRBHsI=.8f48e733-ca04-4d54-af15-ade567133f42@github.com> On Thu, 4 Feb 2021 09:42:31 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes the `checkout` bot use the filename of the to path as the path for storing marks (compared to using the name of the from repo). > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1001 From ehelin at openjdk.java.net Thu Feb 4 14:36:47 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 4 Feb 2021 14:36:47 GMT Subject: Integrated: checkout: use to repo name as path to marks In-Reply-To: References: Message-ID: On Thu, 4 Feb 2021 09:42:31 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes the `checkout` bot use the filename of the to path as the path for storing marks (compared to using the name of the from repo). > > Thanks, > Erik This pull request has now been integrated. Changeset: 2d5199cd Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/2d5199cd Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod checkout: use to repo name as path to marks Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1001 From ehelin at openjdk.java.net Thu Feb 4 14:37:48 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 4 Feb 2021 14:37:48 GMT Subject: RFR: 880: Map jdk.jpackage to core-libs-dev In-Reply-To: References: Message-ID: On Wed, 3 Feb 2021 09:36:14 GMT, Alan Bateman wrote: >> The `jpackage` tool moved from the `jdk.incubator.jpackage` module to `jdk.jpackage` in JDK 16. The `jdk.json` config file needs to be updated accordingly so that `jpackage` reviews are sent to `core-libs-dev`. > > config/mailinglist/rules/jdk.json line 226: > >> 224: "src/jdk.incubator.foreign/", >> 225: "src/jdk.jpackage/", >> 226: "src/jdk.internal.jvmstat/", > > core-libs-dev has been used to discuss the jpackage tool although it's not really core libraries. I've often thought it should have had its own list. > > Several other values in core-libs could be pruned: > > make/jdk/src/classes/build/tools/jdwpgen is serviceability-dev > src/jdk.accessibility is client libs, swing-dev? > test/jdk/javax/accessibility is client libs, swing-dev? > src/jdk.internal.jvmstat is serviceability-dev > src/jdk.jconsole is serviceability-dev > src/java.smartcardio is security-dev @AlanBateman please file an issue on Skara in JBS and we look into it ?? ------------- PR: https://git.openjdk.java.net/skara/pull/996 From kcr at openjdk.java.net Thu Feb 4 14:37:48 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Thu, 4 Feb 2021 14:37:48 GMT Subject: Integrated: 880: Map jdk.jpackage to core-libs-dev In-Reply-To: References: Message-ID: On Fri, 29 Jan 2021 22:23:17 GMT, Kevin Rushforth wrote: > The `jpackage` tool moved from the `jdk.incubator.jpackage` module to `jdk.jpackage` in JDK 16. The `jdk.json` config file needs to be updated accordingly so that `jpackage` reviews are sent to `core-libs-dev`. This pull request has now been integrated. Changeset: b0be0fa2 Author: Kevin Rushforth Committer: Erik Helin URL: https://git.openjdk.java.net/skara/commit/b0be0fa2 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod 880: Map jdk.jpackage to core-libs-dev Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/996 From ehelin at openjdk.java.net Thu Feb 4 14:38:41 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 4 Feb 2021 14:38:41 GMT Subject: RFR: Build: Update to JDK 15.0.2 [v2] In-Reply-To: References: Message-ID: On Wed, 3 Feb 2021 10:14:40 GMT, Andrea Cosentino wrote: >> Hello all, >> >> Just a little PR for upgrading to JDK 15.0.2. >> >> make images passed fine and make test too. >> >> Thank you > > Andrea Cosentino has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains one additional commit since the last revision: > > Build: Update to JDK 15.0.2 Looks good! ?? ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/989 From ehelin at openjdk.java.net Thu Feb 4 14:41:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 4 Feb 2021 14:41:56 GMT Subject: RFR: 868: Skara should ignore .gitconfig and /etc/gitconfig [v3] In-Reply-To: <0FFP_nbpYyijI9TPVmzPN6vHPS3W6M8hkgN06me149A=.bed6d03d-062c-43db-b0ab-86e5cd4cc2c3@github.com> References: <0FFP_nbpYyijI9TPVmzPN6vHPS3W6M8hkgN06me149A=.bed6d03d-062c-43db-b0ab-86e5cd4cc2c3@github.com> Message-ID: On Wed, 3 Feb 2021 11:18:06 GMT, Magnus Ihse Bursie wrote: >> Skara is already ignoring .hgrc for mercurial, but the corresponding solution for git was never put in place. >> >> I also fixed a problem where an error condition would cause an infinite loop, which I ran into during testing. > > Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: > > Add unit test to verify that we block user/system configs. Looks good, just a minor comment inline. process/src/main/java/org/openjdk/skara/process/Process.java line 70: > 68: } > 69: > 70: public Description environMap(Map keyValueMap) { I would have just overloaded `environ`, as in `public Description environ(Map env)` ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/997 From github.com+5106647+oscerd at openjdk.java.net Thu Feb 4 14:45:56 2021 From: github.com+5106647+oscerd at openjdk.java.net (Andrea Cosentino) Date: Thu, 4 Feb 2021 14:45:56 GMT Subject: RFR: Build: Update to JDK 15.0.2 [v2] In-Reply-To: References: Message-ID: <7uql3NtGGVaJLDBlzY6axGfQ0Cu_VbOUYympu-34p_8=.c8f8c9e6-e816-4f3e-b504-fdd5749c074a@github.com> On Thu, 4 Feb 2021 14:36:34 GMT, Erik Helin wrote: >> Andrea Cosentino has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains one additional commit since the last revision: >> >> Build: Update to JDK 15.0.2 > > Looks good! ?? Thanks for reviewing, we now need a second reviewer right? ------------- PR: https://git.openjdk.java.net/skara/pull/989 From ihse at openjdk.java.net Thu Feb 4 14:47:53 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 4 Feb 2021 14:47:53 GMT Subject: RFR: 868: Skara should ignore .gitconfig and /etc/gitconfig [v4] In-Reply-To: References: Message-ID: <5jVyBqJuRz2c1y1w5stZezz6IvnnX4eIOWEeNaMipIo=.8883d9df-f036-49a6-8f90-bde2f6b31b2a@github.com> > Skara is already ignoring .hgrc for mercurial, but the corresponding solution for git was never put in place. > > I also fixed a problem where an error condition would cause an infinite loop, which I ran into during testing. Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: Rename environMap to environ, as requested by reviewer ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/997/files - new: https://git.openjdk.java.net/skara/pull/997/files/96e82612..fd97cd76 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=997&range=03 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=997&range=02-03 Stats: 8 lines in 3 files changed: 0 ins; 0 del; 8 mod Patch: https://git.openjdk.java.net/skara/pull/997.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/997/head:pull/997 PR: https://git.openjdk.java.net/skara/pull/997 From ihse at openjdk.java.net Thu Feb 4 15:07:24 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 4 Feb 2021 15:07:24 GMT Subject: Integrated: 868: Skara should ignore .gitconfig and /etc/gitconfig In-Reply-To: References: Message-ID: <4DlXyc6BCVg6xyfLy_NjqnfWWWj1_RmGADfWxrNzMkM=.bed3cb05-73e3-4415-98d5-6cfced6c57ce@github.com> On Tue, 2 Feb 2021 12:13:16 GMT, Magnus Ihse Bursie wrote: > Skara is already ignoring .hgrc for mercurial, but the corresponding solution for git was never put in place. > > I also fixed a problem where an error condition would cause an infinite loop, which I ran into during testing. This pull request has now been integrated. Changeset: ae502183 Author: Magnus Ihse Bursie Committer: Erik Helin URL: https://git.openjdk.java.net/skara/commit/ae502183 Stats: 102 lines in 6 files changed: 85 ins; 3 del; 14 mod 868: Skara should ignore .gitconfig and /etc/gitconfig Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/997 From ehelin at openjdk.java.net Thu Feb 4 18:01:32 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 4 Feb 2021 18:01:32 GMT Subject: RFR: Build: Update to JDK 15.0.2 [v2] In-Reply-To: <7uql3NtGGVaJLDBlzY6axGfQ0Cu_VbOUYympu-34p_8=.c8f8c9e6-e816-4f3e-b504-fdd5749c074a@github.com> References: <7uql3NtGGVaJLDBlzY6axGfQ0Cu_VbOUYympu-34p_8=.c8f8c9e6-e816-4f3e-b504-fdd5749c074a@github.com> Message-ID: On Thu, 4 Feb 2021 14:43:47 GMT, Andrea Cosentino wrote: > Thanks for reviewing, we now need a second reviewer right? No, Skara only requires one Reviewer (otherwise the bot wouldn't have labelled this as "ready'). You are good to go, just follow the bot's instructions :robot: ------------- PR: https://git.openjdk.java.net/skara/pull/989 From github.com+5106647+oscerd at openjdk.java.net Fri Feb 5 08:10:10 2021 From: github.com+5106647+oscerd at openjdk.java.net (Andrea Cosentino) Date: Fri, 5 Feb 2021 08:10:10 GMT Subject: Integrated: Build: Update to JDK 15.0.2 In-Reply-To: References: Message-ID: On Wed, 20 Jan 2021 17:40:45 GMT, Andrea Cosentino wrote: > Hello all, > > Just a little PR for upgrading to JDK 15.0.2. > > make images passed fine and make test too. > > Thank you This pull request has now been integrated. Changeset: e6682279 Author: Andrea Cosentino Committer: Erik Helin URL: https://git.openjdk.java.net/skara/commit/e6682279 Stats: 14 lines in 3 files changed: 0 ins; 0 del; 14 mod Build: Update to JDK 15.0.2 Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/989 From aph at redhat.com Fri Feb 5 10:11:58 2021 From: aph at redhat.com (Andrew Haley) Date: Fri, 5 Feb 2021 10:11:58 +0000 Subject: Skara and .sig files Message-ID: <2e36eb81-2cf6-8729-4294-c1f3552851ec@redhat.com> The email->github gateway doesn't remove .sigs from emails. Can we fix that, please? It's easy enough, given that all sigs start with "-- " in its own line. It'd tidy things up considerably. Thanks, -- Andrew Haley (he/him) Java Platform Lead Engineer Red Hat UK Ltd. https://keybase.io/andrewhaley EAC8 43EB D3EF DB98 CC77 2FAD A5CD 6035 332F A671 From magnus.ihse.bursie at oracle.com Fri Feb 5 10:34:27 2021 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Fri, 5 Feb 2021 11:34:27 +0100 Subject: Skara and .sig files In-Reply-To: <2e36eb81-2cf6-8729-4294-c1f3552851ec@redhat.com> References: <2e36eb81-2cf6-8729-4294-c1f3552851ec@redhat.com> Message-ID: On 2021-02-05 11:11, Andrew Haley wrote: > The email->github gateway doesn't remove .sigs from emails. > > Can we fix that, please? It's easy enough, given that all sigs start > with "-- " in its own line. It'd tidy things up considerably. Good suggestion. I opened https://bugs.openjdk.java.net/browse/SKARA-889. /Magnus From christoph.langer at sap.com Fri Feb 5 11:49:31 2021 From: christoph.langer at sap.com (Langer, Christoph) Date: Fri, 5 Feb 2021 11:49:31 +0000 Subject: Backport Experience In-Reply-To: <0613d96a-3b71-1b21-6aec-562d806f893a@oracle.com> References: <0613d96a-3b71-1b21-6aec-562d806f893a@oracle.com> Message-ID: Hi Erik, thanks for your answer. As of today I don't see "git backport" yet. But I assume you'll add it in due course ?? There's one other question which occurred to me in a certain workflow: There is the cool git hg-export command to extract a mercurial patch out of a git repository. Is something like this possible the other way around? E.g. when I have a change in a mercurial repository only and want to bring it into a git repository? Maybe there exists a description for some manual steps... ? Thanks Christoph > -----Original Message----- > From: skara-dev On Behalf Of Erik Helin > Sent: Mittwoch, 20. Januar 2021 13:41 > To: skara-dev at openjdk.java.net > Subject: Re: Backport Experience > > Hi Christoph, > > sorry for the late reply, I've had some issues with my e-mail lately. > > Both features you mention are implemented but not deployed yet. The ETA > is to roll this out piece by piece next week. > > We can't unfortunately make "Backport-of: > 3f9f86f0d3f918b9955ba6ba73c9c58ae8fcf7cb", but you can paste that hash > into the search field on GitHub to find the original commit. > > Thanks, > Erik From erik.helin at oracle.com Fri Feb 5 13:35:30 2021 From: erik.helin at oracle.com (Erik Helin) Date: Fri, 5 Feb 2021 13:35:30 GMT Subject: git: openjdk/cr: Fix files regex in .jcheck/conf Message-ID: Changeset: 790f8f3e Author: Erik Helin Date: 2021-02-05 14:34:12 +0000 URL: https://git.openjdk.java.net/cr/commit/790f8f3e Fix files regex in .jcheck/conf ! .jcheck/conf From ehelin at openjdk.java.net Fri Feb 5 13:37:57 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 5 Feb 2021 13:37:57 GMT Subject: [cr] RFR: skara-876 Message-ID: Hi all, please review this patch that adds padding to the line number column for the "sdiff" view. Testing: - [x] Manual testing Thanks, Erik ------------- Commit messages: - skara-876 Changes: https://git.openjdk.java.net/cr/pull/4/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=4&range=00 Stats: 15 lines in 1 file changed: 9 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/cr/pull/4.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/4/head:pull/4 PR: https://git.openjdk.java.net/cr/pull/4 From rwestberg at openjdk.java.net Fri Feb 5 14:54:10 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 5 Feb 2021 14:54:10 GMT Subject: RFR: Initial version of CLI tool for hgupdate-sync label Message-ID: An initial version of a hgupdate-sync-label CLI tool with associated refactorings, in preparation for further enhancements. ------------- Commit messages: - Initial version of CLI tool Changes: https://git.openjdk.java.net/skara/pull/1002/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1002&range=00 Stats: 279 lines in 16 files changed: 225 ins; 23 del; 31 mod Patch: https://git.openjdk.java.net/skara/pull/1002.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1002/head:pull/1002 PR: https://git.openjdk.java.net/skara/pull/1002 From rwestberg at openjdk.java.net Mon Feb 8 09:00:30 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 8 Feb 2021 09:00:30 GMT Subject: RFR: Initial version of CLI tool for hgupdate-sync label [v2] In-Reply-To: References: Message-ID: > An initial version of a hgupdate-sync-label CLI tool with associated refactorings, in preparation for further enhancements. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Fix tests ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1002/files - new: https://git.openjdk.java.net/skara/pull/1002/files/bdce8267..82fc6947 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1002&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1002&range=00-01 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1002.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1002/head:pull/1002 PR: https://git.openjdk.java.net/skara/pull/1002 From ihse at openjdk.java.net Mon Feb 8 11:37:47 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 8 Feb 2021 11:37:47 GMT Subject: [cr] RFR: skara-876 In-Reply-To: References: Message-ID: On Fri, 5 Feb 2021 13:25:46 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds padding to the line number column for the "sdiff" view. > > Testing: > - [x] Manual testing > > Thanks, > Erik Looks good to me. ------------- Marked as reviewed by ihse (no project role). PR: https://git.openjdk.java.net/cr/pull/4 From ehelin at openjdk.java.net Mon Feb 8 13:06:43 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 8 Feb 2021 13:06:43 GMT Subject: RFR: Initial version of CLI tool for hgupdate-sync label [v2] In-Reply-To: References: Message-ID: On Mon, 8 Feb 2021 09:00:30 GMT, Robin Westberg wrote: >> An initial version of a hgupdate-sync-label CLI tool with associated refactorings, in preparation for further enhancements. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Fix tests Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1002 From ihse at openjdk.java.net Mon Feb 8 13:19:00 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 8 Feb 2021 13:19:00 GMT Subject: RFR: Initial version of CLI tool for hgupdate-sync label [v2] In-Reply-To: References: Message-ID: On Mon, 8 Feb 2021 09:00:30 GMT, Robin Westberg wrote: >> An initial version of a hgupdate-sync-label CLI tool with associated refactorings, in preparation for further enhancements. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Fix tests Looks good as far as I can tell :) ------------- Marked as reviewed by ihse (no project role). PR: https://git.openjdk.java.net/skara/pull/1002 From rwestberg at openjdk.java.net Tue Feb 9 10:09:37 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 9 Feb 2021 10:09:37 GMT Subject: [cr] RFR: skara-876 In-Reply-To: References: Message-ID: On Fri, 5 Feb 2021 13:25:46 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds padding to the line number column for the "sdiff" view. > > Testing: > - [x] Manual testing > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/cr/pull/4 From rwestberg at openjdk.java.net Wed Feb 10 09:32:57 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Feb 2021 09:32:57 GMT Subject: RFR: Initial version of SyncLabelBot Message-ID: Initial implementation of a bot that handles the hgupdate-sync label. Initially it will only log its intended actions, so we can verify it while still running the old implementation in parallel. ------------- Depends on: https://git.openjdk.java.net/skara/pull/1002 Commit messages: - Initial version of SyncLabelBot Changes: https://git.openjdk.java.net/skara/pull/1003/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1003&range=00 Stats: 379 lines in 13 files changed: 372 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/1003.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1003/head:pull/1003 PR: https://git.openjdk.java.net/skara/pull/1003 From ehelin at openjdk.java.net Wed Feb 10 10:49:51 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Feb 2021 10:49:51 GMT Subject: [skara] RFR: build: use included build instead of buildSrc Message-ID: Hi all, please review this small patch that makes the build use "included builds" for Skara's Gradle plugins instead of the "buildSrc" feature of Gradle. The "buildSrc" feature doesn't play nice with Gradle's caching mechanism - any change to a file in the `buildSrc` directory invalidates the build cache. The solution is to just include the plugins using the `includeBuild` feature (the Gradle team is even thinking of making `buildSrc` an implicitly included build, see https://github.com/gradle/gradle/issues/2531). Testing: - [x] `make images` on Linux x64 - [x] `make test` on Linux x64 Thanks, Erik ------------- Commit messages: - build: use included build instead of buildSrc Changes: https://git.openjdk.java.net/skara/pull/1004/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1004&range=00 Stats: 71 lines in 28 files changed: 32 ins; 27 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/1004.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1004/head:pull/1004 PR: https://git.openjdk.java.net/skara/pull/1004 From rwestberg at openjdk.java.net Wed Feb 10 10:49:51 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Feb 2021 10:49:51 GMT Subject: [skara] RFR: build: use included build instead of buildSrc In-Reply-To: References: Message-ID: On Wed, 10 Feb 2021 10:44:44 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes the build use "included builds" for Skara's Gradle plugins instead of the "buildSrc" feature of Gradle. The "buildSrc" feature doesn't play nice with Gradle's caching mechanism - any change to a file in the `buildSrc` directory invalidates the build cache. The solution is to just include the plugins using the `includeBuild` feature (the Gradle team is even thinking of making `buildSrc` an implicitly included build, see https://github.com/gradle/gradle/issues/2531). > > Testing: > - [x] `make images` on Linux x64 > - [x] `make test` on Linux x64 > > Thanks, > Erik Good stuff! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1004 From ehelin at openjdk.java.net Wed Feb 10 12:36:47 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Feb 2021 12:36:47 GMT Subject: [skara] Integrated: build: use included build instead of buildSrc In-Reply-To: References: Message-ID: On Wed, 10 Feb 2021 10:44:44 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes the build use "included builds" for Skara's Gradle plugins instead of the "buildSrc" feature of Gradle. The "buildSrc" feature doesn't play nice with Gradle's caching mechanism - any change to a file in the `buildSrc` directory invalidates the build cache. The solution is to just include the plugins using the `includeBuild` feature (the Gradle team is even thinking of making `buildSrc` an implicitly included build, see https://github.com/gradle/gradle/issues/2531). > > Testing: > - [x] `make images` on Linux x64 > - [x] `make test` on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: de5c089d Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/de5c089d Stats: 71 lines in 28 files changed: 32 ins; 27 del; 12 mod build: use included build instead of buildSrc Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1004 From ehelin at openjdk.java.net Wed Feb 10 12:40:18 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Feb 2021 12:40:18 GMT Subject: RFR: Initial version of SyncLabelBot In-Reply-To: References: Message-ID: On Wed, 10 Feb 2021 09:15:45 GMT, Robin Westberg wrote: > Initial implementation of a bot that handles the hgupdate-sync label. Initially it will only log its intended actions, so we can verify it while still running the old implementation in parallel. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1003 From ehelin at openjdk.java.net Wed Feb 10 12:46:01 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Feb 2021 12:46:01 GMT Subject: RFR: build: top-level gradle do not need images Message-ID: Hi all, please remove this little clean-up after de5c089d7b219b4efa0fa38f467e3db553d6c1b5. The top-level build does not need to use the `images` plugin, that line was only added for debugging purposes and should be removed. Thanks, Erik ------------- Commit messages: - build: top-level gradle do not need images Changes: https://git.openjdk.java.net/skara/pull/1005/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1005&range=00 Stats: 1 line in 1 file changed: 0 ins; 1 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1005.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1005/head:pull/1005 PR: https://git.openjdk.java.net/skara/pull/1005 From rwestberg at openjdk.java.net Wed Feb 10 14:38:24 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Feb 2021 14:38:24 GMT Subject: RFR: build: top-level gradle do not need images In-Reply-To: References: Message-ID: On Wed, 10 Feb 2021 12:43:16 GMT, Erik Helin wrote: > Hi all, > > please remove this little clean-up after de5c089d7b219b4efa0fa38f467e3db553d6c1b5. The top-level build does not need to use the `images` plugin, that line was only added for debugging purposes and should be removed. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1005 From ehelin at openjdk.java.net Wed Feb 10 14:43:18 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Feb 2021 14:43:18 GMT Subject: Integrated: build: top-level gradle do not need images In-Reply-To: References: Message-ID: On Wed, 10 Feb 2021 12:43:16 GMT, Erik Helin wrote: > Hi all, > > please remove this little clean-up after de5c089d7b219b4efa0fa38f467e3db553d6c1b5. The top-level build does not need to use the `images` plugin, that line was only added for debugging purposes and should be removed. > > Thanks, > Erik This pull request has now been integrated. Changeset: 3db7de17 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/3db7de17 Stats: 1 line in 1 file changed: 0 ins; 1 del; 0 mod build: top-level gradle do not need images Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1005 From rwestberg at openjdk.java.net Wed Feb 10 15:18:22 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Feb 2021 15:18:22 GMT Subject: Integrated: Initial version of CLI tool for hgupdate-sync label In-Reply-To: References: Message-ID: On Fri, 5 Feb 2021 14:51:14 GMT, Robin Westberg wrote: > An initial version of a hgupdate-sync-label CLI tool with associated refactorings, in preparation for further enhancements. This pull request has now been integrated. Changeset: 6f673d91 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/6f673d91 Stats: 280 lines in 16 files changed: 226 ins; 23 del; 31 mod Initial version of CLI tool for hgupdate-sync label Reviewed-by: ehelin, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1002 From rwestberg at openjdk.java.net Wed Feb 10 15:19:00 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Feb 2021 15:19:00 GMT Subject: RFR: Initial version of SyncLabelBot [v2] In-Reply-To: References: Message-ID: > Initial implementation of a bot that handles the hgupdate-sync label. Initially it will only log its intended actions, so we can verify it while still running the old implementation in parallel. Robin Westberg has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1003/files - new: https://git.openjdk.java.net/skara/pull/1003/files/e2f68d94..e2f68d94 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1003&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1003&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1003.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1003/head:pull/1003 PR: https://git.openjdk.java.net/skara/pull/1003 From rwestberg at openjdk.java.net Wed Feb 10 15:21:54 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Feb 2021 15:21:54 GMT Subject: Integrated: Initial version of SyncLabelBot In-Reply-To: References: Message-ID: On Wed, 10 Feb 2021 09:15:45 GMT, Robin Westberg wrote: > Initial implementation of a bot that handles the hgupdate-sync label. Initially it will only log its intended actions, so we can verify it while still running the old implementation in parallel. This pull request has now been integrated. Changeset: 831fcce0 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/831fcce0 Stats: 379 lines in 13 files changed: 372 ins; 0 del; 7 mod Initial version of SyncLabelBot Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1003 From aph at redhat.com Thu Feb 11 17:33:28 2021 From: aph at redhat.com (Andrew Haley) Date: Thu, 11 Feb 2021 17:33:28 +0000 Subject: Mirror jdk 8u to Skara Message-ID: <287b3f99-22a3-411e-7f24-f9f104174403@redhat.com> I'm looking at https://github.com/openjdk and I can't see any old OpenJDK trees. (By "old" I mean from before we went over to a unified repo.) Can we have a mirror of jdk8u, please? I'd like to kick the tyres, and if it works well we can consider moving to it. Thanks, -- Andrew Haley (he/him) Java Platform Lead Engineer Red Hat UK Ltd. https://keybase.io/andrewhaley EAC8 43EB D3EF DB98 CC77 2FAD A5CD 6035 332F A671 From joe.darcy at oracle.com Thu Feb 11 17:43:31 2021 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 11 Feb 2021 09:43:31 -0800 Subject: Mirror jdk 8u to Skara In-Reply-To: <287b3f99-22a3-411e-7f24-f9f104174403@redhat.com> References: <287b3f99-22a3-411e-7f24-f9f104174403@redhat.com> Message-ID: <391d092a-3fe1-6b01-9664-e38a8cc7c3d9@oracle.com> On 2/11/2021 9:33 AM, Andrew Haley wrote: > I'm looking at https://github.com/openjdk and I can't see any > old OpenJDK trees. (By "old" I mean from before we went over to > a unified repo.) That omission is by design, from JEP 357: "Migrate from Mercurial to Git": > Goals: > > * Migrate all single-repository OpenJDK Projects from Mercurial to Git > [...] > Non-Goals > > ? * ? We will not migrate multi-repository OpenJDK Projects, such as > the JDK 8 Updates Project. Those Projects can migrate to Git if and > when they consolidate into a single repository. http://openjdk.java.net/jeps/357 -Joe From prr at openjdk.java.net Thu Feb 11 19:04:03 2021 From: prr at openjdk.java.net (Phil Race) Date: Thu, 11 Feb 2021 19:04:03 GMT Subject: RFR: 893: Skara has no mailing list rule for some macOS native client code Message-ID: I'd like to add this rule ------------- Commit messages: - 893: Skara has no mailing list rule for some macOS native client code Changes: https://git.openjdk.java.net/skara/pull/1006/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1006&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-893 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1006.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1006/head:pull/1006 PR: https://git.openjdk.java.net/skara/pull/1006 From prr at openjdk.java.net Thu Feb 11 19:08:16 2021 From: prr at openjdk.java.net (Phil Race) Date: Thu, 11 Feb 2021 19:08:16 GMT Subject: RFR: 893: Skara has no mailing list rule for some macOS native client code In-Reply-To: References: Message-ID: <2ynuDCBxmE7JhWVDalLz8sAT9e9XFK8dvI1ZMl5r7zE=.afb7aa8d-fc87-4799-b887-05c059504e20@github.com> On Thu, 11 Feb 2021 19:01:02 GMT, Phil Race wrote: > I'd like to add this rule BTW I assume I have no project role so expect I'll need a sponsor ? ------------- PR: https://git.openjdk.java.net/skara/pull/1006 From erikj at openjdk.java.net Thu Feb 11 20:18:19 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 11 Feb 2021 20:18:19 GMT Subject: RFR: 893: Skara has no mailing list rule for some macOS native client code In-Reply-To: References: Message-ID: On Thu, 11 Feb 2021 19:01:02 GMT, Phil Race wrote: > I'd like to add this rule Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1006 From rwestberg at openjdk.java.net Fri Feb 12 08:58:23 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Feb 2021 08:58:23 GMT Subject: RFR: Update BotSlackHandlerTest timeout Message-ID: The timeout in combination with the default throttling can cause the test the fail. ------------- Commit messages: - Avoid timeout Changes: https://git.openjdk.java.net/skara/pull/1007/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1007&range=00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1007.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1007/head:pull/1007 PR: https://git.openjdk.java.net/skara/pull/1007 From ihse at openjdk.java.net Fri Feb 12 09:44:34 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Feb 2021 09:44:34 GMT Subject: RFR: 893: Skara has no mailing list rule for some macOS native client code In-Reply-To: References: Message-ID: On Thu, 11 Feb 2021 19:01:02 GMT, Phil Race wrote: > I'd like to add this rule Marked as reviewed by ihse (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/1006 From ihse at openjdk.java.net Fri Feb 12 09:45:13 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Feb 2021 09:45:13 GMT Subject: RFR: Update BotSlackHandlerTest timeout In-Reply-To: References: Message-ID: On Fri, 12 Feb 2021 08:55:27 GMT, Robin Westberg wrote: > The timeout in combination with the default throttling can cause the test the fail. Marked as reviewed by ihse (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/1007 From aph at redhat.com Fri Feb 12 10:01:18 2021 From: aph at redhat.com (Andrew Haley) Date: Fri, 12 Feb 2021 10:01:18 +0000 Subject: Mirror jdk 8u to Skara In-Reply-To: <391d092a-3fe1-6b01-9664-e38a8cc7c3d9@oracle.com> References: <287b3f99-22a3-411e-7f24-f9f104174403@redhat.com> <391d092a-3fe1-6b01-9664-e38a8cc7c3d9@oracle.com> Message-ID: <144ac496-e80d-eff3-3a43-ef4bc73d4542@redhat.com> On 11/02/2021 17:43, Joe Darcy wrote: >> Non-Goals >> >> ? * ? We will not migrate multi-repository OpenJDK Projects, such as >> the JDK 8 Updates Project. Those Projects can migrate to Git if and >> when they consolidate into a single repository. > http://openjdk.java.net/jeps/357 OK, so we'd need to create a single Hg repository first? -- Andrew Haley (he/him) Java Platform Lead Engineer Red Hat UK Ltd. https://keybase.io/andrewhaley EAC8 43EB D3EF DB98 CC77 2FAD A5CD 6035 332F A671 From ehelin at openjdk.java.net Fri Feb 12 12:54:55 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Feb 2021 12:54:55 GMT Subject: RFR: Update BotSlackHandlerTest timeout In-Reply-To: References: Message-ID: <3dCJG17pZsoRSnuYXu6U8wZTMZmPwGcrpLTIOpNvnGo=.fd134da5-83fc-4b51-ac8f-ee3d9d65ad56@github.com> On Fri, 12 Feb 2021 08:55:27 GMT, Robin Westberg wrote: > The timeout in combination with the default throttling can cause the test the fail. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1007 From rwestberg at openjdk.java.net Fri Feb 12 12:54:55 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Feb 2021 12:54:55 GMT Subject: Integrated: Update BotSlackHandlerTest timeout In-Reply-To: References: Message-ID: On Fri, 12 Feb 2021 08:55:27 GMT, Robin Westberg wrote: > The timeout in combination with the default throttling can cause the test the fail. This pull request has now been integrated. Changeset: 406e4a99 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/406e4a99 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Update BotSlackHandlerTest timeout Reviewed-by: ihse, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1007 From ehelin at openjdk.java.net Fri Feb 12 13:08:22 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Feb 2021 13:08:22 GMT Subject: RFR: build: update to Gradle 6.8.2 Message-ID: Hi all, please review this small patch that updates Gradle to version 6.8.2. Testing: - [x] `make images` on Linux x64 - [x] `make test` on Linux x64 Thanks, Erik ------------- Commit messages: - build: update to Gradle 6.8.2 Changes: https://git.openjdk.java.net/skara/pull/1008/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1008&range=00 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1008.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1008/head:pull/1008 PR: https://git.openjdk.java.net/skara/pull/1008 From rwestberg at openjdk.java.net Fri Feb 12 13:08:22 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Feb 2021 13:08:22 GMT Subject: RFR: build: update to Gradle 6.8.2 In-Reply-To: References: Message-ID: On Fri, 12 Feb 2021 13:03:38 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that updates Gradle to version 6.8.2. > > Testing: > - [x] `make images` on Linux x64 > - [x] `make test` on Linux x64 > > Thanks, > Erik Looks good, perhaps update the gradle/something.properties file too? ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1008 From ehelin at openjdk.java.net Fri Feb 12 13:11:29 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Feb 2021 13:11:29 GMT Subject: [skara] RFR: build: run build and tests in parallel Message-ID: <11dmZxurzBr-boTQwWulyPW5cza0Ub06VnFVQbSX-oo=.81933ff1-1dcf-4600-b322-9fa91e6ea5c6@github.com> Hi all, please review this patch that enables builds and tests to happen in parallel. I also tweaked the build a little: - the Gradle daemon now gets an `Xmx` of `2048 Mb` - Gradle will run up to 100 tests in the same JVM before forking a new one - the JVM for compiling will be forked, reducing heap pressure on the Gradle daemon thread - enabled the file system watching feature for faster rebuilds The results on my AMD Ryzen 5 3600 is that `sh gradlew clean && sh gradlew --info test` went from ~10 minutes to ~2 minutes :partying_face: ?? Testing: - [x] `make images` on Linux x64 - [x] `make test` on Linux x64 Thanks, Erik ------------- Depends on: https://git.openjdk.java.net/skara/pull/1008 Commit messages: - Merge master - Update BotSlackHandlerTest timeout - build: run build and tests in parallel Changes: https://git.openjdk.java.net/skara/pull/1009/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1009&range=00 Stats: 21 lines in 3 files changed: 20 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1009.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1009/head:pull/1009 PR: https://git.openjdk.java.net/skara/pull/1009 From rwestberg at openjdk.java.net Fri Feb 12 13:13:04 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Feb 2021 13:13:04 GMT Subject: RFR: Avoid considering fixVersions that are not valid releases when calculating the hgupdate-sync label Message-ID: <7E6MkFjPKC_lze1k-FLTbMomk7cn-q8KsIi9b2F_Rv8=.72043d37-5cad-4f30-b5a0-8a93720f7663@github.com> There may be backport records that have fixVersions that should be ignored when calculating which of them should receive the hgupdate-sync label. ------------- Commit messages: - Avoid considering fixVersions that are not valid releases when calculating the hgupdate-sync label. Changes: https://git.openjdk.java.net/skara/pull/1010/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1010&range=00 Stats: 94 lines in 4 files changed: 31 ins; 9 del; 54 mod Patch: https://git.openjdk.java.net/skara/pull/1010.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1010/head:pull/1010 PR: https://git.openjdk.java.net/skara/pull/1010 From rwestberg at openjdk.java.net Fri Feb 12 13:36:06 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Feb 2021 13:36:06 GMT Subject: RFR: build: run build and tests in parallel In-Reply-To: <11dmZxurzBr-boTQwWulyPW5cza0Ub06VnFVQbSX-oo=.81933ff1-1dcf-4600-b322-9fa91e6ea5c6@github.com> References: <11dmZxurzBr-boTQwWulyPW5cza0Ub06VnFVQbSX-oo=.81933ff1-1dcf-4600-b322-9fa91e6ea5c6@github.com> Message-ID: On Fri, 12 Feb 2021 13:08:33 GMT, Erik Helin wrote: > Hi all, > > please review this patch that enables builds and tests to happen in parallel. I also tweaked the build a little: > > - the Gradle daemon now gets an `Xmx` of `2048 Mb` > - Gradle will run up to 100 tests in the same JVM before forking a new one > - the JVM for compiling will be forked, reducing heap pressure on the Gradle daemon thread > - enabled the file system watching feature for faster rebuilds > > The results on my AMD Ryzen 5 3600 is that `sh gradlew clean && sh gradlew --info test` went from ~10 minutes to ~2 minutes :partying_face: ?? > > Testing: > - [x] `make images` on Linux x64 > - [x] `make test` on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1009 From ehelin at openjdk.java.net Fri Feb 12 13:42:44 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Feb 2021 13:42:44 GMT Subject: [skara] Integrated: build: update to Gradle 6.8.2 In-Reply-To: References: Message-ID: On Fri, 12 Feb 2021 13:03:38 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that updates Gradle to version 6.8.2. > > Testing: > - [x] `make images` on Linux x64 > - [x] `make test` on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 6f833d3b Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/6f833d3b Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod build: update to Gradle 6.8.2 Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1008 From ehelin at openjdk.java.net Fri Feb 12 13:43:22 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Feb 2021 13:43:22 GMT Subject: RFR: build: run build and tests in parallel [v2] In-Reply-To: <11dmZxurzBr-boTQwWulyPW5cza0Ub06VnFVQbSX-oo=.81933ff1-1dcf-4600-b322-9fa91e6ea5c6@github.com> References: <11dmZxurzBr-boTQwWulyPW5cza0Ub06VnFVQbSX-oo=.81933ff1-1dcf-4600-b322-9fa91e6ea5c6@github.com> Message-ID: > Hi all, > > please review this patch that enables builds and tests to happen in parallel. I also tweaked the build a little: > > - the Gradle daemon now gets an `Xmx` of `2048 Mb` > - Gradle will run up to 100 tests in the same JVM before forking a new one > - the JVM for compiling will be forked, reducing heap pressure on the Gradle daemon thread > - enabled the file system watching feature for faster rebuilds > > The results on my AMD Ryzen 5 3600 is that `sh gradlew clean && sh gradlew --info test` went from ~10 minutes to ~2 minutes :partying_face: ?? > > Testing: > - [x] `make images` on Linux x64 > - [x] `make test` on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains three additional commits since the last revision: - Merge master - build: run build and tests in parallel - build: update to Gradle 6.8.2 ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1009/files - new: https://git.openjdk.java.net/skara/pull/1009/files/3c2fad55..3c2fad55 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1009&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1009&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1009.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1009/head:pull/1009 PR: https://git.openjdk.java.net/skara/pull/1009 From ihse at openjdk.java.net Fri Feb 12 14:14:29 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Feb 2021 14:14:29 GMT Subject: RFR: 574: git-info should use info from commit notifications Message-ID: git-info should use info from commit notifications to get the link to the review, not JBS (since not all PR have issues) This required refactoring to move the hosted repo logic from cli/pr/Utils.java to where it can be accessed by all CLI tools. After some deliberating, I left a bunch of trivial wrappers in cli/pr/Utils.java -- otherwise this change would have touched *all* the files in cli/pr. Testing: ad hoc testing of "git info" on some arbitrary Skara commits. ------------- Commit messages: - Use bot comment on forge for getReviewUrl instead of JBS - Extract getReviewUrl - Refactor so that `git info` can use hosted repository. Changes: https://git.openjdk.java.net/skara/pull/1011/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1011&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-574 Stats: 338 lines in 5 files changed: 199 ins; 124 del; 15 mod Patch: https://git.openjdk.java.net/skara/pull/1011.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1011/head:pull/1011 PR: https://git.openjdk.java.net/skara/pull/1011 From rwestberg at openjdk.java.net Fri Feb 12 14:19:01 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Feb 2021 14:19:01 GMT Subject: RFR: Avoid considering fixVersions that are not valid releases when calculating the hgupdate-sync label [v2] In-Reply-To: <7E6MkFjPKC_lze1k-FLTbMomk7cn-q8KsIi9b2F_Rv8=.72043d37-5cad-4f30-b5a0-8a93720f7663@github.com> References: <7E6MkFjPKC_lze1k-FLTbMomk7cn-q8KsIi9b2F_Rv8=.72043d37-5cad-4f30-b5a0-8a93720f7663@github.com> Message-ID: > There may be backport records that have fixVersions that should be ignored when calculating which of them should receive the hgupdate-sync label. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Fix compile issue ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1010/files - new: https://git.openjdk.java.net/skara/pull/1010/files/3e5957ac..3dc9a7e2 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1010&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1010&range=00-01 Stats: 4 lines in 2 files changed: 0 ins; 2 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1010.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1010/head:pull/1010 PR: https://git.openjdk.java.net/skara/pull/1010 From ehelin at openjdk.java.net Fri Feb 12 14:52:26 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Feb 2021 14:52:26 GMT Subject: Integrated: build: run build and tests in parallel In-Reply-To: <11dmZxurzBr-boTQwWulyPW5cza0Ub06VnFVQbSX-oo=.81933ff1-1dcf-4600-b322-9fa91e6ea5c6@github.com> References: <11dmZxurzBr-boTQwWulyPW5cza0Ub06VnFVQbSX-oo=.81933ff1-1dcf-4600-b322-9fa91e6ea5c6@github.com> Message-ID: On Fri, 12 Feb 2021 13:08:33 GMT, Erik Helin wrote: > Hi all, > > please review this patch that enables builds and tests to happen in parallel. I also tweaked the build a little: > > - the Gradle daemon now gets an `Xmx` of `2048 Mb` > - Gradle will run up to 100 tests in the same JVM before forking a new one > - the JVM for compiling will be forked, reducing heap pressure on the Gradle daemon thread > - enabled the file system watching feature for faster rebuilds > > The results on my AMD Ryzen 5 3600 is that `sh gradlew clean && sh gradlew --info test` went from ~10 minutes to ~2 minutes :partying_face: ?? > > Testing: > - [x] `make images` on Linux x64 > - [x] `make test` on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 363871a7 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/363871a7 Stats: 20 lines in 2 files changed: 20 ins; 0 del; 0 mod build: run build and tests in parallel Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1009 From ehelin at openjdk.java.net Fri Feb 12 15:27:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Feb 2021 15:27:27 GMT Subject: RFR: Avoid considering fixVersions that are not valid releases when calculating the hgupdate-sync label [v2] In-Reply-To: References: <7E6MkFjPKC_lze1k-FLTbMomk7cn-q8KsIi9b2F_Rv8=.72043d37-5cad-4f30-b5a0-8a93720f7663@github.com> Message-ID: On Fri, 12 Feb 2021 14:19:01 GMT, Robin Westberg wrote: >> There may be backport records that have fixVersions that should be ignored when calculating which of them should receive the hgupdate-sync label. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Fix compile issue Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1010 From prr at openjdk.java.net Fri Feb 12 15:28:50 2021 From: prr at openjdk.java.net (Phil Race) Date: Fri, 12 Feb 2021 15:28:50 GMT Subject: Integrated: 893: Skara has no mailing list rule for some macOS native client code In-Reply-To: References: Message-ID: <5DKNfoeyudXWNz2k1yNdxObRwoDAIYJioOoqRKhG2eM=.5d3fff75-220c-4977-8d22-8976f9aee616@github.com> On Thu, 11 Feb 2021 19:01:02 GMT, Phil Race wrote: > I'd like to add this rule This pull request has now been integrated. Changeset: ef5e0278 Author: Phil Race Committer: Erik Helin URL: https://git.openjdk.java.net/skara/commit/ef5e0278 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod 893: Skara has no mailing list rule for some macOS native client code Reviewed-by: erikj, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1006 From ihse at openjdk.java.net Mon Feb 15 09:35:20 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 15 Feb 2021 09:35:20 GMT Subject: RFR: Avoid considering fixVersions that are not valid releases when calculating the hgupdate-sync label [v2] In-Reply-To: References: <7E6MkFjPKC_lze1k-FLTbMomk7cn-q8KsIi9b2F_Rv8=.72043d37-5cad-4f30-b5a0-8a93720f7663@github.com> Message-ID: On Fri, 12 Feb 2021 14:19:01 GMT, Robin Westberg wrote: >> There may be backport records that have fixVersions that should be ignored when calculating which of them should receive the hgupdate-sync label. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Fix compile issue Marked as reviewed by ihse (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/1010 From rwestberg at openjdk.java.net Mon Feb 15 10:07:38 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Feb 2021 10:07:38 GMT Subject: RFR: Avoid considering fixVersions that are not valid releases when calculating the hgupdate-sync label [v3] In-Reply-To: <7E6MkFjPKC_lze1k-FLTbMomk7cn-q8KsIi9b2F_Rv8=.72043d37-5cad-4f30-b5a0-8a93720f7663@github.com> References: <7E6MkFjPKC_lze1k-FLTbMomk7cn-q8KsIi9b2F_Rv8=.72043d37-5cad-4f30-b5a0-8a93720f7663@github.com> Message-ID: <2KkTm_Of4nn_62rhMpXOFtNS_2gCLuEA2SrQADVarz0=.dd96e2c2-7241-4dfc-b471-6a7214fbf0df@github.com> > There may be backport records that have fixVersions that should be ignored when calculating which of them should receive the hgupdate-sync label. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Restore jfx parsing ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1010/files - new: https://git.openjdk.java.net/skara/pull/1010/files/3dc9a7e2..7e0d6cfa Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1010&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1010&range=01-02 Stats: 3 lines in 2 files changed: 1 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1010.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1010/head:pull/1010 PR: https://git.openjdk.java.net/skara/pull/1010 From rwestberg at openjdk.java.net Mon Feb 15 10:30:18 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Feb 2021 10:30:18 GMT Subject: [skara] RFR: Rename skara plugins to improve IDE compatibility Message-ID: Improve IDE support for the latest skara gradle plugin structure. ------------- Commit messages: - Rename skara plugins to improve IDE compatibility Changes: https://git.openjdk.java.net/skara/pull/1012/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1012&range=00 Stats: 22 lines in 13 files changed: 0 ins; 0 del; 22 mod Patch: https://git.openjdk.java.net/skara/pull/1012.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1012/head:pull/1012 PR: https://git.openjdk.java.net/skara/pull/1012 From rwestberg at openjdk.java.net Mon Feb 15 10:35:49 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Feb 2021 10:35:49 GMT Subject: [skara] RFR: Rename skara plugins to improve IDE compatibility [v2] In-Reply-To: References: Message-ID: > Improve IDE support for the latest skara gradle plugin structure. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Also rename directories ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1012/files - new: https://git.openjdk.java.net/skara/pull/1012/files/c6f33c96..ed505203 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1012&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1012&range=00-01 Stats: 5 lines in 22 files changed: 0 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/1012.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1012/head:pull/1012 PR: https://git.openjdk.java.net/skara/pull/1012 From rwestberg at openjdk.java.net Mon Feb 15 12:09:36 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Feb 2021 12:09:36 GMT Subject: Integrated: Avoid considering fixVersions that are not valid releases when calculating the hgupdate-sync label In-Reply-To: <7E6MkFjPKC_lze1k-FLTbMomk7cn-q8KsIi9b2F_Rv8=.72043d37-5cad-4f30-b5a0-8a93720f7663@github.com> References: <7E6MkFjPKC_lze1k-FLTbMomk7cn-q8KsIi9b2F_Rv8=.72043d37-5cad-4f30-b5a0-8a93720f7663@github.com> Message-ID: On Fri, 12 Feb 2021 13:10:01 GMT, Robin Westberg wrote: > There may be backport records that have fixVersions that should be ignored when calculating which of them should receive the hgupdate-sync label. This pull request has now been integrated. Changeset: 5707318e Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/5707318e Stats: 95 lines in 5 files changed: 30 ins; 9 del; 56 mod Avoid considering fixVersions that are not valid releases when calculating the hgupdate-sync label Reviewed-by: ehelin, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1010 From ehelin at openjdk.java.net Mon Feb 15 12:28:00 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 12:28:00 GMT Subject: RFR: cli: add debug command commit-comments Message-ID: Hi all, please review this small patch that adds a utility debug command, `git skara debug commit-comments`, that lists recent commit comments for a given remote repository. Testing: - [x] Manual testing on Linux x64 Thanks, Erik ------------- Commit messages: - cli: add debug command commit-comments Changes: https://git.openjdk.java.net/skara/pull/1013/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1013&range=00 Stats: 206 lines in 2 files changed: 205 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1013.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1013/head:pull/1013 PR: https://git.openjdk.java.net/skara/pull/1013 From rwestberg at openjdk.java.net Mon Feb 15 12:28:00 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Feb 2021 12:28:00 GMT Subject: RFR: cli: add debug command commit-comments In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:23:09 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds a utility debug command, `git skara debug commit-comments`, that lists recent commit comments for a given remote repository. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1013 From ihse at openjdk.java.net Mon Feb 15 12:28:55 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 15 Feb 2021 12:28:55 GMT Subject: [skara] RFR: 574: git-info should use info from commit notifications [v2] In-Reply-To: References: Message-ID: <7s2F292Yh2EIg6pdF0yvdUqjuqJ6sUaDCjNYhCBBxms=.2f89e8f4-6879-4ede-a72b-8d27bb1d48d7@github.com> > git-info should use info from commit notifications to get the link to the review, not JBS (since not all PR have issues) > > This required refactoring to move the hosted repo logic from cli/pr/Utils.java to where it can be accessed by all CLI tools. After some deliberating, I left a bunch of trivial wrappers in cli/pr/Utils.java -- otherwise this change would have touched *all* the files in cli/pr. > > Testing: ad hoc testing of "git info" on some arbitrary Skara commits. Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: * Don't depend on bot name when looking for review comment * Fix crash in "git info" for projects where .jcheck/conf was missing the "jbs" key ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1011/files - new: https://git.openjdk.java.net/skara/pull/1011/files/0c0df134..d23292da Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1011&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1011&range=00-01 Stats: 25 lines in 1 file changed: 10 ins; 3 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/1011.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1011/head:pull/1011 PR: https://git.openjdk.java.net/skara/pull/1011 From rwestberg at openjdk.java.net Mon Feb 15 12:31:24 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Feb 2021 12:31:24 GMT Subject: RFR: forge: double time-span for recent commit comments for GitLab In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:27:48 GMT, Erik Helin wrote: > Hi all, > > please review this patch that increases the time span for fetching recent commit comments for a GitLab repository from `2` to `4` days. This ensures that the bots have some margin to fetch commit comments made prior to a weekend (in the unlikely case that the bots would be down over the weekend). > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1014 From ehelin at openjdk.java.net Mon Feb 15 12:31:24 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 12:31:24 GMT Subject: RFR: forge: double time-span for recent commit comments for GitLab Message-ID: Hi all, please review this patch that increases the time span for fetching recent commit comments for a GitLab repository from `2` to `4` days. This ensures that the bots have some margin to fetch commit comments made prior to a weekend (in the unlikely case that the bots would be down over the weekend). Testing: - [x] `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - forge: double time-span for recent commit comments for GitLab Changes: https://git.openjdk.java.net/skara/pull/1014/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1014&range=00 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1014.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1014/head:pull/1014 PR: https://git.openjdk.java.net/skara/pull/1014 From ehelin at openjdk.java.net Mon Feb 15 12:40:20 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 12:40:20 GMT Subject: RFR: pr: configure fork names explicitly Message-ID: Hi all, please review this small patch that allows fork names to be configured a bit more freely for the PR bot. Thanks, Erik ------------- Commit messages: - pr: configure fork names explicitly Changes: https://git.openjdk.java.net/skara/pull/1015/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1015&range=00 Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1015.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1015/head:pull/1015 PR: https://git.openjdk.java.net/skara/pull/1015 From rwestberg at openjdk.java.net Mon Feb 15 12:40:21 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Feb 2021 12:40:21 GMT Subject: RFR: pr: configure fork names explicitly In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:36:07 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that allows fork names to be configured a bit more freely for the PR bot. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1015 From ehelin at openjdk.java.net Mon Feb 15 12:58:29 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 12:58:29 GMT Subject: RFR: pr: remove commitCommandUsers Message-ID: Hi all, please review this patch that removes the `commitCommandUsers` functionality from the PR bot. There is no need to describe the users who should be allowed to issue commit commands, all users should be able to do so. Individual commit commands might choose to limit users (e.g. based on census), but that should be up to individual commit commands. Testing: - [x] `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - pr: remove commitCommandUsers Changes: https://git.openjdk.java.net/skara/pull/1016/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1016&range=00 Stats: 37 lines in 5 files changed: 0 ins; 28 del; 9 mod Patch: https://git.openjdk.java.net/skara/pull/1016.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1016/head:pull/1016 PR: https://git.openjdk.java.net/skara/pull/1016 From rwestberg at openjdk.java.net Mon Feb 15 12:58:30 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Feb 2021 12:58:30 GMT Subject: RFR: pr: remove commitCommandUsers In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:53:34 GMT, Erik Helin wrote: > Hi all, > > please review this patch that removes the `commitCommandUsers` functionality from the PR bot. There is no need to describe the users who should be allowed to issue commit commands, all users should be able to do so. Individual commit commands might choose to limit users (e.g. based on census), but that should be up to individual commit commands. > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1016 From ihse at openjdk.java.net Mon Feb 15 12:58:47 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 15 Feb 2021 12:58:47 GMT Subject: RFR: 574: git-info should use info from commit notifications [v3] In-Reply-To: References: Message-ID: > git-info should use info from commit notifications to get the link to the review, not JBS (since not all PR have issues) > > This required refactoring to move the hosted repo logic from cli/pr/Utils.java to where it can be accessed by all CLI tools. After some deliberating, I left a bunch of trivial wrappers in cli/pr/Utils.java -- otherwise this change would have touched *all* the files in cli/pr. > > Testing: ad hoc testing of "git info" on some arbitrary Skara commits. Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: Add test for reviewUrl parsing ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1011/files - new: https://git.openjdk.java.net/skara/pull/1011/files/d23292da..50d82756 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1011&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1011&range=01-02 Stats: 92 lines in 3 files changed: 70 ins; 21 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1011.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1011/head:pull/1011 PR: https://git.openjdk.java.net/skara/pull/1011 From ehelin at openjdk.java.net Mon Feb 15 13:02:04 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 13:02:04 GMT Subject: RFR: pr: handle exceptions for commit commands Message-ID: Hi all, please review this patch that properly handles `RuntimeException`s thrown by commit commands. Testing: - [x] `make test` passes on Linux x64 Thanks, Erik ------------- Depends on: https://git.openjdk.java.net/skara/pull/1016 Commit messages: - pr: handle exceptions for commit commands Changes: https://git.openjdk.java.net/skara/pull/1017/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1017&range=00 Stats: 22 lines in 2 files changed: 10 ins; 6 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/1017.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1017/head:pull/1017 PR: https://git.openjdk.java.net/skara/pull/1017 From rwestberg at openjdk.java.net Mon Feb 15 13:04:18 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Feb 2021 13:04:18 GMT Subject: RFR: pr: handle exceptions for commit commands In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:59:16 GMT, Erik Helin wrote: > Hi all, > > please review this patch that properly handles `RuntimeException`s thrown by commit commands. > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Looks good in general, but it may be prudent to change processedCommitComments to a concurrent type now that it can be accessed from another context. ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1017 From ehelin at openjdk.java.net Mon Feb 15 13:10:54 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 13:10:54 GMT Subject: Integrated: cli: add debug command commit-comments In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:23:09 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds a utility debug command, `git skara debug commit-comments`, that lists recent commit comments for a given remote repository. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 47b06d00 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/47b06d00 Stats: 206 lines in 2 files changed: 205 ins; 0 del; 1 mod cli: add debug command commit-comments Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1013 From ihse at openjdk.java.net Mon Feb 15 13:14:21 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 15 Feb 2021 13:14:21 GMT Subject: RFR: pr: remove commitCommandUsers In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:53:34 GMT, Erik Helin wrote: > Hi all, > > please review this patch that removes the `commitCommandUsers` functionality from the PR bot. There is no need to describe the users who should be allowed to issue commit commands, all users should be able to do so. Individual commit commands might choose to limit users (e.g. based on census), but that should be up to individual commit commands. > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Marked as reviewed by ihse (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/1016 From ehelin at openjdk.java.net Mon Feb 15 13:14:58 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 13:14:58 GMT Subject: RFR: Rename skara plugins to improve IDE compatibility [v2] In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 10:35:49 GMT, Robin Westberg wrote: >> Improve IDE support for the latest skara gradle plugin structure. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Also rename directories Looks good, thanks for fixing! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1012 From ehelin at openjdk.java.net Mon Feb 15 13:16:06 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 13:16:06 GMT Subject: [skara] Integrated: pr: configure fork names explicitly In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:36:07 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that allows fork names to be configured a bit more freely for the PR bot. > > Thanks, > Erik This pull request has now been integrated. Changeset: 3cf5bd0b Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/3cf5bd0b Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod pr: configure fork names explicitly Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1015 From ehelin at openjdk.java.net Mon Feb 15 13:16:04 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 13:16:04 GMT Subject: Integrated: forge: double time-span for recent commit comments for GitLab In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:27:48 GMT, Erik Helin wrote: > Hi all, > > please review this patch that increases the time span for fetching recent commit comments for a GitLab repository from `2` to `4` days. This ensures that the bots have some margin to fetch commit comments made prior to a weekend (in the unlikely case that the bots would be down over the weekend). > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 56221f31 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/56221f31 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod forge: double time-span for recent commit comments for GitLab Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1014 From ehelin at openjdk.java.net Mon Feb 15 13:18:19 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 13:18:19 GMT Subject: Integrated: pr: remove commitCommandUsers In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:53:34 GMT, Erik Helin wrote: > Hi all, > > please review this patch that removes the `commitCommandUsers` functionality from the PR bot. There is no need to describe the users who should be allowed to issue commit commands, all users should be able to do so. Individual commit commands might choose to limit users (e.g. based on census), but that should be up to individual commit commands. > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 80777666 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/80777666 Stats: 37 lines in 5 files changed: 0 ins; 28 del; 9 mod pr: remove commitCommandUsers Reviewed-by: rwestberg, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1016 From ehelin at openjdk.java.net Mon Feb 15 13:18:47 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 13:18:47 GMT Subject: [skara] RFR: pr: handle exceptions for commit commands [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that properly handles `RuntimeException`s thrown by commit commands. > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1017/files - new: https://git.openjdk.java.net/skara/pull/1017/files/1fe92740..1fe92740 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1017&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1017&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1017.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1017/head:pull/1017 PR: https://git.openjdk.java.net/skara/pull/1017 From rwestberg at openjdk.java.net Mon Feb 15 13:20:36 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Feb 2021 13:20:36 GMT Subject: Integrated: Rename skara plugins to improve IDE compatibility In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 10:27:18 GMT, Robin Westberg wrote: > Improve IDE support for the latest skara gradle plugin structure. This pull request has now been integrated. Changeset: 5f136317 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/5f136317 Stats: 32 lines in 30 files changed: 5 ins; 5 del; 22 mod Rename skara plugins to improve IDE compatibility Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1012 From ehelin at openjdk.java.net Mon Feb 15 13:40:16 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 13:40:16 GMT Subject: [skara] RFR: pr: handle exceptions for commit commands [v2] In-Reply-To: References: Message-ID: <8ZNlKDee9y16zXl7WBhmrbxWQA1JcnWKw5h92Kh3CCE=.01eda7a8-f261-42c3-b34a-994308649a26@github.com> On Mon, 15 Feb 2021 13:02:05 GMT, Robin Westberg wrote: > ... it may be prudent to change processedCommitComments to a concurrent type now that it can be accessed from another context. Good idea, I pushed a commit that changes the `HashSet` to `ConcurrentHashMap` ?? ------------- PR: https://git.openjdk.java.net/skara/pull/1017 From ehelin at openjdk.java.net Mon Feb 15 13:40:15 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 13:40:15 GMT Subject: [skara] RFR: pr: handle exceptions for commit commands [v3] In-Reply-To: References: Message-ID: <_hxJvCjzQWhurn6873qpiqK-rMP0OSPJAXF31P9O5bg=.bd113f3d-9f3c-4c23-b138-824446bc2094@github.com> > Hi all, > > please review this patch that properly handles `RuntimeException`s thrown by commit commands. > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Use ConcurrentHashMap instead of HashSet ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1017/files - new: https://git.openjdk.java.net/skara/pull/1017/files/1fe92740..aa65a546 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1017&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1017&range=01-02 Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1017.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1017/head:pull/1017 PR: https://git.openjdk.java.net/skara/pull/1017 From ehelin at openjdk.java.net Mon Feb 15 13:40:16 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 13:40:16 GMT Subject: [skara] Integrated: pr: handle exceptions for commit commands In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:59:16 GMT, Erik Helin wrote: > Hi all, > > please review this patch that properly handles `RuntimeException`s thrown by commit commands. > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 606991c8 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/606991c8 Stats: 24 lines in 2 files changed: 10 ins; 6 del; 8 mod pr: handle exceptions for commit commands Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1017 From ehelin at openjdk.java.net Mon Feb 15 14:50:42 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 14:50:42 GMT Subject: RFR: pr: fix Markdown for /backport Message-ID: <6D9MlvlFkwOlwW9h8Z4aBHsobsAgovIQ3jVJOKY6EhI=.10fd2cd2-0a71-444a-b2db-e1f0c6a5d76c@github.com> Hi all, please review this small patch that fixes the Markdown in the pull request created by the `/backport` commit command. I had simply forgotten to call `.get()` on an `Optinal` ?? Thanks, Erik ------------- Commit messages: - pr: fix Markdown for /backport Changes: https://git.openjdk.java.net/skara/pull/1018/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1018&range=00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1018.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1018/head:pull/1018 PR: https://git.openjdk.java.net/skara/pull/1018 From rwestberg at openjdk.java.net Mon Feb 15 15:18:46 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Feb 2021 15:18:46 GMT Subject: RFR: pr: fix Markdown for /backport In-Reply-To: <6D9MlvlFkwOlwW9h8Z4aBHsobsAgovIQ3jVJOKY6EhI=.10fd2cd2-0a71-444a-b2db-e1f0c6a5d76c@github.com> References: <6D9MlvlFkwOlwW9h8Z4aBHsobsAgovIQ3jVJOKY6EhI=.10fd2cd2-0a71-444a-b2db-e1f0c6a5d76c@github.com> Message-ID: On Mon, 15 Feb 2021 14:47:50 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that fixes the Markdown in the pull request created by the `/backport` commit command. I had simply forgotten to call `.get()` on an `Optinal` ?? > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1018 From ihse at openjdk.java.net Mon Feb 15 16:09:33 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 15 Feb 2021 16:09:33 GMT Subject: RFR: pr: fix Markdown for /backport In-Reply-To: <6D9MlvlFkwOlwW9h8Z4aBHsobsAgovIQ3jVJOKY6EhI=.10fd2cd2-0a71-444a-b2db-e1f0c6a5d76c@github.com> References: <6D9MlvlFkwOlwW9h8Z4aBHsobsAgovIQ3jVJOKY6EhI=.10fd2cd2-0a71-444a-b2db-e1f0c6a5d76c@github.com> Message-ID: On Mon, 15 Feb 2021 14:47:50 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that fixes the Markdown in the pull request created by the `/backport` commit command. I had simply forgotten to call `.get()` on an `Optinal` ?? > > Thanks, > Erik Marked as reviewed by ihse (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/1018 From ehelin at openjdk.java.net Mon Feb 15 18:11:19 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 18:11:19 GMT Subject: RFR: 574: git-info should use info from commit notifications [v3] In-Reply-To: References: Message-ID: On Mon, 15 Feb 2021 12:58:47 GMT, Magnus Ihse Bursie wrote: >> git-info should use info from commit notifications to get the link to the review, not JBS (since not all PR have issues) >> >> This required refactoring to move the hosted repo logic from cli/pr/Utils.java to where it can be accessed by all CLI tools. After some deliberating, I left a bunch of trivial wrappers in cli/pr/Utils.java -- otherwise this change would have touched *all* the files in cli/pr. >> >> Testing: ad hoc testing of "git info" on some arbitrary Skara commits. > > Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: > > Add test for reviewUrl parsing forge/src/main/java/org/openjdk/skara/forge/HostedRepository.java line 103: > 101: */ > 102: > 103: var pattern = Pattern.compile("### Review[^]]*]\\((.*)\\)"); Do you need to use `Pattern.DOTALL` here? As in `Pattern.compile("### Review[^]]*]\((.*)\)", Pattern.DOTALL);` ? I'm thinking about the `.*` handling `\n`. ------------- PR: https://git.openjdk.java.net/skara/pull/1011 From ehelin at openjdk.java.net Mon Feb 15 18:13:46 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Feb 2021 18:13:46 GMT Subject: Integrated: pr: fix Markdown for /backport In-Reply-To: <6D9MlvlFkwOlwW9h8Z4aBHsobsAgovIQ3jVJOKY6EhI=.10fd2cd2-0a71-444a-b2db-e1f0c6a5d76c@github.com> References: <6D9MlvlFkwOlwW9h8Z4aBHsobsAgovIQ3jVJOKY6EhI=.10fd2cd2-0a71-444a-b2db-e1f0c6a5d76c@github.com> Message-ID: <5dVcJFOroinI135rEYWIwv_iBjtOsxn6fIWfInxfw0c=.54638232-a93e-4988-becd-e72dd5037bdd@github.com> On Mon, 15 Feb 2021 14:47:50 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that fixes the Markdown in the pull request created by the `/backport` commit command. I had simply forgotten to call `.get()` on an `Optinal` ?? > > Thanks, > Erik This pull request has now been integrated. Changeset: 3f688aee Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/3f688aee Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod pr: fix Markdown for /backport Reviewed-by: rwestberg, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1018 From ihse at openjdk.java.net Tue Feb 16 07:46:33 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 16 Feb 2021 07:46:33 GMT Subject: RFR: 574: git-info should use info from commit notifications [v3] In-Reply-To: References: Message-ID: <-8iCzdtTFLQ4E3X0IThDDXOBKr1fVPdPNYxJPey77TY=.84727228-8acb-4c6b-9349-fc172542c46d@github.com> On Mon, 15 Feb 2021 18:09:04 GMT, Erik Helin wrote: >> Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: >> >> Add test for reviewUrl parsing > > forge/src/main/java/org/openjdk/skara/forge/HostedRepository.java line 103: > >> 101: */ >> 102: >> 103: var pattern = Pattern.compile("### Review[^]]*]\\((.*)\\)"); > > Do you need to use `Pattern.DOTALL` here? As in `Pattern.compile("### Review[^]]*]\((.*)\)", Pattern.DOTALL);` ? I'm thinking about the `.*` handling `\n`. As you can see from the test, this works just fine. :-) The `DOTALL` flag only applies to the dot `.`. I'm searching for "anything but ]", `[^]]` which also includes line terminators. And the URL (that I match with `.*`) should of course not have line breaks in it. ------------- PR: https://git.openjdk.java.net/skara/pull/1011 From rwestberg at openjdk.java.net Tue Feb 16 13:20:25 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Feb 2021 13:20:25 GMT Subject: [skara] RFR: Initial version of census upgrade bot Message-ID: Allows automated conversion of census.xml to the Skara format. ------------- Commit messages: - Remove mistakenly added file - Initial version of census upgrade bot Changes: https://git.openjdk.java.net/skara/pull/1019/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1019&range=00 Stats: 382 lines in 5 files changed: 363 ins; 9 del; 10 mod Patch: https://git.openjdk.java.net/skara/pull/1019.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1019/head:pull/1019 PR: https://git.openjdk.java.net/skara/pull/1019 From ehelin at openjdk.java.net Tue Feb 16 13:23:06 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Feb 2021 13:23:06 GMT Subject: RFR: forge: improve GitLabRepository::commitWithComment Message-ID: Hi all, please review this patch that improves the method `GitLabRepository::commitWithComment`. The problem is that GitLab's search API isn't really up to par (cannot handle square brackets in search query) and the search API is also going in away from GitLab CE in 13.9. This patch implements a simple search, just iterating backwards over the most recent commits, searching for the given title. The results are cached in-memory to speed up future searches. Testing: - [x] Manual testing on Linux x64 using `git-skara debug commit-comments` Thanks, Erik ------------- Commit messages: - forge: improve GitLabRepository::commitWithComment Changes: https://git.openjdk.java.net/skara/pull/1020/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1020&range=00 Stats: 58 lines in 1 file changed: 30 ins; 8 del; 20 mod Patch: https://git.openjdk.java.net/skara/pull/1020.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1020/head:pull/1020 PR: https://git.openjdk.java.net/skara/pull/1020 From rwestberg at openjdk.java.net Tue Feb 16 13:25:07 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Feb 2021 13:25:07 GMT Subject: [skara] RFR: forge: improve GitLabRepository::commitWithComment In-Reply-To: References: Message-ID: On Tue, 16 Feb 2021 13:18:57 GMT, Erik Helin wrote: > Hi all, > > please review this patch that improves the method `GitLabRepository::commitWithComment`. The problem is that GitLab's search API isn't really up to par (cannot handle square brackets in search query) and the search API is also going in away from GitLab CE in 13.9. This patch implements a simple search, just iterating backwards over the most recent commits, searching for the given title. The results are cached in-memory to speed up future searches. > > Testing: > - [x] Manual testing on Linux x64 using `git-skara debug commit-comments` > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1020 From ehelin at openjdk.java.net Tue Feb 16 13:29:22 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Feb 2021 13:29:22 GMT Subject: RFR: 574: git-info should use info from commit notifications [v3] In-Reply-To: References: Message-ID: <7NkbffHH1614u6kYozwBpMARIVh7SL8Hz8tm29ObSCU=.cbf3a191-23ba-4917-9eb8-9787e9987f94@github.com> On Mon, 15 Feb 2021 12:58:47 GMT, Magnus Ihse Bursie wrote: >> git-info should use info from commit notifications to get the link to the review, not JBS (since not all PR have issues) >> >> This required refactoring to move the hosted repo logic from cli/pr/Utils.java to where it can be accessed by all CLI tools. After some deliberating, I left a bunch of trivial wrappers in cli/pr/Utils.java -- otherwise this change would have touched *all* the files in cli/pr. >> >> Testing: ad hoc testing of "git info" on some arbitrary Skara commits. > > Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: > > Add test for reviewUrl parsing Looks good modulo some whitespace issues found by jcheck :robot: ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1011 From ehelin at openjdk.java.net Tue Feb 16 13:36:19 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Feb 2021 13:36:19 GMT Subject: [skara] Integrated: forge: improve GitLabRepository::commitWithComment In-Reply-To: References: Message-ID: <-Apj4URWKPS6HXiuUzTXFR2r6otbkN9TPXjM5O4qgyo=.340d64a2-03d3-4dd4-b95e-2fcf80c993e8@github.com> On Tue, 16 Feb 2021 13:18:57 GMT, Erik Helin wrote: > Hi all, > > please review this patch that improves the method `GitLabRepository::commitWithComment`. The problem is that GitLab's search API isn't really up to par (cannot handle square brackets in search query) and the search API is also going in away from GitLab CE in 13.9. This patch implements a simple search, just iterating backwards over the most recent commits, searching for the given title. The results are cached in-memory to speed up future searches. > > Testing: > - [x] Manual testing on Linux x64 using `git-skara debug commit-comments` > > Thanks, > Erik This pull request has now been integrated. Changeset: e2670108 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/e2670108 Stats: 58 lines in 1 file changed: 30 ins; 8 del; 20 mod forge: improve GitLabRepository::commitWithComment Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1020 From erik.helin at oracle.com Tue Feb 16 15:20:37 2021 From: erik.helin at oracle.com (Erik Helin) Date: Tue, 16 Feb 2021 16:20:37 +0100 Subject: Mirror jdk 8u to Skara In-Reply-To: <287b3f99-22a3-411e-7f24-f9f104174403@redhat.com> References: <287b3f99-22a3-411e-7f24-f9f104174403@redhat.com> Message-ID: On 2/11/21 6:33 PM, Andrew Haley wrote: > I'm looking at https://github.com/openjdk and I can't see any > old OpenJDK trees. (By "old" I mean from before we went over to > a unified repo.) Check again :) Thanks to Erik Joelsson we have consolidated (and then converted) a bunch of "old" repositories: - https://github.com/openjdk/jdk6 - https://github.com/openjdk/jdk7 - https://github.com/openjdk/jdk8 - https://github.com/openjdk/jdk8u - https://github.com/openjdk/jdk9 - https://github.com/openjdk/jdk9u Note that jdk7u is missing, we are still working on that one. On 2/11/21 6:33 PM, Andrew Haley wrote: > Can we have a mirror of jdk8u, please? I'd like to kick the tyres, > and if it works well we can consider moving to it. Yep, see above. Since jdk8u is actively being developed using a Mercurial forest we can unfortunately not do live mirroring. The Git mirrors of consolidated repositories can only be updated every tag (and even that is not always certain). Due to this we will update the jdk8u Git repository on a best-effort basis. The Git repository at https://github.com/openjdk/jdk8u is currently consolidated (and converted) up until tag jdk8u292-b01. Thanks, Erik From ihse at openjdk.java.net Tue Feb 16 16:01:15 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 16 Feb 2021 16:01:15 GMT Subject: RFR: 574: git-info should use info from commit notifications [v4] In-Reply-To: References: Message-ID: > git-info should use info from commit notifications to get the link to the review, not JBS (since not all PR have issues) > > This required refactoring to move the hosted repo logic from cli/pr/Utils.java to where it can be accessed by all CLI tools. After some deliberating, I left a bunch of trivial wrappers in cli/pr/Utils.java -- otherwise this change would have touched *all* the files in cli/pr. > > Testing: ad hoc testing of "git info" on some arbitrary Skara commits. Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: Fix trailing whitespace ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1011/files - new: https://git.openjdk.java.net/skara/pull/1011/files/50d82756..e947d950 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1011&range=03 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1011&range=02-03 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1011.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1011/head:pull/1011 PR: https://git.openjdk.java.net/skara/pull/1011 From aph at redhat.com Tue Feb 16 16:06:46 2021 From: aph at redhat.com (Andrew Haley) Date: Tue, 16 Feb 2021 16:06:46 +0000 Subject: Mirror jdk 8u to Skara In-Reply-To: References: <287b3f99-22a3-411e-7f24-f9f104174403@redhat.com> Message-ID: <8ac2dac0-4811-e842-7958-5f9b0017ec38@redhat.com> On 16/02/2021 15:20, Erik Helin wrote: > On 2/11/21 6:33 PM, Andrew Haley wrote: >> I'm looking at https://github.com/openjdk and I can't see any >> old OpenJDK trees. (By "old" I mean from before we went over to >> a unified repo.) > > Check again :) Thanks to Erik Joelsson we have consolidated (and then > converted) a bunch of "old" repositories: > > - https://github.com/openjdk/jdk6 > - https://github.com/openjdk/jdk7 > - https://github.com/openjdk/jdk8 > - https://github.com/openjdk/jdk8u > - https://github.com/openjdk/jdk9 > - https://github.com/openjdk/jdk9u > > Note that jdk7u is missing, we are still working on that one. Excellent, thank you for doing this. -- Andrew Haley (he/him) Java Platform Lead Engineer Red Hat UK Ltd. https://keybase.io/andrewhaley EAC8 43EB D3EF DB98 CC77 2FAD A5CD 6035 332F A671 From rwestberg at openjdk.java.net Tue Feb 16 16:50:30 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Feb 2021 16:50:30 GMT Subject: RFR: Initial version of census upgrade bot [v2] In-Reply-To: References: Message-ID: > Allows automated conversion of census.xml to the Skara format. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Avoid duplicating the XML class already present in the Census module ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1019/files - new: https://git.openjdk.java.net/skara/pull/1019/files/705b6362..2718fadb Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1019&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1019&range=00-01 Stats: 398 lines in 18 files changed: 201 ins; 197 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1019.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1019/head:pull/1019 PR: https://git.openjdk.java.net/skara/pull/1019 From erik.joelsson at oracle.com Tue Feb 16 19:35:40 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Tue, 16 Feb 2021 11:35:40 -0800 Subject: Mirror jdk 8u to Skara In-Reply-To: References: <287b3f99-22a3-411e-7f24-f9f104174403@redhat.com> Message-ID: <34580fbc-2a63-0422-eff6-c3de9b1df5af@oracle.com> Hello, Awesome to see these converted repos posted! I would like to stress, that these should still be viewed as prototype conversions and need some tire kicking. When looking at the change log in git, the commits are sorted by creation date. This makes it look pretty weird compared to how my mercurial mono repo looks. All the changes I created during the consolidation (merges and tags) have the date at which the conversion was done, so up until jdk8-b120, that's July 2017 and after that it's 2021. So all those changes are listed on top, and there are a lot of them. We could change the conversion script to force other dates into the changes, based on something in from the source changes being merged or tagged, but since we didn't do that for the original consolidation, doing so now would lose the common change history we now have with mainline up until jdk8-b120. /Erik On 2021-02-16 07:20, Erik Helin wrote: > On 2/11/21 6:33 PM, Andrew Haley wrote: >> I'm looking at https://github.com/openjdk and I can't see any >> old OpenJDK trees. (By "old" I mean from before we went over to >> a unified repo.) > > Check again :) Thanks to Erik Joelsson we have consolidated (and then > converted) a bunch of "old" repositories: > > - https://github.com/openjdk/jdk6 > - https://github.com/openjdk/jdk7 > - https://github.com/openjdk/jdk8 > - https://github.com/openjdk/jdk8u > - https://github.com/openjdk/jdk9 > - https://github.com/openjdk/jdk9u > > Note that jdk7u is missing, we are still working on that one. > > On 2/11/21 6:33 PM, Andrew Haley wrote: >> Can we have a mirror of jdk8u, please? I'd like to kick the tyres, >> and if it works well we can consider moving to it. > > Yep, see above. > > Since jdk8u is actively being developed using a Mercurial forest we > can unfortunately not do live mirroring. The Git mirrors of > consolidated repositories can only be updated every tag (and even that > is not always certain). Due to this we will update the jdk8u Git > repository on a best-effort basis. The Git repository at > https://github.com/openjdk/jdk8u is currently consolidated (and > converted) up until tag jdk8u292-b01. > > Thanks, > Erik From ehelin at openjdk.java.net Wed Feb 17 09:36:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Feb 2021 09:36:45 GMT Subject: RFR: Initial version of census upgrade bot [v2] In-Reply-To: References: Message-ID: On Tue, 16 Feb 2021 16:50:30 GMT, Robin Westberg wrote: >> Allows automated conversion of census.xml to the Skara format. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Avoid duplicating the XML class already present in the Census module Looks good, but may I suggest renaming `CensusSyncDowngradeBot.java` to `CensusSyncUnifyBot.java` and `CensusSyncUpgradeBot.java` to `CensusSyncSplitBot.java`? Makes it a bit more clear what the bots are doing ?? xml/build.gradle line 30: > 28: publishing { > 29: publications { > 30: webrev(MavenPublication) { Suggestion: xml(MavenPublication) { ------------- PR: https://git.openjdk.java.net/skara/pull/1019 From rwestberg at openjdk.java.net Wed Feb 17 14:20:44 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Feb 2021 14:20:44 GMT Subject: RFR: Move hgupdate-sync label functionality to SyncLabelBot Message-ID: <2a0KzN_jTS2XBS7rBXPPSRpB_T0ochJZc1uO3gt9UfM=.6cb4a6cb-5fd7-4f80-bb44-cf91af3a6570@github.com> Move the responsibility of updating the hgupdate-sync label to the SyncLabelBot. ------------- Commit messages: - Move hgupdate-sync label functionality to SyncLabelBot Changes: https://git.openjdk.java.net/skara/pull/1021/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1021&range=00 Stats: 379 lines in 10 files changed: 229 ins; 136 del; 14 mod Patch: https://git.openjdk.java.net/skara/pull/1021.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1021/head:pull/1021 PR: https://git.openjdk.java.net/skara/pull/1021 From rwestberg at openjdk.java.net Wed Feb 17 14:33:09 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Feb 2021 14:33:09 GMT Subject: [skara] RFR: Initial version of census upgrade bot [v3] In-Reply-To: References: Message-ID: > Allows automated conversion of census.xml to the Skara format. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Apply review comments ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1019/files - new: https://git.openjdk.java.net/skara/pull/1019/files/2718fadb..bfdb6374 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1019&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1019&range=01-02 Stats: 29 lines in 4 files changed: 0 ins; 14 del; 15 mod Patch: https://git.openjdk.java.net/skara/pull/1019.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1019/head:pull/1019 PR: https://git.openjdk.java.net/skara/pull/1019 From ihse at openjdk.java.net Wed Feb 17 18:06:53 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Wed, 17 Feb 2021 18:06:53 GMT Subject: Integrated: 574: git-info should use info from commit notifications In-Reply-To: References: Message-ID: On Fri, 12 Feb 2021 14:11:45 GMT, Magnus Ihse Bursie wrote: > git-info should use info from commit notifications to get the link to the review, not JBS (since not all PR have issues) > > This required refactoring to move the hosted repo logic from cli/pr/Utils.java to where it can be accessed by all CLI tools. After some deliberating, I left a bunch of trivial wrappers in cli/pr/Utils.java -- otherwise this change would have touched *all* the files in cli/pr. > > Testing: ad hoc testing of "git info" on some arbitrary Skara commits. This pull request has now been integrated. Changeset: a8fe187e Author: Magnus Ihse Bursie Committer: Erik Helin URL: https://git.openjdk.java.net/skara/commit/a8fe187e Stats: 410 lines in 7 files changed: 258 ins; 127 del; 25 mod 574: git-info should use info from commit notifications Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1011 From ehelin at openjdk.java.net Wed Feb 17 18:07:03 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Feb 2021 18:07:03 GMT Subject: [skara] RFR: Initial version of census upgrade bot [v3] In-Reply-To: References: Message-ID: On Wed, 17 Feb 2021 14:33:09 GMT, Robin Westberg wrote: >> Allows automated conversion of census.xml to the Skara format. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Apply review comments Looks great! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1019 From rwestberg at openjdk.java.net Wed Feb 17 19:05:47 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Feb 2021 19:05:47 GMT Subject: Integrated: Initial version of census upgrade bot In-Reply-To: References: Message-ID: On Tue, 16 Feb 2021 13:16:05 GMT, Robin Westberg wrote: > Allows automated conversion of census.xml to the Skara format. This pull request has now been integrated. Changeset: ab4c1f18 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/ab4c1f18 Stats: 598 lines in 19 files changed: 466 ins; 122 del; 10 mod Initial version of census upgrade bot Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1019 From ihse at openjdk.java.net Wed Feb 17 19:48:11 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Wed, 17 Feb 2021 19:48:11 GMT Subject: RFR: Initial version of census upgrade bot [v3] In-Reply-To: References: Message-ID: On Wed, 17 Feb 2021 14:33:09 GMT, Robin Westberg wrote: >> Allows automated conversion of census.xml to the Skara format. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Apply review comments bots/censussync/src/main/java/org/openjdk/skara/bots/censussync/CensusSyncSplitBot.java line 179: > 177: break; > 178: default: > 179: if (name.equals("openjfx") && (username.equals("dwookey") || username.equals("jpereda"))) { I know this is already integrated, but these sounds like weird hard-coded exceptions? If there are issues in the census data, maybe they should be fixed instead? ------------- PR: https://git.openjdk.java.net/skara/pull/1019 From ihse at openjdk.java.net Thu Feb 18 10:47:44 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 18 Feb 2021 10:47:44 GMT Subject: RFR: Move hgupdate-sync label functionality to SyncLabelBot In-Reply-To: <2a0KzN_jTS2XBS7rBXPPSRpB_T0ochJZc1uO3gt9UfM=.6cb4a6cb-5fd7-4f80-bb44-cf91af3a6570@github.com> References: <2a0KzN_jTS2XBS7rBXPPSRpB_T0ochJZc1uO3gt9UfM=.6cb4a6cb-5fd7-4f80-bb44-cf91af3a6570@github.com> Message-ID: On Wed, 17 Feb 2021 14:17:13 GMT, Robin Westberg wrote: > Move the responsibility of updating the hgupdate-sync label to the SyncLabelBot. bots/synclabel/src/main/java/org/openjdk/skara/bots/synclabel/SyncLabelBotCheckWorkItem.java line 33: > 31: import java.util.logging.Logger; > 32: > 33: public class SyncLabelBotCheckWorkItem implements WorkItem { Now that it is not only checking, but also updating the labels, maybe rename the class? ------------- PR: https://git.openjdk.java.net/skara/pull/1021 From thomas.stuefe at gmail.com Thu Feb 18 14:38:19 2021 From: thomas.stuefe at gmail.com (=?UTF-8?Q?Thomas_St=C3=BCfe?=) Date: Thu, 18 Feb 2021 15:38:19 +0100 Subject: Still Invalid @openjdk.java.net mail addresses, and unassociated commits at GH Message-ID: Hi guys, It has been six months now. https://mail.openjdk.java.net/pipermail/skara-dev/2020-October/003617.html - we still have invalid mail addresses like stuefe at openjdk.java.net, which cannot be replied to, read or verified in GitHub. They clutter the mailing list archive with invalid mail addresses too. https://mail.openjdk.java.net/pipermail/skara-dev/2020-October/003752.html - we also still have this issue, which may linked to the invalid mail addresses, that a large number of the developers has no real link between their GitHub user and their commits to openjdk are not linked to their user name. The proposed workaround of adding the unverified openjdk mail address to GH did not work, at least not in my case. Is there any hope that these issues will be resolved? Should I open bugs to track these? Thanks & Cheers, Thomas From ihse at openjdk.java.net Thu Feb 18 16:20:25 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 18 Feb 2021 16:20:25 GMT Subject: [skara] RFR: 572: Auto-correct PR title if it is a prefix of the JBS issue title Message-ID: <9U4hMY2WtEB1-b6hAq1_zbyvK141q4_oloi88FAxnhU=.71917e46-3ce5-4364-a88b-30d36489b8fd@github.com> The PR bot should auto-correct PR titles if they are a known prefix of a JBS issue title instead of showing a warning that there is a mismatch between PR and JBS title. ------------- Commit messages: - Also update PR body to remove the "...end of title" part. - Initial implementation of handling cut-off titles. - Create test for cut-off titles in Github Changes: https://git.openjdk.java.net/skara/pull/1023/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1023&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-572 Stats: 107 lines in 2 files changed: 94 ins; 7 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/1023.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1023/head:pull/1023 PR: https://git.openjdk.java.net/skara/pull/1023 From magnus.ihse.bursie at oracle.com Thu Feb 18 16:31:31 2021 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Thu, 18 Feb 2021 17:31:31 +0100 Subject: Still Invalid @openjdk.java.net mail addresses, and unassociated commits at GH In-Reply-To: References: Message-ID: On 2021-02-18 15:38, Thomas St?fe wrote: > Hi guys, > > It has been six months now. > > https://mail.openjdk.java.net/pipermail/skara-dev/2020-October/003617.html > - we still have invalid mail addresses like stuefe at openjdk.java.net, which > cannot be replied to, read or verified in GitHub. They clutter the mailing > list archive with invalid mail addresses too. I do believe this works now. At least I get mails to ihse at openjdk.java.net delivered to my Oracle mail address. Maybe the mapping for non-Oracle mail address is not finished yet..? (I also get mails to ihse at openjdk.org, but that seems to work only from Oracle's SMTP servers, not from outside servers) > https://mail.openjdk.java.net/pipermail/skara-dev/2020-October/003752.html > - we also still have this issue, which may linked to the invalid mail > addresses, that a large number of the developers has no real link between > their GitHub user and their commits to openjdk are not linked to their user > name. The proposed workaround of adding the unverified openjdk mail address > to GH did not work, at least not in my case. > > Is there any hope that these issues will be resolved? Should I open bugs to > track these? Once again, it works for me. See e.g. https://github.com/openjdk/jdk/commit/d5a4d2266b45107cf8d7c0d0137c77b797d836b6 I have added "ihse at openjdk.org" as a mail address to my Github account. I think the trick is to use @openjdk.org, not @openjdk.java.net -- maybe that is what you have done? Unverified > > Thanks & Cheers, Thomas From thomas.stuefe at gmail.com Fri Feb 19 07:19:49 2021 From: thomas.stuefe at gmail.com (=?UTF-8?Q?Thomas_St=C3=BCfe?=) Date: Fri, 19 Feb 2021 08:19:49 +0100 Subject: Still Invalid @openjdk.java.net mail addresses, and unassociated commits at GH In-Reply-To: References: Message-ID: Hi Magnus, Thanks a lot for helping! Answers inline below. On Thu, Feb 18, 2021 at 5:31 PM Magnus Ihse Bursie < magnus.ihse.bursie at oracle.com> wrote: > On 2021-02-18 15:38, Thomas St?fe wrote: > > Hi guys, > > > > It has been six months now. > > > > > https://mail.openjdk.java.net/pipermail/skara-dev/2020-October/003617.html > > - we still have invalid mail addresses like stuefe at openjdk.java.net, > which > > cannot be replied to, read or verified in GitHub. They clutter the > mailing > > list archive with invalid mail addresses too. > > I do believe this works now. At least I get mails to > ihse at openjdk.java.net delivered to my Oracle mail address. Maybe the > mapping for non-Oracle mail address is not finished yet..? > > (I also get mails to ihse at openjdk.org, but that seems to work only from > Oracle's SMTP servers, not from outside servers) > Yes, seems this started working for us too. At least for stuefe at openjdk.java.net. stuefe at openjdk.net and both org variants don't get through. Remaining nit is that Github still marks stuefe at openjdk.java.net as undeliverable, but I can live with that. > > > https://mail.openjdk.java.net/pipermail/skara-dev/2020-October/003752.html > > - we also still have this issue, which may linked to the invalid mail > > addresses, that a large number of the developers has no real link between > > their GitHub user and their commits to openjdk are not linked to their > user > > name. The proposed workaround of adding the unverified openjdk mail > address > > to GH did not work, at least not in my case. > > > > Is there any hope that these issues will be resolved? Should I open bugs > to > > track these? > Once again, it works for me. See e.g. > > https://github.com/openjdk/jdk/commit/d5a4d2266b45107cf8d7c0d0137c77b797d836b6 > > I have added "ihse at openjdk.org" as a mail address to my Github account. > I think the trick is to use @openjdk.org, not @openjdk.java.net -- maybe > that is what you have done? > > I tried, in the past, @openjdk.java.net and openjdk.java.org, without success. I'll retry with your suggestion (leaving out the java part). > Unverified > > > > > Thanks & Cheers, Thomas > > Thanks again, Thomas From magnus.ihse.bursie at oracle.com Fri Feb 19 08:27:14 2021 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Fri, 19 Feb 2021 09:27:14 +0100 Subject: Still Invalid @openjdk.java.net mail addresses, and unassociated commits at GH In-Reply-To: References: Message-ID: On 2021-02-19 08:19, Thomas St?fe wrote: > Hi Magnus, > > Thanks a lot for helping! Answers inline below. > > On Thu, Feb 18, 2021 at 5:31 PM Magnus Ihse Bursie > > > wrote: > > On 2021-02-18 15:38, Thomas St?fe wrote: > > Hi guys, > > > > It has been six months now. > > > > > https://mail.openjdk.java.net/pipermail/skara-dev/2020-October/003617.html > > > - we still have invalid mail addresses like > stuefe at openjdk.java.net , which > > cannot be replied to, read or verified in GitHub. They clutter > the mailing > > list archive with invalid mail addresses too. > > I do believe this works now. At least I get mails to > ihse at openjdk.java.net delivered to > my Oracle mail address. Maybe the > mapping for non-Oracle mail address is not finished yet..? > > (I also get mails to ihse at openjdk.org , > but that seems to work only from > Oracle's SMTP servers, not from outside servers) > > > Yes, seems this started working for us too. At least for > stuefe at openjdk.java.net . > stuefe at openjdk.net and both org variants > don't get through. Remaining nit is that Github still marks > stuefe at openjdk.java.net as > undeliverable, but I can live with that. > > > > > > https://mail.openjdk.java.net/pipermail/skara-dev/2020-October/003752.html > > > - we also still have this issue, which may linked to the invalid > mail > > addresses, that a large number of the developers has no real > link between > > their GitHub user and their commits to openjdk are not linked to > their user > > name. The proposed workaround of adding the unverified openjdk > mail address > > to GH did not work, at least not in my case. > > > > Is there any hope that these issues will be resolved? Should I > open bugs to > > track these? > Once again, it works for me. See e.g. > https://github.com/openjdk/jdk/commit/d5a4d2266b45107cf8d7c0d0137c77b797d836b6 > > > I have added "ihse at openjdk.org " as a > mail address to my Github account. > I think the trick is to use @openjdk.org , not > @openjdk.java.net -- maybe > that is what you have done? > > > I tried, in the past, @openjdk.java.net and > openjdk.java.org , without success. I'll > retry with your suggestion (leaving out the java part). There are only two domains that are of interest here -- openjdk.java.net (which we have traditionally been using) and openjdk.org (which we would like to transition to, but things are moving slowly for this kind of changes within Oracle). There is no openjdk.net nor java.org, so you don't need to test those. Skara is creating commits for OpenJDK projects with the form @openjdk.org, so that is what you need to add to your github profile to get commits connected to your profile. The PR comment mail bridge bot sends mail with the sender specified as @openjdk.java.net. The reason for this disconnect is, I assume, the fact that commits will be Forever, and there we want it to look right from the start. But the mails are sent right now, and for practical reasons it was simpler (if not "simple") to get openjdk.java.net mail working, than for openjdk.org. I assume the long-term goal here is to make the bots send mail using @openjdk.org as well, and to get that MTA working. I believe Tim is working as well as he can to push this forward, but this is an unusual request within Oracle and that unfortunately makes it painful and slow to go through with. :( /Magnus > Unverified > > > > > Thanks & Cheers, Thomas > > > Thanks again, > > Thomas From ehelin at openjdk.java.net Fri Feb 19 11:39:46 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 19 Feb 2021 11:39:46 GMT Subject: [skara] RFR: pr: add /clean command Message-ID: Hi all, please review this patch that adds the `/clean` pull request command for marking a backport pull request as clean. The command can be used by project Committers who determine that a backport is clean (even though the bot doesn't think so). This can for example be for simple things like the backport changing the copyright year, which the bot will not consider clean, but a human might. I have also added the `--clean` flag to `git pr set` for those that prefer working from the command-line. Testing: - [x] Added a number of unit tests - [x] `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - pr: add /clean command Changes: https://git.openjdk.java.net/skara/pull/1024/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1024&range=00 Stats: 400 lines in 5 files changed: 398 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1024.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1024/head:pull/1024 PR: https://git.openjdk.java.net/skara/pull/1024 From rwestberg at openjdk.java.net Fri Feb 19 12:40:32 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 19 Feb 2021 12:40:32 GMT Subject: RFR: pr: add /clean command In-Reply-To: References: Message-ID: On Fri, 19 Feb 2021 11:33:28 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `/clean` pull request command for marking a backport pull request as clean. The command can be used by project Committers who determine that a backport is clean (even though the bot doesn't think so). This can for example be for simple things like the backport changing the copyright year, which the bot will not consider clean, but a human might. > > I have also added the `--clean` flag to `git pr set` for those that prefer working from the command-line. > > Testing: > - [x] Added a number of unit tests > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1024 From ehelin at openjdk.java.net Fri Feb 19 13:01:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 19 Feb 2021 13:01:40 GMT Subject: git: openjdk/skara: pr: add /clean command Message-ID: Changeset: c2e2aded Author: Erik Helin Date: 2021-02-19 13:01:14 +0000 URL: https://git.openjdk.java.net/skara/commit/c2e2aded pr: add /clean command Reviewed-by: rwestberg ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java + bots/pr/src/main/java/org/openjdk/skara/bots/pr/CleanCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommandWorkItem.java + bots/pr/src/test/java/org/openjdk/skara/bots/pr/CleanCommandTests.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrSet.java From ehelin at openjdk.java.net Fri Feb 19 13:04:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 19 Feb 2021 13:04:40 GMT Subject: Integrated: pr: add /clean command In-Reply-To: References: Message-ID: <4Q0CnfQiOSuY9LByJVB4A2XZNoOKt17z0VIkZDK6MTs=.e70a7b6f-5910-40a0-9131-80418c05c020@github.com> On Fri, 19 Feb 2021 11:33:28 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `/clean` pull request command for marking a backport pull request as clean. The command can be used by project Committers who determine that a backport is clean (even though the bot doesn't think so). This can for example be for simple things like the backport changing the copyright year, which the bot will not consider clean, but a human might. > > I have also added the `--clean` flag to `git pr set` for those that prefer working from the command-line. > > Testing: > - [x] Added a number of unit tests > - [x] `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: c2e2aded Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/c2e2aded Stats: 400 lines in 5 files changed: 398 ins; 0 del; 2 mod pr: add /clean command Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1024 From ehelin at openjdk.java.net Fri Feb 19 13:56:17 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 19 Feb 2021 13:56:17 GMT Subject: [skara] RFR: cli: rework git-backport Message-ID: Hi all, please review this patch that reworks how `git-backport` functions. `git-backport` is now much smaller (and more focused) than it used to be and now composes much better with other Skara CLI tools like `git-pr-create`. `git-backport` now simply fetches a commit from a remote repository and cherry-picks the fetched commit on top of the current branch (without committing). `git-backport` then finally makes a commit with the proper backport commit message (a commit message of the form `Backport `). The tool `git-backport` is now meant to be used in combination with `git-pr-create`, `git-pr-set` and `git-pr-integrate`. The following example shows how a commit can be backported, a pull request created, marking the pull request as clean and then finally integrating the pull request: $ git checkout -b backport-5a01c3d68ac2 $ git backport --from=openjdk/jdk 5a01c3d68ac22b7ee6f0746405a9bdef43281cb7 $ git pr create $ sleep 15 # give the bots some time to work $ git pr set --clean $ sleep 15 # allow the bots to do some more work $ git pr integrate $ git checkout - All (or parts) of the above can of course be wrapped into a [git alias](https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases) for those that don't like to type. The following show an example alias defined in `~/.gitconfig`: [alias] bp = "!f() { \ git checkout -b backport-$1 && \ git backport --from=openjdk/jdk $1 && \ git pr create; \ }; f" A user can then simply run `git bp 5a01c3d68ac22b7ee6f0746405a9bdef43281cb7`. The `--from` parameter to `git-backport` is configurable, so a user who most likely often backports from [openjdk/jdk](https://github.com/openjdk/jdk) can run the following to never have to set `--from` on the command-line: $ git config --global backport.from https://github.com/openjdk/jdk Note that `git-backport` only requires a personal access token (PAT) in the case when the `--from` option contains a simple repository name, for example `jdk`. In all other cases there is no need for a PAT, making the command accessible for those who are not using PATs. Testing: - [x] Manual testing on Linux x64 Thanks, Erik ------------- Commit messages: - cli: rework git-backport Changes: https://git.openjdk.java.net/skara/pull/1025/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1025&range=00 Stats: 187 lines in 5 files changed: 58 ins; 92 del; 37 mod Patch: https://git.openjdk.java.net/skara/pull/1025.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1025/head:pull/1025 PR: https://git.openjdk.java.net/skara/pull/1025 From ehelin at openjdk.java.net Fri Feb 19 13:58:31 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 19 Feb 2021 13:58:31 GMT Subject: [skara] RFR: Move hgupdate-sync label functionality to SyncLabelBot In-Reply-To: <2a0KzN_jTS2XBS7rBXPPSRpB_T0ochJZc1uO3gt9UfM=.6cb4a6cb-5fd7-4f80-bb44-cf91af3a6570@github.com> References: <2a0KzN_jTS2XBS7rBXPPSRpB_T0ochJZc1uO3gt9UfM=.6cb4a6cb-5fd7-4f80-bb44-cf91af3a6570@github.com> Message-ID: On Wed, 17 Feb 2021 14:17:13 GMT, Robin Westberg wrote: > Move the responsibility of updating the hgupdate-sync label to the SyncLabelBot. Looks good modulo @magicus comment ?? ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1021 From rwestberg at openjdk.java.net Fri Feb 19 14:24:25 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 19 Feb 2021 14:24:25 GMT Subject: RFR: cli: rework git-backport In-Reply-To: References: Message-ID: On Fri, 19 Feb 2021 13:50:25 GMT, Erik Helin wrote: > Hi all, > > please review this patch that reworks how `git-backport` functions. `git-backport` is now much smaller (and more focused) than it used to be and now composes much better with other Skara CLI tools like `git-pr-create`. `git-backport` now simply fetches a commit from a remote repository and cherry-picks the fetched commit on top of the current branch (without committing). `git-backport` then finally makes a commit with the proper backport commit message (a commit message of the form `Backport `). > > The tool `git-backport` is now meant to be used in combination with `git-pr-create`, `git-pr-set` and `git-pr-integrate`. The following example shows how a commit can be backported, a pull request created, marking the pull request as clean and then finally integrating the pull request: > > $ git checkout -b backport-5a01c3d68ac2 > $ git backport --from=openjdk/jdk 5a01c3d68ac22b7ee6f0746405a9bdef43281cb7 > $ git pr create > $ sleep 15 # give the bots some time to work > $ git pr set --clean > $ sleep 15 # allow the bots to do some more work > $ git pr integrate > $ git checkout - > > All (or parts) of the above can of course be wrapped into a [git alias](https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases) for those that don't like to type. The following show an example alias defined in `~/.gitconfig`: > > [alias] > bp = "!f() { \ > git checkout -b backport-$1 && \ > git backport --from=openjdk/jdk $1 && \ > git pr create; \ > }; f" > > A user can then simply run `git bp 5a01c3d68ac22b7ee6f0746405a9bdef43281cb7`. > > The `--from` parameter to `git-backport` is configurable, so a user who most likely often backports from [openjdk/jdk](https://github.com/openjdk/jdk) can run the following to never have to set `--from` on the command-line: > > $ git config --global backport.from https://github.com/openjdk/jdk > > Note that `git-backport` only requires a personal access token (PAT) in the case when the `--from` option contains a simple repository name, for example `jdk`. In all other cases there is no need for a PAT, making the command accessible for those who are not using PATs. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1025 From clanger at openjdk.java.net Fri Feb 19 20:21:58 2021 From: clanger at openjdk.java.net (Christoph Langer) Date: Fri, 19 Feb 2021 20:21:58 GMT Subject: RFR: cli: rework git-backport In-Reply-To: References: Message-ID: On Fri, 19 Feb 2021 14:21:05 GMT, Robin Westberg wrote: >> Hi all, >> >> please review this patch that reworks how `git-backport` functions. `git-backport` is now much smaller (and more focused) than it used to be and now composes much better with other Skara CLI tools like `git-pr-create`. `git-backport` now simply fetches a commit from a remote repository and cherry-picks the fetched commit on top of the current branch (without committing). `git-backport` then finally makes a commit with the proper backport commit message (a commit message of the form `Backport `). >> >> The tool `git-backport` is now meant to be used in combination with `git-pr-create`, `git-pr-set` and `git-pr-integrate`. The following example shows how a commit can be backported, a pull request created, marking the pull request as clean and then finally integrating the pull request: >> >> $ git checkout -b backport-5a01c3d68ac2 >> $ git backport --from=openjdk/jdk 5a01c3d68ac22b7ee6f0746405a9bdef43281cb7 >> $ git pr create >> $ sleep 15 # give the bots some time to work >> $ git pr set --clean >> $ sleep 15 # allow the bots to do some more work >> $ git pr integrate >> $ git checkout - >> >> All (or parts) of the above can of course be wrapped into a [git alias](https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases) for those that don't like to type. The following show an example alias defined in `~/.gitconfig`: >> >> [alias] >> bp = "!f() { \ >> git checkout -b backport-$1 && \ >> git backport --from=openjdk/jdk $1 && \ >> git pr create; \ >> }; f" >> >> A user can then simply run `git bp 5a01c3d68ac22b7ee6f0746405a9bdef43281cb7`. >> >> The `--from` parameter to `git-backport` is configurable, so a user who most likely often backports from [openjdk/jdk](https://github.com/openjdk/jdk) can run the following to never have to set `--from` on the command-line: >> >> $ git config --global backport.from https://github.com/openjdk/jdk >> >> Note that `git-backport` only requires a personal access token (PAT) in the case when the `--from` option contains a simple repository name, for example `jdk`. In all other cases there is no need for a PAT, making the command accessible for those who are not using PATs. >> >> Testing: >> - [x] Manual testing on Linux x64 >> >> Thanks, >> Erik > > Looks good! Cool. Looking forward to this being integrated. When will the /backport comment be enabled? ------------- PR: https://git.openjdk.java.net/skara/pull/1025 From thomas.stuefe at gmail.com Sat Feb 20 10:29:57 2021 From: thomas.stuefe at gmail.com (=?UTF-8?Q?Thomas_St=C3=BCfe?=) Date: Sat, 20 Feb 2021 11:29:57 +0100 Subject: Still Invalid @openjdk.java.net mail addresses, and unassociated commits at GH In-Reply-To: References: Message-ID: Thanks a lot for your help, Magnus. I appreciate your and Tims efforts. Thankfully, adding @openjdk.org did the trick for me too, now the GitHub user is linked. That, and knowing that mails sent to @openjdk.java.net mail addresses are not lost, solves the issues for me. Again, thanks, I'm happy now. Cheers, Thomas On Fri, Feb 19, 2021 at 9:27 AM Magnus Ihse Bursie < magnus.ihse.bursie at oracle.com> wrote: > > > On 2021-02-19 08:19, Thomas St?fe wrote: > > Hi Magnus, > > Thanks a lot for helping! Answers inline below. > > On Thu, Feb 18, 2021 at 5:31 PM Magnus Ihse Bursie < > magnus.ihse.bursie at oracle.com> wrote: > >> On 2021-02-18 15:38, Thomas St?fe wrote: >> > Hi guys, >> > >> > It has been six months now. >> > >> > >> https://mail.openjdk.java.net/pipermail/skara-dev/2020-October/003617.html >> > - we still have invalid mail addresses like stuefe at openjdk.java.net, >> which >> > cannot be replied to, read or verified in GitHub. They clutter the >> mailing >> > list archive with invalid mail addresses too. >> >> I do believe this works now. At least I get mails to >> ihse at openjdk.java.net delivered to my Oracle mail address. Maybe the >> mapping for non-Oracle mail address is not finished yet..? >> >> (I also get mails to ihse at openjdk.org, but that seems to work only from >> Oracle's SMTP servers, not from outside servers) >> > > Yes, seems this started working for us too. At least for > stuefe at openjdk.java.net. stuefe at openjdk.net and both org variants don't > get through. Remaining nit is that Github still marks > stuefe at openjdk.java.net as undeliverable, but I can live with that. > > > > >> > >> https://mail.openjdk.java.net/pipermail/skara-dev/2020-October/003752.html >> > - we also still have this issue, which may linked to the invalid mail >> > addresses, that a large number of the developers has no real link >> between >> > their GitHub user and their commits to openjdk are not linked to their >> user >> > name. The proposed workaround of adding the unverified openjdk mail >> address >> > to GH did not work, at least not in my case. >> > >> > Is there any hope that these issues will be resolved? Should I open >> bugs to >> > track these? >> Once again, it works for me. See e.g. >> >> https://github.com/openjdk/jdk/commit/d5a4d2266b45107cf8d7c0d0137c77b797d836b6 >> >> I have added "ihse at openjdk.org" as a mail address to my Github account. >> I think the trick is to use @openjdk.org, not @openjdk.java.net -- maybe >> that is what you have done? >> >> > I tried, in the past, @openjdk.java.net and openjdk.java.org, without > success. I'll retry with your suggestion (leaving out the java part). > > > There are only two domains that are of interest here -- openjdk.java.net > (which we have traditionally been using) and openjdk.org (which we would > like to transition to, but things are moving slowly for this kind of > changes within Oracle). There is no openjdk.net nor java.org, so you > don't need to test those. > > Skara is creating commits for OpenJDK projects with the form @ > openjdk.org, so that is what you need to add to your github profile to > get commits connected to your profile. > > The PR comment mail bridge bot sends mail with the sender specified as > @openjdk.java.net. > > The reason for this disconnect is, I assume, the fact that commits will be > Forever, and there we want it to look right from the start. But the > mails are sent right now, and for practical reasons it was simpler (if not > "simple") to get openjdk.java.net mail working, than for openjdk.org. > > I assume the long-term goal here is to make the bots send mail using > @openjdk.org as well, and to get that MTA working. I believe > Tim is working as well as he can to push this forward, but this is an > unusual request within Oracle and that unfortunately makes it painful and > slow to go through with. :( > > /Magnus > > > >> Unverified >> >> > >> > Thanks & Cheers, Thomas >> >> > Thanks again, > > Thomas > > > > From rwestberg at openjdk.java.net Mon Feb 22 09:39:28 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 22 Feb 2021 09:39:28 GMT Subject: [skara] RFR: Move hgupdate-sync label functionality to SyncLabelBot In-Reply-To: References: <2a0KzN_jTS2XBS7rBXPPSRpB_T0ochJZc1uO3gt9UfM=.6cb4a6cb-5fd7-4f80-bb44-cf91af3a6570@github.com> Message-ID: On Thu, 18 Feb 2021 10:44:34 GMT, Magnus Ihse Bursie wrote: >> Move the responsibility of updating the hgupdate-sync label to the SyncLabelBot. > > bots/synclabel/src/main/java/org/openjdk/skara/bots/synclabel/SyncLabelBotCheckWorkItem.java line 33: > >> 31: import java.util.logging.Logger; >> 32: >> 33: public class SyncLabelBotCheckWorkItem implements WorkItem { > > Now that it is not only checking, but also updating the labels, maybe rename the class? Makes sense, will change it. ------------- PR: https://git.openjdk.java.net/skara/pull/1021 From ehelin at openjdk.java.net Mon Feb 22 09:42:25 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Feb 2021 09:42:25 GMT Subject: Integrated: cli: rework git-backport In-Reply-To: References: Message-ID: <0HKu6LNA4B1mG_B-d1RaEqj2UfLVejrtkkEC0XDuhrI=.9d50e180-7579-4b69-b3a4-6673f699a249@github.com> On Fri, 19 Feb 2021 13:50:25 GMT, Erik Helin wrote: > Hi all, > > please review this patch that reworks how `git-backport` functions. `git-backport` is now much smaller (and more focused) than it used to be and now composes much better with other Skara CLI tools like `git-pr-create`. `git-backport` now simply fetches a commit from a remote repository and cherry-picks the fetched commit on top of the current branch (without committing). `git-backport` then finally makes a commit with the proper backport commit message (a commit message of the form `Backport `). > > The tool `git-backport` is now meant to be used in combination with `git-pr-create`, `git-pr-set` and `git-pr-integrate`. The following example shows how a commit can be backported, a pull request created, marking the pull request as clean and then finally integrating the pull request: > > $ git checkout -b backport-5a01c3d68ac2 > $ git backport --from=openjdk/jdk 5a01c3d68ac22b7ee6f0746405a9bdef43281cb7 > $ git pr create > $ sleep 15 # give the bots some time to work > $ git pr set --clean > $ sleep 15 # allow the bots to do some more work > $ git pr integrate > $ git checkout - > > All (or parts) of the above can of course be wrapped into a [git alias](https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases) for those that don't like to type. The following show an example alias defined in `~/.gitconfig`: > > [alias] > bp = "!f() { \ > git checkout -b backport-$1 && \ > git backport --from=openjdk/jdk $1 && \ > git pr create; \ > }; f" > > A user can then simply run `git bp 5a01c3d68ac22b7ee6f0746405a9bdef43281cb7`. > > The `--from` parameter to `git-backport` is configurable, so a user who most likely often backports from [openjdk/jdk](https://github.com/openjdk/jdk) can run the following to never have to set `--from` on the command-line: > > $ git config --global backport.from https://github.com/openjdk/jdk > > Note that `git-backport` only requires a personal access token (PAT) in the case when the `--from` option contains a simple repository name, for example `jdk`. In all other cases there is no need for a PAT, making the command accessible for those who are not using PATs. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 3acaa000 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/3acaa000 Stats: 187 lines in 5 files changed: 58 ins; 92 del; 37 mod cli: rework git-backport Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1025 From rwestberg at openjdk.java.net Mon Feb 22 09:43:39 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 22 Feb 2021 09:43:39 GMT Subject: RFR: Allow merge PRs with an exact hash Message-ID: Make it possible to create a merge-style PR with commits that are not already present in another existing repository. In this case, the hash of the commit to be merged must be specified, to allow for proper rebase / squash of the merge commit itself. ------------- Commit messages: - Allow merge PRs with an exact hash Changes: https://git.openjdk.java.net/skara/pull/1026/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1026&range=00 Stats: 164 lines in 2 files changed: 163 ins; 1 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1026.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1026/head:pull/1026 PR: https://git.openjdk.java.net/skara/pull/1026 From rwestberg at openjdk.java.net Mon Feb 22 09:59:53 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 22 Feb 2021 09:59:53 GMT Subject: [skara] RFR: Move hgupdate-sync label functionality to SyncLabelBot [v2] In-Reply-To: <2a0KzN_jTS2XBS7rBXPPSRpB_T0ochJZc1uO3gt9UfM=.6cb4a6cb-5fd7-4f80-bb44-cf91af3a6570@github.com> References: <2a0KzN_jTS2XBS7rBXPPSRpB_T0ochJZc1uO3gt9UfM=.6cb4a6cb-5fd7-4f80-bb44-cf91af3a6570@github.com> Message-ID: > Move the responsibility of updating the hgupdate-sync label to the SyncLabelBot. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Rename work item class ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1021/files - new: https://git.openjdk.java.net/skara/pull/1021/files/c60e5f3a..3a546c49 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1021&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1021&range=00-01 Stats: 6 lines in 2 files changed: 0 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/1021.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1021/head:pull/1021 PR: https://git.openjdk.java.net/skara/pull/1021 From rwestberg at openjdk.java.net Mon Feb 22 10:17:01 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 22 Feb 2021 10:17:01 GMT Subject: [skara] RFR: 572: Auto-correct PR title if it is a prefix of the JBS issue title In-Reply-To: <9U4hMY2WtEB1-b6hAq1_zbyvK141q4_oloi88FAxnhU=.71917e46-3ce5-4364-a88b-30d36489b8fd@github.com> References: <9U4hMY2WtEB1-b6hAq1_zbyvK141q4_oloi88FAxnhU=.71917e46-3ce5-4364-a88b-30d36489b8fd@github.com> Message-ID: On Thu, 18 Feb 2021 16:12:02 GMT, Magnus Ihse Bursie wrote: > The PR bot should auto-correct PR titles if they are a known prefix of a JBS issue title instead of showing a warning that there is a mismatch between PR and JBS title. Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1023 From ihse at openjdk.java.net Mon Feb 22 13:26:27 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 22 Feb 2021 13:26:27 GMT Subject: [skara] RFR: Move hgupdate-sync label functionality to SyncLabelBot [v2] In-Reply-To: References: <2a0KzN_jTS2XBS7rBXPPSRpB_T0ochJZc1uO3gt9UfM=.6cb4a6cb-5fd7-4f80-bb44-cf91af3a6570@github.com> Message-ID: On Mon, 22 Feb 2021 09:59:53 GMT, Robin Westberg wrote: >> Move the responsibility of updating the hgupdate-sync label to the SyncLabelBot. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Rename work item class Looks good! ------------- Marked as reviewed by ihse (no project role). PR: https://git.openjdk.java.net/skara/pull/1021 From ihse at openjdk.java.net Mon Feb 22 13:31:35 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 22 Feb 2021 13:31:35 GMT Subject: RFR: Allow merge PRs with an exact hash In-Reply-To: References: Message-ID: On Mon, 22 Feb 2021 09:35:52 GMT, Robin Westberg wrote: > Make it possible to create a merge-style PR with commits that are not already present in another existing repository. In this case, the hash of the commit to be merged must be specified, to allow for proper rebase / squash of the merge commit itself. Looks good (minus the typo) bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java line 206: > 204: assertFalse(commits.contains(mergeHash)); > 205: > 206: // Author and committer should updated in the merge commit Suggestion: // Author and committer should be updated in the merge commit `` ------------- Marked as reviewed by ihse (no project role). PR: https://git.openjdk.java.net/skara/pull/1026 From ihse at openjdk.java.net Mon Feb 22 13:57:31 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 22 Feb 2021 13:57:31 GMT Subject: Integrated: 572: Auto-correct PR title if it is a prefix of the JBS issue title In-Reply-To: <9U4hMY2WtEB1-b6hAq1_zbyvK141q4_oloi88FAxnhU=.71917e46-3ce5-4364-a88b-30d36489b8fd@github.com> References: <9U4hMY2WtEB1-b6hAq1_zbyvK141q4_oloi88FAxnhU=.71917e46-3ce5-4364-a88b-30d36489b8fd@github.com> Message-ID: On Thu, 18 Feb 2021 16:12:02 GMT, Magnus Ihse Bursie wrote: > The PR bot should auto-correct PR titles if they are a known prefix of a JBS issue title instead of showing a warning that there is a mismatch between PR and JBS title. This pull request has now been integrated. Changeset: 4857968b Author: Magnus Ihse Bursie Committer: Erik Helin URL: https://git.openjdk.java.net/skara/commit/4857968b Stats: 107 lines in 2 files changed: 94 ins; 7 del; 6 mod 572: Auto-correct PR title if it is a prefix of the JBS issue title Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1023 From rwestberg at openjdk.java.net Mon Feb 22 14:15:38 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 22 Feb 2021 14:15:38 GMT Subject: git: openjdk/skara: Move hgupdate-sync label functionality to SyncLabelBot Message-ID: Changeset: db76f152 Author: Robin Westberg Date: 2021-02-22 14:15:09 +0000 URL: https://git.openjdk.java.net/skara/commit/db76f152 Move hgupdate-sync label functionality to SyncLabelBot Reviewed-by: ehelin, ihse ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/issue/IssueNotifier.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/issue/IssueNotifierTests.java ! bots/synclabel/build.gradle ! bots/synclabel/src/main/java/org/openjdk/skara/bots/synclabel/SyncLabelBot.java - bots/synclabel/src/main/java/org/openjdk/skara/bots/synclabel/SyncLabelBotCheckWorkItem.java + bots/synclabel/src/main/java/org/openjdk/skara/bots/synclabel/SyncLabelBotFindMainIssueWorkItem.java - bots/synclabel/src/main/java/org/openjdk/skara/bots/synclabel/SyncLabelBotLabelWorkItem.java + bots/synclabel/src/main/java/org/openjdk/skara/bots/synclabel/SyncLabelBotUpdateLabelWorkItem.java + bots/synclabel/src/test/java/org/openjdk/skara/bots/synclabel/SyncLabelBotTests.java ! test/src/main/java/org/openjdk/skara/test/TestHost.java ! test/src/main/java/org/openjdk/skara/test/TestIssueProject.java From rwestberg at openjdk.java.net Mon Feb 22 14:18:36 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 22 Feb 2021 14:18:36 GMT Subject: Integrated: Move hgupdate-sync label functionality to SyncLabelBot In-Reply-To: <2a0KzN_jTS2XBS7rBXPPSRpB_T0ochJZc1uO3gt9UfM=.6cb4a6cb-5fd7-4f80-bb44-cf91af3a6570@github.com> References: <2a0KzN_jTS2XBS7rBXPPSRpB_T0ochJZc1uO3gt9UfM=.6cb4a6cb-5fd7-4f80-bb44-cf91af3a6570@github.com> Message-ID: On Wed, 17 Feb 2021 14:17:13 GMT, Robin Westberg wrote: > Move the responsibility of updating the hgupdate-sync label to the SyncLabelBot. This pull request has now been integrated. Changeset: db76f152 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/db76f152 Stats: 553 lines in 11 files changed: 320 ins; 227 del; 6 mod Move hgupdate-sync label functionality to SyncLabelBot Reviewed-by: ehelin, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1021 From ehelin at openjdk.java.net Mon Feb 22 14:35:59 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Feb 2021 14:35:59 GMT Subject: git: openjdk/cr: skara-876 Message-ID: <13656755-7dbb-4b25-9fcd-0efc276b2c6f@openjdk.org> Changeset: 86e4ad29 Author: Erik Helin Date: 2021-02-22 14:35:42 +0000 URL: https://git.openjdk.java.net/cr/commit/86e4ad29 skara-876 Reviewed-by: ihse, rwestberg ! webrev.js From ehelin at openjdk.java.net Mon Feb 22 15:20:37 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Feb 2021 15:20:37 GMT Subject: [skara] RFR: forge: add HostedRepository.webUrl for Branch Message-ID: Hi all, please review this small patch that adds an overload for `webUrl` for a `Branch` on `HostedRepository`. Thanks, Erik ------------- Commit messages: - forge: add webUrl for Branch Changes: https://git.openjdk.java.net/skara/pull/1027/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1027&range=00 Stats: 27 lines in 6 files changed: 27 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1027.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1027/head:pull/1027 PR: https://git.openjdk.java.net/skara/pull/1027 From ehelin at openjdk.java.net Mon Feb 22 15:25:55 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Feb 2021 15:25:55 GMT Subject: [skara] RFR: forge: add HostedRepository.createPullRequestUrl Message-ID: Hi all, please review this small patch that adds the `HostedRepository.createPullRequestUrl` for getting the URL that a user can click to create a pull request between two `HostedRepository` instances. Thanks, Erik ------------- Depends on: https://git.openjdk.java.net/skara/pull/1027 Commit messages: - forge: add HostedRepository.createPullRequestUrl Changes: https://git.openjdk.java.net/skara/pull/1028/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1028&range=00 Stats: 32 lines in 5 files changed: 32 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1028.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1028/head:pull/1028 PR: https://git.openjdk.java.net/skara/pull/1028 From rwestberg at openjdk.java.net Mon Feb 22 15:58:11 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 22 Feb 2021 15:58:11 GMT Subject: [skara] RFR: forge: add HostedRepository.webUrl for Branch In-Reply-To: References: Message-ID: On Mon, 22 Feb 2021 15:14:37 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds an overload for `webUrl` for a `Branch` on `HostedRepository`. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1027 From rwestberg at openjdk.java.net Mon Feb 22 16:00:06 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 22 Feb 2021 16:00:06 GMT Subject: RFR: forge: add HostedRepository.createPullRequestUrl In-Reply-To: References: Message-ID: On Mon, 22 Feb 2021 15:19:40 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds the `HostedRepository.createPullRequestUrl` for getting the URL that a user can click to create a pull request between two `HostedRepository` instances. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1028 From erik.helin at oracle.com Mon Feb 22 18:35:14 2021 From: erik.helin at oracle.com (Erik Helin) Date: Mon, 22 Feb 2021 19:35:14 +0100 Subject: Result: New Skara Committer: Magnus Ihse Bursie Message-ID: Voting for Magnus Ihse Bursie [1] is now closed. Yes: 5 Veto: 0 Abstain: 0 According to the Bylaws definition of Lazy Consensus, this is sufficient to approve the nomination. Thanks, Erik [1] https://mail.openjdk.java.net/pipermail/skara-dev/2021-February/004112.html From ehelin at openjdk.java.net Mon Feb 22 18:39:15 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Feb 2021 18:39:15 GMT Subject: git: openjdk/skara: forge: add HostedRepository.webUrl for Branch Message-ID: <30ea8222-535c-401a-8307-876fb6752dc8@openjdk.org> Changeset: fe7fcf35 Author: Erik Helin Date: 2021-02-22 18:38:45 +0000 URL: https://git.openjdk.java.net/skara/commit/fe7fcf35 forge: add HostedRepository.webUrl for Branch Reviewed-by: rwestberg ! 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/GitLabHost.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 Feb 22 18:42:05 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Feb 2021 18:42:05 GMT Subject: Integrated: forge: add HostedRepository.webUrl for Branch In-Reply-To: References: Message-ID: On Mon, 22 Feb 2021 15:14:37 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds an overload for `webUrl` for a `Branch` on `HostedRepository`. > > Thanks, > Erik This pull request has now been integrated. Changeset: fe7fcf35 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/fe7fcf35 Stats: 27 lines in 6 files changed: 27 ins; 0 del; 0 mod forge: add HostedRepository.webUrl for Branch Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1027 From ehelin at openjdk.java.net Mon Feb 22 18:42:21 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Feb 2021 18:42:21 GMT Subject: [skara] RFR: forge: add HostedRepository.createPullRequestUrl [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this small patch that adds the `HostedRepository.createPullRequestUrl` for getting the URL that a user can click to create a pull request between two `HostedRepository` instances. > > Thanks, > Erik Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1028/files - new: https://git.openjdk.java.net/skara/pull/1028/files/dcbc2c19..dcbc2c19 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1028&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1028&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1028.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1028/head:pull/1028 PR: https://git.openjdk.java.net/skara/pull/1028 From ehelin at openjdk.java.net Mon Feb 22 18:47:05 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Feb 2021 18:47:05 GMT Subject: [skara] Integrated: forge: add HostedRepository.createPullRequestUrl In-Reply-To: References: Message-ID: On Mon, 22 Feb 2021 15:19:40 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds the `HostedRepository.createPullRequestUrl` for getting the URL that a user can click to create a pull request between two `HostedRepository` instances. > > Thanks, > Erik This pull request has now been integrated. Changeset: 44d98787 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/44d98787 Stats: 32 lines in 5 files changed: 32 ins; 0 del; 0 mod forge: add HostedRepository.createPullRequestUrl Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1028 From ehelin at openjdk.java.net Tue Feb 23 08:44:36 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Feb 2021 08:44:36 GMT Subject: RFR: Allow merge PRs with an exact hash In-Reply-To: References: Message-ID: On Mon, 22 Feb 2021 09:35:52 GMT, Robin Westberg wrote: > Make it possible to create a merge-style PR with commits that are not already present in another existing repository. In this case, the hash of the commit to be merged must be specified, to allow for proper rebase / squash of the merge commit itself. Looks good overall, really nice solution ?? Just two things I thought of: - should we check that the the hash actually is an ancestor of the source branch? That check combined with the existing check that the hash is not an ancestor of the target branch would ensure that the hash only is in the source branch for the pull request. Would safe-guard against some extremely unlikely scenarios ?? - can you make it possible via a bot configuration to restrict the users that can do merge style pull requests with a hash for a repository? I don't think all repositories are gonna want to allow everyone to use a `Merge ` kind of pull request. Thanks! ------------- PR: https://git.openjdk.java.net/skara/pull/1026 From ehelin at openjdk.java.net Tue Feb 23 10:46:50 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Feb 2021 10:46:50 GMT Subject: RFR: pr: handle exceptions when fetching commit comments Message-ID: Hi all, please review this patch that handles exceptions thrown fetching commit comments for a repository. Handling here means logging the exception and moving on, there isn't much more we can at this point in the code. Thanks, Erik ------------- Commit messages: - pr: handle exceptions when fetching commit comments Changes: https://git.openjdk.java.net/skara/pull/1029/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1029&range=00 Stats: 7 lines in 1 file changed: 6 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1029.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1029/head:pull/1029 PR: https://git.openjdk.java.net/skara/pull/1029 From rwestberg at openjdk.java.net Tue Feb 23 10:46:50 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 23 Feb 2021 10:46:50 GMT Subject: RFR: pr: handle exceptions when fetching commit comments In-Reply-To: References: Message-ID: <2_Svq5fpqundy8ytPk-LlWm8433eo4lqrl7doeZfKlg=.6746b207-1a85-47a2-bec7-345d62e5b5cc@github.com> On Tue, 23 Feb 2021 10:39:12 GMT, Erik Helin wrote: > Hi all, > > please review this patch that handles exceptions thrown fetching commit comments for a repository. Handling here means logging the exception and moving on, there isn't much more we can at this point in the code. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1029 From ehelin at openjdk.java.net Tue Feb 23 10:50:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Feb 2021 10:50:56 GMT Subject: [skara] Integrated: pr: handle exceptions when fetching commit comments In-Reply-To: References: Message-ID: On Tue, 23 Feb 2021 10:39:12 GMT, Erik Helin wrote: > Hi all, > > please review this patch that handles exceptions thrown fetching commit comments for a repository. Handling here means logging the exception and moving on, there isn't much more we can at this point in the code. > > Thanks, > Erik This pull request has now been integrated. Changeset: a814a3d5 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/a814a3d5 Stats: 7 lines in 1 file changed: 6 ins; 0 del; 1 mod pr: handle exceptions when fetching commit comments Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1029 From rwestberg at openjdk.java.net Tue Feb 23 12:27:30 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 23 Feb 2021 12:27:30 GMT Subject: [skara] RFR: Avoid expensive operations when comparing commit command work items Message-ID: <8Ek-LjXBxR2fx8YG_p-7kwaRNTkMisEmAa9KNnBkBxg=.10c2092a-26bb-4429-a5e2-3caaafe664ce@github.com> Ensure that the concurrentWith operation does not perform any operations that may require API call. ------------- Commit messages: - Avoid expensive operations when comparing commit command work items Changes: https://git.openjdk.java.net/skara/pull/1030/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1030&range=00 Stats: 11 lines in 2 files changed: 0 ins; 7 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1030.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1030/head:pull/1030 PR: https://git.openjdk.java.net/skara/pull/1030 From ehelin at openjdk.java.net Tue Feb 23 12:27:30 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Feb 2021 12:27:30 GMT Subject: [skara] RFR: Avoid expensive operations when comparing commit command work items In-Reply-To: <8Ek-LjXBxR2fx8YG_p-7kwaRNTkMisEmAa9KNnBkBxg=.10c2092a-26bb-4429-a5e2-3caaafe664ce@github.com> References: <8Ek-LjXBxR2fx8YG_p-7kwaRNTkMisEmAa9KNnBkBxg=.10c2092a-26bb-4429-a5e2-3caaafe664ce@github.com> Message-ID: On Tue, 23 Feb 2021 12:21:18 GMT, Robin Westberg wrote: > Ensure that the concurrentWith operation does not perform any operations that may require API call. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1030 From rwestberg at openjdk.java.net Tue Feb 23 12:39:39 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 23 Feb 2021 12:39:39 GMT Subject: Integrated: Avoid expensive operations when comparing commit command work items In-Reply-To: <8Ek-LjXBxR2fx8YG_p-7kwaRNTkMisEmAa9KNnBkBxg=.10c2092a-26bb-4429-a5e2-3caaafe664ce@github.com> References: <8Ek-LjXBxR2fx8YG_p-7kwaRNTkMisEmAa9KNnBkBxg=.10c2092a-26bb-4429-a5e2-3caaafe664ce@github.com> Message-ID: On Tue, 23 Feb 2021 12:21:18 GMT, Robin Westberg wrote: > Ensure that the concurrentWith operation does not perform any operations that may require API call. This pull request has now been integrated. Changeset: 7e9643c9 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/7e9643c9 Stats: 11 lines in 2 files changed: 0 ins; 7 del; 4 mod Avoid expensive operations when comparing commit command work items Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1030 From ehelin at openjdk.java.net Tue Feb 23 14:06:26 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Feb 2021 14:06:26 GMT Subject: [skara] RFR: pr: fetch commit comments in work item Message-ID: Hi all, please review this patch that fetches recent commit comments in a separate `WorkItem` for the `PullRequestBot`. This is to ensure that: - possible exceptions thrown when fetching recent commit comments do not impact other `WorkItem`s generated by `PullRequestBot.getPeriodicItems` - other `WorkItem`s can continue to make progress if the call to `recentCommitComments` takes a long time Testing: - [x] `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - pr: fetch commit comments in work item Changes: https://git.openjdk.java.net/skara/pull/1031/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1031&range=00 Stats: 88 lines in 3 files changed: 67 ins; 17 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1031.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1031/head:pull/1031 PR: https://git.openjdk.java.net/skara/pull/1031 From rwestberg at openjdk.java.net Tue Feb 23 14:06:27 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 23 Feb 2021 14:06:27 GMT Subject: [skara] RFR: pr: fetch commit comments in work item In-Reply-To: References: Message-ID: On Tue, 23 Feb 2021 13:59:55 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fetches recent commit comments in a separate `WorkItem` for the `PullRequestBot`. This is to ensure that: > > - possible exceptions thrown when fetching recent commit comments do not impact other `WorkItem`s generated by `PullRequestBot.getPeriodicItems` > - other `WorkItem`s can continue to make progress if the call to `recentCommitComments` takes a long time > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1031 From ehelin at openjdk.java.net Tue Feb 23 14:11:46 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Feb 2021 14:11:46 GMT Subject: git: openjdk/skara: pr: fetch commit comments in work item Message-ID: <9d7666d6-6b42-48be-97f0-7ec230b0a667@openjdk.org> Changeset: 874a89ce Author: Erik Helin Date: 2021-02-23 14:11:15 +0000 URL: https://git.openjdk.java.net/skara/commit/874a89ce pr: fetch commit comments in work item Reviewed-by: rwestberg + bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommitCommentsWorkItem.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestBot.java ! test/src/main/java/org/openjdk/skara/test/TestHostedRepository.java From ehelin at openjdk.java.net Tue Feb 23 14:15:00 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Feb 2021 14:15:00 GMT Subject: Integrated: pr: fetch commit comments in work item In-Reply-To: References: Message-ID: On Tue, 23 Feb 2021 13:59:55 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fetches recent commit comments in a separate `WorkItem` for the `PullRequestBot`. This is to ensure that: > > - possible exceptions thrown when fetching recent commit comments do not impact other `WorkItem`s generated by `PullRequestBot.getPeriodicItems` > - other `WorkItem`s can continue to make progress if the call to `recentCommitComments` takes a long time > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 874a89ce Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/874a89ce Stats: 88 lines in 3 files changed: 67 ins; 17 del; 4 mod pr: fetch commit comments in work item Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1031 From ehelin at openjdk.java.net Tue Feb 23 15:08:03 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Feb 2021 15:08:03 GMT Subject: [skara] RFR: forge: fix GitLabRepository.recentCommitComments Message-ID: Hi all, please review this patch that re-works `GitLab.recentCommitComments` into its hopefully final shape. This patch fixes two problems: - multiple commits can have the same commit message title (i.e. first line of commit message) - GitLab sometimes returns a trimmed `target_title` for commit comment events The first problem is fixed by always starting out with fetching the entire history (once) and then always return a set of candidate hashes for a given commit title. We can then fetch the commit comments for each of the candidate hashes to figure which hash the comment was made on. The solution to the second problem then piggy-backs on the first solution: if a hash with a given title isn't found, and the title ends with `...`, then go through all commit message titles and check if any of them has the given title as prefix. The drawback is that it can take a couple of minutes to populate the initial commit message title to hash mapping, but since 874a89ceb0d5fd742db75b6f9744b56e200cfe32 this will run in a separate `WorkItem`, so the degraded performance won't affect other `WorkItem`s during startup. Once the map is populated there will only be one additional REST request for most calls to `recentCommitComments`. Testing: - [x] `make test` passes on Linux x64 - [x] Manual testing against GitLab on Linux x64 with `git skara debug commit-comments` Thanks, Erik ------------- Commit messages: - forge: fix GitLabRepository.recentCommitComments Changes: https://git.openjdk.java.net/skara/pull/1032/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1032&range=00 Stats: 135 lines in 2 files changed: 80 ins; 44 del; 11 mod Patch: https://git.openjdk.java.net/skara/pull/1032.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1032/head:pull/1032 PR: https://git.openjdk.java.net/skara/pull/1032 From rwestberg at openjdk.java.net Wed Feb 24 07:54:02 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 24 Feb 2021 07:54:02 GMT Subject: [skara] RFR: Add additional sync label tests, adjust the implementation to match Message-ID: Adjust the implementation of the sync label rules to match expectations. ------------- Commit messages: - Add additional sync label tests, adjust the implementation to match Changes: https://git.openjdk.java.net/skara/pull/1033/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1033&range=00 Stats: 148 lines in 3 files changed: 132 ins; 4 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/1033.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1033/head:pull/1033 PR: https://git.openjdk.java.net/skara/pull/1033 From rwestberg at openjdk.java.net Wed Feb 24 08:29:54 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 24 Feb 2021 08:29:54 GMT Subject: [skara] RFR: forge: fix GitLabRepository.recentCommitComments In-Reply-To: References: Message-ID: On Tue, 23 Feb 2021 15:01:29 GMT, Erik Helin wrote: > Hi all, > > please review this patch that re-works `GitLab.recentCommitComments` into its hopefully final shape. This patch fixes two problems: > > - multiple commits can have the same commit message title (i.e. first line of commit message) > - GitLab sometimes returns a trimmed `target_title` for commit comment events > > The first problem is fixed by always starting out with fetching the entire history (once) and then always return a set of candidate hashes for a given commit title. We can then fetch the commit comments for each of the candidate hashes to figure which hash the comment was made on. The solution to the second problem then piggy-backs on the first solution: if a hash with a given title isn't found, and the title ends with `...`, then go through all commit message titles and check if any of them has the given title as prefix. > > The drawback is that it can take a couple of minutes to populate the initial commit message title to hash mapping, but since 874a89ceb0d5fd742db75b6f9744b56e200cfe32 this will run in a separate `WorkItem`, so the degraded performance won't affect other `WorkItem`s during startup. Once the map is populated there will only be one additional REST request for most calls to `recentCommitComments`. > > Testing: > - [x] `make test` passes on Linux x64 > - [x] Manual testing against GitLab on Linux x64 with `git skara debug commit-comments` > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1032 From ehelin at openjdk.java.net Wed Feb 24 13:01:01 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 24 Feb 2021 13:01:01 GMT Subject: RFR: Add additional sync label tests, adjust the implementation to match In-Reply-To: References: Message-ID: <3A5iAUg1ToNuRUMWi2RVx4OcjFfmPBW5fO-_j57jAbA=.880e5047-a9fa-4537-b669-c801d369d7ab@github.com> On Wed, 24 Feb 2021 07:48:05 GMT, Robin Westberg wrote: > Adjust the implementation of the sync label rules to match expectations. Looks good! @rwestberg you might want to fix the test failure though ?? ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1033 From ehelin at openjdk.java.net Wed Feb 24 13:02:50 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 24 Feb 2021 13:02:50 GMT Subject: Integrated: forge: fix GitLabRepository.recentCommitComments In-Reply-To: References: Message-ID: On Tue, 23 Feb 2021 15:01:29 GMT, Erik Helin wrote: > Hi all, > > please review this patch that re-works `GitLab.recentCommitComments` into its hopefully final shape. This patch fixes two problems: > > - multiple commits can have the same commit message title (i.e. first line of commit message) > - GitLab sometimes returns a trimmed `target_title` for commit comment events > > The first problem is fixed by always starting out with fetching the entire history (once) and then always return a set of candidate hashes for a given commit title. We can then fetch the commit comments for each of the candidate hashes to figure which hash the comment was made on. The solution to the second problem then piggy-backs on the first solution: if a hash with a given title isn't found, and the title ends with `...`, then go through all commit message titles and check if any of them has the given title as prefix. > > The drawback is that it can take a couple of minutes to populate the initial commit message title to hash mapping, but since 874a89ceb0d5fd742db75b6f9744b56e200cfe32 this will run in a separate `WorkItem`, so the degraded performance won't affect other `WorkItem`s during startup. Once the map is populated there will only be one additional REST request for most calls to `recentCommitComments`. > > Testing: > - [x] `make test` passes on Linux x64 > - [x] Manual testing against GitLab on Linux x64 with `git skara debug commit-comments` > > Thanks, > Erik This pull request has now been integrated. Changeset: 12a8c32a Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/12a8c32a Stats: 135 lines in 2 files changed: 80 ins; 44 del; 11 mod forge: fix GitLabRepository.recentCommitComments Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1032 From ehelin at openjdk.java.net Wed Feb 24 14:54:42 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 24 Feb 2021 14:54:42 GMT Subject: [skara] RFR: pr: only act on commit comments on known branches Message-ID: Hi all, please review this patch that makes the `CommitCommentsWorkItem` filter out commit comments that aren't made on commits on a known branch in the remote repository. Some forges can return comments on commits in pull requests, which aren't comments we want to act upon (commit commands are only for integrated commits on a known branch). Testing: - [x] Added a unit test - [x] `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - pr: only act on commit comments on known branches Changes: https://git.openjdk.java.net/skara/pull/1034/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1034&range=00 Stats: 94 lines in 3 files changed: 83 ins; 7 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1034.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1034/head:pull/1034 PR: https://git.openjdk.java.net/skara/pull/1034 From rwestberg at openjdk.java.net Wed Feb 24 15:35:48 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 24 Feb 2021 15:35:48 GMT Subject: [skara] RFR: pr: only act on commit comments on known branches In-Reply-To: References: Message-ID: On Wed, 24 Feb 2021 14:48:37 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the `CommitCommentsWorkItem` filter out commit comments that aren't made on commits on a known branch in the remote repository. Some forges can return comments on commits in pull requests, which aren't comments we want to act upon (commit commands are only for integrated commits on a known branch). > > Testing: > - [x] Added a unit test > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Marked as reviewed by rwestberg (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1034 From ehelin at openjdk.java.net Wed Feb 24 15:39:55 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 24 Feb 2021 15:39:55 GMT Subject: git: openjdk/skara: pr: only act on commit comments on known branches Message-ID: <59fd5dab-8fa4-4ede-869a-845b0b6d7653@openjdk.org> Changeset: fea182b7 Author: Erik Helin Date: 2021-02-24 15:39:28 +0000 URL: https://git.openjdk.java.net/skara/commit/fea182b7 pr: only act on commit comments on known branches Reviewed-by: rwestberg ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommitCommandWorkItem.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommitCommentsWorkItem.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CommitCommandTests.java From ehelin at openjdk.java.net Wed Feb 24 15:43:23 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 24 Feb 2021 15:43:23 GMT Subject: Integrated: pr: only act on commit comments on known branches In-Reply-To: References: Message-ID: On Wed, 24 Feb 2021 14:48:37 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the `CommitCommentsWorkItem` filter out commit comments that aren't made on commits on a known branch in the remote repository. Some forges can return comments on commits in pull requests, which aren't comments we want to act upon (commit commands are only for integrated commits on a known branch). > > Testing: > - [x] Added a unit test > - [x] `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: fea182b7 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/fea182b7 Stats: 94 lines in 3 files changed: 83 ins; 7 del; 4 mod pr: only act on commit comments on known branches Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1034 From ehelin at openjdk.java.net Wed Feb 24 15:51:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 24 Feb 2021 15:51:27 GMT Subject: [skara] RFR: forge: pass commit-title-to-commits map to GitLab Message-ID: Hi all, please review this patch that greatly simplifies `GitLabRepository.recentCommitComments`. Now that `CommitCommentsWorkItem` has a `Repository` instance anyhow for filtering out applicable commits, we can use that to create a "commit titles to commits" map and pass that to `GitLabRepository.recentCommitComments`. This greatly speeds up the function call (avoid a bunch of expensive REST requests). Other forges can just ignore the argument. Thanks, Erik ------------- Commit messages: - forge: pass commit-title-to-commits map to GitLab Changes: https://git.openjdk.java.net/skara/pull/1035/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1035&range=00 Stats: 100 lines in 6 files changed: 30 ins; 57 del; 13 mod Patch: https://git.openjdk.java.net/skara/pull/1035.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1035/head:pull/1035 PR: https://git.openjdk.java.net/skara/pull/1035 From rwestberg at openjdk.java.net Wed Feb 24 15:51:27 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 24 Feb 2021 15:51:27 GMT Subject: [skara] RFR: forge: pass commit-title-to-commits map to GitLab In-Reply-To: References: Message-ID: <1aCrCVfG58VOS8mr3UagXlNWHuNZQP2s1a3umVA2QB8=.a1796f20-7849-42ae-b63a-cdbf4abedea8@github.com> On Wed, 24 Feb 2021 15:45:18 GMT, Erik Helin wrote: > Hi all, > > please review this patch that greatly simplifies `GitLabRepository.recentCommitComments`. Now that `CommitCommentsWorkItem` has a `Repository` instance anyhow for filtering out applicable commits, we can use that to create a "commit titles to commits" map and pass that to `GitLabRepository.recentCommitComments`. This greatly speeds up the function call (avoid a bunch of expensive REST requests). Other forges can just ignore the argument. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1035 From ehelin at openjdk.java.net Wed Feb 24 15:57:06 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 24 Feb 2021 15:57:06 GMT Subject: Integrated: forge: pass commit-title-to-commits map to GitLab In-Reply-To: References: Message-ID: On Wed, 24 Feb 2021 15:45:18 GMT, Erik Helin wrote: > Hi all, > > please review this patch that greatly simplifies `GitLabRepository.recentCommitComments`. Now that `CommitCommentsWorkItem` has a `Repository` instance anyhow for filtering out applicable commits, we can use that to create a "commit titles to commits" map and pass that to `GitLabRepository.recentCommitComments`. This greatly speeds up the function call (avoid a bunch of expensive REST requests). Other forges can just ignore the argument. > > Thanks, > Erik This pull request has now been integrated. Changeset: 61cfb6d9 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/61cfb6d9 Stats: 100 lines in 6 files changed: 30 ins; 57 del; 13 mod forge: pass commit-title-to-commits map to GitLab Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1035 From ehelin at openjdk.java.net Thu Feb 25 09:16:14 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 25 Feb 2021 09:16:14 GMT Subject: Integrated: pr: use separate scratch for commit-comments work item Message-ID: Hi all, please review this patch puts the materialized repositories for the `CommitCommensWorkItem` into a separate directory. Testing: - [x] `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - pr: use separate scratch for commit-comments work item Changes: https://git.openjdk.java.net/skara/pull/1036/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1036&range=00 Stats: 3 lines in 1 file changed: 0 ins; 1 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1036.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1036/head:pull/1036 PR: https://git.openjdk.java.net/skara/pull/1036 From rwestberg at openjdk.java.net Thu Feb 25 09:16:15 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 25 Feb 2021 09:16:15 GMT Subject: Integrated: pr: use separate scratch for commit-comments work item In-Reply-To: References: Message-ID: On Thu, 25 Feb 2021 09:09:59 GMT, Erik Helin wrote: > Hi all, > > please review this patch puts the materialized repositories for the `CommitCommensWorkItem` into a separate directory. > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1036 From ehelin at openjdk.java.net Thu Feb 25 09:16:15 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 25 Feb 2021 09:16:15 GMT Subject: Integrated: pr: use separate scratch for commit-comments work item In-Reply-To: References: Message-ID: On Thu, 25 Feb 2021 09:09:59 GMT, Erik Helin wrote: > Hi all, > > please review this patch puts the materialized repositories for the `CommitCommensWorkItem` into a separate directory. > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: b2f8fc84 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/b2f8fc84 Stats: 3 lines in 1 file changed: 0 ins; 1 del; 2 mod pr: use separate scratch for commit-comments work item Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1036 From rwestberg at openjdk.java.net Thu Feb 25 09:46:56 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 25 Feb 2021 09:46:56 GMT Subject: [skara] RFR: Allow issues to be excluded from the hgupdate-sync logic Message-ID: Allow manual exclusion of certain issues when evaluating which ones should be marked with the hgupdate-sync label. ------------- Commit messages: - Allow issues to be excluded from the hgupdate-sync logic Changes: https://git.openjdk.java.net/skara/pull/1037/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1037&range=00 Stats: 86 lines in 2 files changed: 82 ins; 1 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1037.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1037/head:pull/1037 PR: https://git.openjdk.java.net/skara/pull/1037 From ehelin at openjdk.java.net Thu Feb 25 09:46:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 25 Feb 2021 09:46:56 GMT Subject: [skara] RFR: Allow issues to be excluded from the hgupdate-sync logic In-Reply-To: References: Message-ID: On Thu, 25 Feb 2021 09:42:26 GMT, Robin Westberg wrote: > Allow manual exclusion of certain issues when evaluating which ones should be marked with the hgupdate-sync label. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1037 From ehelin at openjdk.java.net Thu Feb 25 09:58:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 25 Feb 2021 09:58:45 GMT Subject: RFR: pr: separate commit and pr commands Message-ID: Hi all, please review this pull request that properly separates pull request and commit commands at the source code level. The class `CommandWorkItem` is renamed to `PullRequestCommandWorkItem` and then I did a number of smaller follow-out refactorings from this renaming. Testing: - [x] `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - pr: separate commit and pr commands Changes: https://git.openjdk.java.net/skara/pull/1038/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1038&range=00 Stats: 89 lines in 8 files changed: 61 ins; 0 del; 28 mod Patch: https://git.openjdk.java.net/skara/pull/1038.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1038/head:pull/1038 PR: https://git.openjdk.java.net/skara/pull/1038 From rwestberg at openjdk.java.net Thu Feb 25 09:58:45 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 25 Feb 2021 09:58:45 GMT Subject: RFR: pr: separate commit and pr commands In-Reply-To: References: Message-ID: On Thu, 25 Feb 2021 09:53:33 GMT, Erik Helin wrote: > Hi all, > > please review this pull request that properly separates pull request and commit commands at the source code level. The class `CommandWorkItem` is renamed to `PullRequestCommandWorkItem` and then I did a number of smaller follow-out refactorings from this renaming. > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1038 From rwestberg at openjdk.java.net Thu Feb 25 11:03:47 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 25 Feb 2021 11:03:47 GMT Subject: [skara] Integrated: Allow issues to be excluded from the hgupdate-sync logic In-Reply-To: References: Message-ID: On Thu, 25 Feb 2021 09:42:26 GMT, Robin Westberg wrote: > Allow manual exclusion of certain issues when evaluating which ones should be marked with the hgupdate-sync label. This pull request has now been integrated. Changeset: 3969e918 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/3969e918 Stats: 86 lines in 2 files changed: 82 ins; 1 del; 3 mod Allow issues to be excluded from the hgupdate-sync logic Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1037 From ehelin at openjdk.java.net Thu Feb 25 11:03:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 25 Feb 2021 11:03:45 GMT Subject: Integrated: pr: separate commit and pr commands In-Reply-To: References: Message-ID: On Thu, 25 Feb 2021 09:53:33 GMT, Erik Helin wrote: > Hi all, > > please review this pull request that properly separates pull request and commit commands at the source code level. The class `CommandWorkItem` is renamed to `PullRequestCommandWorkItem` and then I did a number of smaller follow-out refactorings from this renaming. > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 1fc516c9 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/1fc516c9 Stats: 89 lines in 8 files changed: 61 ins; 0 del; 28 mod pr: separate commit and pr commands Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1038 From ehelin at openjdk.java.net Thu Feb 25 11:37:14 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 25 Feb 2021 11:37:14 GMT Subject: RFR: cli: make git-pr-create detect backports Message-ID: Hi all, please review this patch that makes `git pr create` uses the correct title for "backport style" pull requests. If the branch only contains a single commit that matches a "backport style" pull request title, then `git pr create` should use that commit's commit message title for the pull request title (even if the branch refers to an existing JBS issue). Testing: - [x] Manual testing on Linux x64 Thanks, Erik ------------- Commit messages: - cli: make git-pr-create detect backports Changes: https://git.openjdk.java.net/skara/pull/1039/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1039&range=00 Stats: 15 lines in 1 file changed: 6 ins; 2 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/1039.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1039/head:pull/1039 PR: https://git.openjdk.java.net/skara/pull/1039 From rwestberg at openjdk.java.net Thu Feb 25 11:39:42 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 25 Feb 2021 11:39:42 GMT Subject: RFR: cli: make git-pr-create detect backports In-Reply-To: References: Message-ID: On Thu, 25 Feb 2021 11:34:14 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `git pr create` uses the correct title for "backport style" pull requests. If the branch only contains a single commit that matches a "backport style" pull request title, then `git pr create` should use that commit's commit message title for the pull request title (even if the branch refers to an existing JBS issue). > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1039 From ehelin at openjdk.java.net Thu Feb 25 14:18:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 25 Feb 2021 14:18:56 GMT Subject: [skara] Integrated: cli: make git-pr-create detect backports In-Reply-To: References: Message-ID: On Thu, 25 Feb 2021 11:34:14 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `git pr create` uses the correct title for "backport style" pull requests. If the branch only contains a single commit that matches a "backport style" pull request title, then `git pr create` should use that commit's commit message title for the pull request title (even if the branch refers to an existing JBS issue). > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 9a8231f5 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/9a8231f5 Stats: 15 lines in 1 file changed: 6 ins; 2 del; 7 mod cli: make git-pr-create detect backports Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1039 From rwestberg at openjdk.java.net Thu Feb 25 15:00:44 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 25 Feb 2021 15:00:44 GMT Subject: RFR: Allow configuration of version patterns to either include or ignore Message-ID: Allow configuring of version patterns that should either be included or ignored when determining which issues are considered when applying the hgupdate-sync label. ------------- Commit messages: - Allow configuration of version patterns to either include or ignore for setting sync label Changes: https://git.openjdk.java.net/skara/pull/1040/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1040&range=00 Stats: 158 lines in 5 files changed: 142 ins; 3 del; 13 mod Patch: https://git.openjdk.java.net/skara/pull/1040.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1040/head:pull/1040 PR: https://git.openjdk.java.net/skara/pull/1040 From ehelin at openjdk.java.net Thu Feb 25 17:31:03 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 25 Feb 2021 17:31:03 GMT Subject: RFR: Allow configuration of version patterns to either include or ignore In-Reply-To: References: Message-ID: On Thu, 25 Feb 2021 14:57:48 GMT, Robin Westberg wrote: > Allow configuring of version patterns that should either be included or ignored when determining which issues are considered when applying the hgupdate-sync label. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1040 From rwestberg at openjdk.java.net Fri Feb 26 07:45:13 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 26 Feb 2021 07:45:13 GMT Subject: [skara] Integrated: Allow configuration of version patterns to either include or ignore In-Reply-To: References: Message-ID: <31ZEDEewy6nrJ5945bc1LqHBStBhDtPMquMcjLQs-3U=.e524bb04-d22e-44dd-93ec-2bc9a0f43e7d@github.com> On Thu, 25 Feb 2021 14:57:48 GMT, Robin Westberg wrote: > Allow configuring of version patterns that should either be included or ignored when determining which issues are considered when applying the hgupdate-sync label. This pull request has now been integrated. Changeset: 254c6885 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/254c6885 Stats: 158 lines in 5 files changed: 142 ins; 3 del; 13 mod Allow configuration of version patterns to either include or ignore Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1040 From ehelin at openjdk.java.net Sun Feb 28 20:08:48 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Sun, 28 Feb 2021 20:08:48 GMT Subject: [skara] RFR: pr: update all local branches for commit comments Message-ID: Hi all, please review this patch that makes `CommitCommentsWorkItem` properly update all local branches prior to calling `ReadOnlyRepository.commitMetdata`. `ReadOnlyRepository.commitMetadata` is essentially `rev-list ?all` for Git and all local refs need to be updated for this to work. In order to make as few networks call as possible I manually merge each local branch with its remote counterpart (instead of doing `pull`). Testing: - [x] `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - pr: update all local branches for commit comments Changes: https://git.openjdk.java.net/skara/pull/1041/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1041&range=00 Stats: 3 lines in 1 file changed: 2 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1041.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1041/head:pull/1041 PR: https://git.openjdk.java.net/skara/pull/1041