From ehelin at openjdk.java.net Mon Mar 2 09:21:37 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 2 Mar 2020 09:21:37 GMT Subject: RFR: Add out-of-the-box support for IntelliJ IDEA Message-ID: Hi all, please review this PR that adds "out of the box" support for IntelliJ IDEA for Skara. The changes primarily consists of: - IntelliJ IDEA configuration files - Re-working the build system to support one JRE for running Gradle and one JDK for building and testing Skara - Documentation updates The build changes are a bit messy, I will refactor them later, but I want to await feedback first to see if we need to some additional changes. Testing: - Opening up the Skara root directory in a fresh install of IntelliJ IDEA on Linux x64 Thanks, Erik ------------- Commit messages: - Add out-of-the-box support for IntelliJ IDEA Changes: https://git.openjdk.java.net/skara/pull/489/files Webrev: https://webrevs.openjdk.java.net/skara/489/webrev.00 Stats: 380 lines in 14 files changed: 366 ins; 3 del; 11 mod Patch: https://git.openjdk.java.net/skara/pull/489.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/489/head:pull/489 PR: https://git.openjdk.java.net/skara/pull/489 From ehelin at openjdk.java.net Mon Mar 2 10:34:12 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 2 Mar 2020 10:34:12 GMT Subject: [Rev 01] RFR: Add out-of-the-box support for IntelliJ IDEA In-Reply-To: References: Message-ID: <3X6MEj2S-EEsH03vL2me3hjyzloWMHVIo2jo4USlJmc=.fc7b8b9f-d3b1-4eb1-abb8-7c4c90cc341c@github.com> > Hi all, > > please review this PR that adds "out of the box" support for IntelliJ IDEA for > Skara. The changes primarily consists of: > > - IntelliJ IDEA configuration files > - Re-working the build system to support one JRE for running Gradle and one JDK > for building and testing Skara > - Documentation updates > > The build changes are a bit messy, I will refactor them later, but I want to > await feedback first to see if we need to some additional changes. > > Testing: > - Opening up the Skara root directory in a fresh install of IntelliJ IDEA on > Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Fix macOS build ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/489/files - new: https://git.openjdk.java.net/skara/pull/489/files/55500b72..79ab438c Webrevs: - full: https://webrevs.openjdk.java.net/skara/489/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/489/webrev.00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/489.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/489/head:pull/489 PR: https://git.openjdk.java.net/skara/pull/489 From ehelin at openjdk.java.net Mon Mar 2 11:03:16 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 2 Mar 2020 11:03:16 GMT Subject: [Rev 02] RFR: Add out-of-the-box support for IntelliJ IDEA In-Reply-To: References: Message-ID: > Hi all, > > please review this PR that adds "out of the box" support for IntelliJ IDEA for > Skara. The changes primarily consists of: > > - IntelliJ IDEA configuration files > - Re-working the build system to support one JRE for running Gradle and one JDK > for building and testing Skara > - Documentation updates > > The build changes are a bit messy, I will refactor them later, but I want to > await feedback first to see if we need to some additional changes. > > Testing: > - Opening up the Skara root directory in a fresh install of IntelliJ IDEA on > Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Fix Windows build ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/489/files - new: https://git.openjdk.java.net/skara/pull/489/files/79ab438c..44d746ce Webrevs: - full: https://webrevs.openjdk.java.net/skara/489/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/489/webrev.01-02 Stats: 9 lines in 2 files changed: 3 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/489.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/489/head:pull/489 PR: https://git.openjdk.java.net/skara/pull/489 From ehelin at openjdk.java.net Mon Mar 2 12:53:12 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 2 Mar 2020 12:53:12 GMT Subject: RFR: doc: update README Message-ID: Hi all, please review this patch brings `README.md` up to date and also adds some missing targets to the `Makefile`. Thanks, Erik ------------- Commit messages: - doc: update README Changes: https://git.openjdk.java.net/skara/pull/490/files Webrev: https://webrevs.openjdk.java.net/skara/490/webrev.00 Stats: 87 lines in 2 files changed: 78 ins; 0 del; 9 mod Patch: https://git.openjdk.java.net/skara/pull/490.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/490/head:pull/490 PR: https://git.openjdk.java.net/skara/pull/490 From rwestberg at openjdk.java.net Mon Mar 2 12:56:50 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 2 Mar 2020 12:56:50 GMT Subject: RFR: doc: update README In-Reply-To: References: Message-ID: On Mon, 2 Mar 2020 12:49:21 GMT, Erik Helin wrote: > Hi all, > > please review this patch brings `README.md` up to date and also adds some > missing targets to the `Makefile`. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/490 From ehelin at openjdk.java.net Mon Mar 2 14:12:46 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 2 Mar 2020 14:12:46 GMT Subject: [Integrated] RFR: doc: update README In-Reply-To: References: Message-ID: Changeset: 3cf06964 Author: Erik Helin Date: 2020-03-02 14:12:28 +0000 URL: https://git.openjdk.java.net/skara/commit/3cf06964 doc: update README Reviewed-by: rwestberg ! Makefile ! README.md From ehelin at openjdk.java.net Tue Mar 3 11:39:02 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 3 Mar 2020 11:39:02 GMT Subject: [Rev 03] RFR: Add out-of-the-box support for IntelliJ IDEA In-Reply-To: References: Message-ID: > Hi all, > > please review this PR that adds "out of the box" support for IntelliJ IDEA for > Skara. The changes primarily consists of: > > - IntelliJ IDEA configuration files > - Re-working the build system to support one JRE for running Gradle and one JDK > for building and testing Skara > - Documentation updates > > The build changes are a bit messy, I will refactor them later, but I want to > await feedback first to see if we need to some additional changes. > > Testing: > - Opening up the Skara root directory in a fresh install of IntelliJ IDEA 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 pull request now contains four commits: - Merge master - Fix Windows build - Fix macOS build - Add out-of-the-box support for IntelliJ IDEA ------------- Changes: https://git.openjdk.java.net/skara/pull/489/files Webrev: https://webrevs.openjdk.java.net/skara/489/webrev.03 Stats: 377 lines in 14 files changed: 363 ins; 3 del; 11 mod Patch: https://git.openjdk.java.net/skara/pull/489.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/489/head:pull/489 PR: https://git.openjdk.java.net/skara/pull/489 From ehelin at openjdk.java.net Wed Mar 4 10:29:01 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 4 Mar 2020 10:29:01 GMT Subject: git: openjdk/skara: 295: jcheck should always use configuration from the target branch Message-ID: <07b4b1ad-f721-40ee-bc90-9c9984e4b355@openjdk.org> Changeset: 9fe63b93 Author: Erik Helin Date: 2020-03-04 10:28:38 +0000 URL: https://git.openjdk.java.net/skara/commit/9fe63b93 295: jcheck should always use configuration from the target branch Reviewed-by: rwestberg ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/JCheck.java ! jcheck/src/test/java/org/openjdk/skara/jcheck/JCheckTests.java ! jcheck/src/test/java/org/openjdk/skara/jcheck/TestRepository.java ! vcs/src/main/java/org/openjdk/skara/vcs/ReadOnlyRepository.java ! vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java ! vcs/src/main/java/org/openjdk/skara/vcs/hg/HgRepository.java ! vcs/src/test/java/org/openjdk/skara/vcs/RepositoryTests.java From rwestberg at openjdk.java.net Wed Mar 4 10:29:59 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 4 Mar 2020 10:29:59 GMT Subject: RFR: 295: jcheck should always use configuration from the target branch In-Reply-To: References: Message-ID: On Wed, 4 Mar 2020 10:20:05 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that the bots always use the .jcheck/conf > from the target branch when checking pull requests. > > Testing: > - `make test` passes on Linux x64 > - Added a few new unit tests > > Thanks, > Erik Looks good, we can skip some rebasing done by the bots as well, but that can be fixed later. ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/491 From ehelin at openjdk.java.net Wed Mar 4 10:24:20 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 4 Mar 2020 10:24:20 GMT Subject: RFR: 295: jcheck should always use configuration from the target branch Message-ID: Hi all, please review this patch that ensures that the bots always use the .jcheck/conf from the target branch when checking pull requests. Testing: - `make test` passes on Linux x64 - Added a few new unit tests Thanks, Erik ------------- Commit messages: - 295: jcheck should always use configuration from the target branch Changes: https://git.openjdk.java.net/skara/pull/491/files Webrev: https://webrevs.openjdk.java.net/skara/491/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-295 Stats: 194 lines in 8 files changed: 146 ins; 15 del; 33 mod Patch: https://git.openjdk.java.net/skara/pull/491.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/491/head:pull/491 PR: https://git.openjdk.java.net/skara/pull/491 From ehelin at openjdk.java.net Wed Mar 4 15:05:55 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 4 Mar 2020 15:05:55 GMT Subject: RFR: jcheck: always reload configuration Message-ID: Hi all, please review this pull request that always reloads the .jcheck/conf from the tree corresponding to a commit when checking said commit. The existing optimization may not work that well with merged histories where there are two branches with differing .jcheck/conf files. The performance impact from this patch is barely noticeable, so I suggest we opt for a safer and simpler implementation. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - jcheck: always reload configuration Changes: https://git.openjdk.java.net/skara/pull/492/files Webrev: https://webrevs.openjdk.java.net/skara/492/webrev.00 Stats: 18 lines in 1 file changed: 0 ins; 17 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/492.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/492/head:pull/492 PR: https://git.openjdk.java.net/skara/pull/492 From rwestberg at openjdk.java.net Wed Mar 4 15:05:55 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 4 Mar 2020 15:05:55 GMT Subject: RFR: jcheck: always reload configuration In-Reply-To: References: Message-ID: On Wed, 4 Mar 2020 14:59:37 GMT, Erik Helin wrote: > Hi all, > > please review this pull request that always reloads the .jcheck/conf from the > tree corresponding to a commit when checking said commit. The existing > optimization may not work that well with merged histories where there are two > branches with differing .jcheck/conf files. The performance impact from this > patch is barely noticeable, so I suggest we opt for a safer and simpler > implementation. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/492 From rwestberg at openjdk.java.net Wed Mar 4 15:13:12 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 4 Mar 2020 15:13:12 GMT Subject: RFR: jcheck: make merge committers configurable In-Reply-To: References: Message-ID: On Wed, 4 Mar 2020 15:05:04 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds an additional configuration to the > "committers" check. We now support setting usernames that are allowed to be > committers of merge commits even though they are not part of the project. This > is useful for allowing automated merge commits to pass jcheck. > > Testing: > - `make test` passes on Linux x64 > - Added two new unit tests > > Thanks, > Erik Looks good as well! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/494 From ehelin at openjdk.java.net Wed Mar 4 15:10:36 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 4 Mar 2020 15:10:36 GMT Subject: RFR: jcheck: make merge committers configurable Message-ID: Hi all, please review this patch that adds an additional configuration to the "committers" check. We now support setting usernames that are allowed to be committers of merge commits even though they are not part of the project. This is useful for allowing automated merge commits to pass jcheck. Testing: - `make test` passes on Linux x64 - Added two new unit tests Thanks, Erik ------------- Commit messages: - jcheck: make merge committers configurable Changes: https://git.openjdk.java.net/skara/pull/494/files Webrev: https://webrevs.openjdk.java.net/skara/494/webrev.00 Stats: 67 lines in 3 files changed: 61 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/494.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/494/head:pull/494 PR: https://git.openjdk.java.net/skara/pull/494 From ehelin at openjdk.java.net Wed Mar 4 15:08:02 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 4 Mar 2020 15:08:02 GMT Subject: RFR: jcheck: allow pattern for merge commit messages Message-ID: <4hLu0rdxKBFvn1V68GWhd-6DKD5tZ0S06rD8grp2L8I=.c0219dce-ae50-4188-969d-f151c09e0045@github.com> Hi all, please review this patch that allows for the merge message variable in the .jcheck/conf to be a pattern. I added an additional unit test for this feature. Testing: - `make test` passes on Linux x64 - Added an additional unit test Thanks, Erik ------------- Commit messages: - jcheck: allow pattern for merge commit messages Changes: https://git.openjdk.java.net/skara/pull/493/files Webrev: https://webrevs.openjdk.java.net/skara/493/webrev.00 Stats: 16 lines in 2 files changed: 13 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/493.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/493/head:pull/493 PR: https://git.openjdk.java.net/skara/pull/493 From rwestberg at openjdk.java.net Wed Mar 4 15:08:53 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 4 Mar 2020 15:08:53 GMT Subject: RFR: jcheck: allow pattern for merge commit messages In-Reply-To: <4hLu0rdxKBFvn1V68GWhd-6DKD5tZ0S06rD8grp2L8I=.c0219dce-ae50-4188-969d-f151c09e0045@github.com> References: <4hLu0rdxKBFvn1V68GWhd-6DKD5tZ0S06rD8grp2L8I=.c0219dce-ae50-4188-969d-f151c09e0045@github.com> Message-ID: On Wed, 4 Mar 2020 15:02:37 GMT, Erik Helin wrote: > Hi all, > > please review this patch that allows for the merge message variable in the > .jcheck/conf to be a pattern. I added an additional unit test for this feature. > > Testing: > - `make test` passes on Linux x64 > - Added an additional unit test > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/493 From rwestberg at openjdk.java.net Wed Mar 4 15:45:15 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 4 Mar 2020 15:45:15 GMT Subject: RFR: Use quoting to direct comment threading Message-ID: Hi all, Please review this change that checks if a comment contains a quote from a previous post. If it does, that post will be considered the parent when selecting which thread to post in. Also avoid automatic quoting in that case, to let the user select what to quote. Best regards, Robin ------------- Commit messages: - Use quoting to direct comment threading Changes: https://git.openjdk.java.net/skara/pull/495/files Webrev: https://webrevs.openjdk.java.net/skara/495/webrev.00 Stats: 101 lines in 3 files changed: 99 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/495.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/495/head:pull/495 PR: https://git.openjdk.java.net/skara/pull/495 From ehelin at openjdk.java.net Thu Mar 5 07:35:15 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 5 Mar 2020 07:35:15 GMT Subject: [Integrated] RFR: jcheck: always reload configuration In-Reply-To: References: Message-ID: <3d39784d-2b8d-4e3c-9f4e-f9fc7f242d0d@openjdk.org> Changeset: 07f98f60 Author: Erik Helin Date: 2020-03-05 07:34:45 +0000 URL: https://git.openjdk.java.net/skara/commit/07f98f60 jcheck: always reload configuration Reviewed-by: rwestberg ! jcheck/src/main/java/org/openjdk/skara/jcheck/JCheck.java From ehelin at openjdk.java.net Thu Mar 5 07:35:33 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 5 Mar 2020 07:35:33 GMT Subject: [Integrated] RFR: jcheck: allow pattern for merge commit messages In-Reply-To: <4hLu0rdxKBFvn1V68GWhd-6DKD5tZ0S06rD8grp2L8I=.c0219dce-ae50-4188-969d-f151c09e0045@github.com> References: <4hLu0rdxKBFvn1V68GWhd-6DKD5tZ0S06rD8grp2L8I=.c0219dce-ae50-4188-969d-f151c09e0045@github.com> Message-ID: Changeset: 0ef146d2 Author: Erik Helin Date: 2020-03-05 07:35:07 +0000 URL: https://git.openjdk.java.net/skara/commit/0ef146d2 jcheck: allow pattern for merge commit messages Reviewed-by: rwestberg ! jcheck/src/main/java/org/openjdk/skara/jcheck/MergeMessageCheck.java ! jcheck/src/test/java/org/openjdk/skara/jcheck/MergeMessageCheckTests.java From ehelin at openjdk.java.net Thu Mar 5 07:35:47 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 5 Mar 2020 07:35:47 GMT Subject: [Integrated] RFR: jcheck: make merge committers configurable In-Reply-To: References: Message-ID: <13d2ae9d-9d3c-4d35-ba73-6677f5bc64c2@openjdk.org> Changeset: de5f4b5c Author: Erik Helin Date: 2020-03-05 07:35:15 +0000 URL: https://git.openjdk.java.net/skara/commit/de5f4b5c jcheck: make merge committers configurable Reviewed-by: rwestberg ! jcheck/src/main/java/org/openjdk/skara/jcheck/CommitterCheck.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/CommitterConfiguration.java ! jcheck/src/test/java/org/openjdk/skara/jcheck/CommitterCheckTests.java From ehelin at openjdk.java.net Thu Mar 5 07:38:45 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 5 Mar 2020 07:38:45 GMT Subject: RFR: Use quoting to direct comment threading In-Reply-To: References: Message-ID: On Wed, 4 Mar 2020 15:40:30 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that checks if a comment contains a quote from a previous post. If it does, that post will be > considered the parent when selecting which thread to post in. Also avoid automatic quoting in that case, to let the > user select what to quote. Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/495 From rwestberg at openjdk.java.net Thu Mar 5 08:20:10 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 5 Mar 2020 08:20:10 GMT Subject: [Integrated] RFR: Use quoting to direct comment threading In-Reply-To: References: Message-ID: Changeset: eb543319 Author: Robin Westberg Date: 2020-03-05 08:19:54 +0000 URL: https://git.openjdk.java.net/skara/commit/eb543319 Use quoting to direct comment threading Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java From ehelin at openjdk.java.net Thu Mar 5 08:38:08 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 5 Mar 2020 08:38:08 GMT Subject: RFR: vcs: handle nested repositories Message-ID: <0auHl3FTmIkvUkv-pTQQTCae0EUBMSpLFEuVhOsFU7c=.83eebf23-c8f8-499b-b2cc-2e7b0e982cfd@github.com> Hi all, please review this patch that makes `Repository.get` (and `ReadOnlyRepository.get`) able to handle nested repositories. Testing: - `make test` passes on Linux x64 - Added three new unit tests Thanks, Erik ------------- Commit messages: - vcs: handle nested repositories Changes: https://git.openjdk.java.net/skara/pull/496/files Webrev: https://webrevs.openjdk.java.net/skara/496/webrev.00 Stats: 94 lines in 2 files changed: 90 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/496.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/496/head:pull/496 PR: https://git.openjdk.java.net/skara/pull/496 From rwestberg at openjdk.java.net Thu Mar 5 08:38:08 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 5 Mar 2020 08:38:08 GMT Subject: RFR: vcs: handle nested repositories In-Reply-To: <0auHl3FTmIkvUkv-pTQQTCae0EUBMSpLFEuVhOsFU7c=.83eebf23-c8f8-499b-b2cc-2e7b0e982cfd@github.com> References: <0auHl3FTmIkvUkv-pTQQTCae0EUBMSpLFEuVhOsFU7c=.83eebf23-c8f8-499b-b2cc-2e7b0e982cfd@github.com> Message-ID: On Thu, 5 Mar 2020 08:31:43 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `Repository.get` (and > `ReadOnlyRepository.get`) able to handle nested repositories. > > Testing: > - `make test` passes on Linux x64 > - Added three new unit tests > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/496 From rwestberg at openjdk.java.net Thu Mar 5 11:48:46 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 5 Mar 2020 11:48:46 GMT Subject: RFR: 300: Optionally post Jira web links as comments Message-ID: <7QZ8rObaDVWWFXPr8oYVlFSRF8uHq17A-MoMB5d0Zs4=.aab60103-69ee-478e-a751-d5d744a1efa0@github.com> Hi all, Please review this change that posts Jira web links as comments if a security level has been requested, as web links don't have this property. Also update some related logging. Best regards, Robin ------------- Commit messages: - Better support for security levels Changes: https://git.openjdk.java.net/skara/pull/497/files Webrev: https://webrevs.openjdk.java.net/skara/497/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-300 Stats: 86 lines in 1 file changed: 60 ins; 16 del; 10 mod Patch: https://git.openjdk.java.net/skara/pull/497.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/497/head:pull/497 PR: https://git.openjdk.java.net/skara/pull/497 From ehelin at openjdk.java.net Thu Mar 5 12:04:06 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 5 Mar 2020 12:04:06 GMT Subject: [Integrated] RFR: vcs: handle nested repositories In-Reply-To: <0auHl3FTmIkvUkv-pTQQTCae0EUBMSpLFEuVhOsFU7c=.83eebf23-c8f8-499b-b2cc-2e7b0e982cfd@github.com> References: <0auHl3FTmIkvUkv-pTQQTCae0EUBMSpLFEuVhOsFU7c=.83eebf23-c8f8-499b-b2cc-2e7b0e982cfd@github.com> Message-ID: Changeset: da335bd7 Author: Erik Helin Date: 2020-03-05 12:03:42 +0000 URL: https://git.openjdk.java.net/skara/commit/da335bd7 vcs: handle nested repositories Reviewed-by: rwestberg ! vcs/src/main/java/org/openjdk/skara/vcs/Repository.java ! vcs/src/test/java/org/openjdk/skara/vcs/RepositoryTests.java From ehelin at openjdk.java.net Thu Mar 5 12:05:11 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 5 Mar 2020 12:05:11 GMT Subject: RFR: 300: Optionally post Jira web links as comments In-Reply-To: <7QZ8rObaDVWWFXPr8oYVlFSRF8uHq17A-MoMB5d0Zs4=.aab60103-69ee-478e-a751-d5d744a1efa0@github.com> References: <7QZ8rObaDVWWFXPr8oYVlFSRF8uHq17A-MoMB5d0Zs4=.aab60103-69ee-478e-a751-d5d744a1efa0@github.com> Message-ID: On Thu, 5 Mar 2020 11:44:16 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that posts Jira web links as comments if a security level has been requested, as web links > don't have this property. Also update some related logging. > Best regards, > Robin Looks good, nice fix! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/497 From rwestberg at openjdk.java.net Thu Mar 5 12:36:01 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 5 Mar 2020 12:36:01 GMT Subject: [Integrated] RFR: 300: Optionally post Jira web links as comments In-Reply-To: <7QZ8rObaDVWWFXPr8oYVlFSRF8uHq17A-MoMB5d0Zs4=.aab60103-69ee-478e-a751-d5d744a1efa0@github.com> References: <7QZ8rObaDVWWFXPr8oYVlFSRF8uHq17A-MoMB5d0Zs4=.aab60103-69ee-478e-a751-d5d744a1efa0@github.com> Message-ID: Changeset: 0ec5b375 Author: Robin Westberg Date: 2020-03-05 12:35:35 +0000 URL: https://git.openjdk.java.net/skara/commit/0ec5b375 300: Optionally post Jira web links as comments Reviewed-by: ehelin ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraIssue.java From rwestberg at openjdk.java.net Thu Mar 5 14:30:39 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 5 Mar 2020 14:30:39 GMT Subject: RFR: Parse older conversations, but only the most recent messages Message-ID: Hi all, Please review this small change that allows the mailing list bridge to parse older conversations, but filters out individual old messages. This will allow bridging of conversations that are longer than 60 days, but still avoids unnecessary checking for already bridged messages. Best regards, Robin ------------- Commit messages: - Parse older conversations, but only the most recent messages Changes: https://git.openjdk.java.net/skara/pull/498/files Webrev: https://webrevs.openjdk.java.net/skara/498/webrev.00 Stats: 5 lines in 2 files changed: 3 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/498.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/498/head:pull/498 PR: https://git.openjdk.java.net/skara/pull/498 From rwestberg at openjdk.java.net Thu Mar 5 15:16:12 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 5 Mar 2020 15:16:12 GMT Subject: RFR: Avoid an empty line in footers for a comment-only review Message-ID: Hi all, Please review this small change that avoids putting an extra empty line in a bridged review comment, if the review doesn't have a verdict. Best regards, Robin ------------- Commit messages: - Avoid an empty line in footers for a comment-only review Changes: https://git.openjdk.java.net/skara/pull/499/files Webrev: https://webrevs.openjdk.java.net/skara/499/webrev.00 Stats: 5 lines in 1 file changed: 3 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/499.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/499/head:pull/499 PR: https://git.openjdk.java.net/skara/pull/499 From ehelin at openjdk.java.net Thu Mar 5 15:50:52 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 5 Mar 2020 15:50:52 GMT Subject: RFR: Parse older conversations, but only the most recent messages In-Reply-To: References: Message-ID: On Thu, 5 Mar 2020 14:24:30 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that allows the mailing list bridge to parse older conversations, but filters out > individual old messages. This will allow bridging of conversations that are longer than 60 days, but still avoids > unnecessary checking for already bridged messages. Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/498 From ehelin at openjdk.java.net Thu Mar 5 15:51:27 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 5 Mar 2020 15:51:27 GMT Subject: RFR: Avoid an empty line in footers for a comment-only review In-Reply-To: References: Message-ID: On Thu, 5 Mar 2020 15:10:10 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that avoids putting an extra empty line in a bridged review comment, if the review > doesn't have a verdict. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/499 From rwestberg at openjdk.java.net Fri Mar 6 06:53:50 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 6 Mar 2020 06:53:50 GMT Subject: [Integrated] RFR: Parse older conversations, but only the most recent messages In-Reply-To: References: Message-ID: <0345e809-554f-4838-9d80-372db9085b26@openjdk.org> Changeset: bf4d75aa Author: Robin Westberg Date: 2020-03-06 06:53:17 +0000 URL: https://git.openjdk.java.net/skara/commit/bf4d75aa Parse older conversations, but only the most recent messages Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveReaderWorkItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/MailingListArchiveReaderBot.java From rwestberg at openjdk.java.net Fri Mar 6 06:55:03 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 6 Mar 2020 06:55:03 GMT Subject: [Integrated] RFR: Avoid an empty line in footers for a comment-only review In-Reply-To: References: Message-ID: Changeset: 8d9fed4c Author: Robin Westberg Date: 2020-03-06 06:54:23 +0000 URL: https://git.openjdk.java.net/skara/commit/8d9fed4c Avoid an empty line in footers for a comment-only review Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveMessages.java From rwestberg at openjdk.java.net Fri Mar 6 09:17:07 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 6 Mar 2020 09:17:07 GMT Subject: RFR: Wait with resolving PR until needed when bridging mails Message-ID: Hi all, Please review this change that avoids fetching PRs from a HostedRepository until the data is actually needed, to avoid unnecessary requests. Best regards, Robin ------------- Commit messages: - Wait with resolving PR until needed Changes: https://git.openjdk.java.net/skara/pull/500/files Webrev: https://webrevs.openjdk.java.net/skara/500/webrev.00 Stats: 38 lines in 1 file changed: 18 ins; 11 del; 9 mod Patch: https://git.openjdk.java.net/skara/pull/500.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/500/head:pull/500 PR: https://git.openjdk.java.net/skara/pull/500 From rwestberg at openjdk.java.net Fri Mar 6 09:53:09 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 6 Mar 2020 09:53:09 GMT Subject: [Integrated] RFR: Wait with resolving PR until needed when bridging mails In-Reply-To: References: Message-ID: <06182ca7-0e3f-45d9-bf17-29765924cf8c@openjdk.org> Changeset: 3d52e6b8 Author: Robin Westberg Date: 2020-03-06 09:52:40 +0000 URL: https://git.openjdk.java.net/skara/commit/3d52e6b8 Wait with resolving PR until needed when bridging mails Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/MailingListArchiveReaderBot.java From ehelin at openjdk.java.net Fri Mar 6 09:53:52 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 6 Mar 2020 09:53:52 GMT Subject: RFR: Wait with resolving PR until needed when bridging mails In-Reply-To: References: Message-ID: On Fri, 6 Mar 2020 09:12:50 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that avoids fetching PRs from a HostedRepository until the data is actually needed, to avoid > unnecessary requests. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/500 From rwestberg at openjdk.java.net Fri Mar 6 13:38:54 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 6 Mar 2020 13:38:54 GMT Subject: RFR: 276: Merge style PRs should generate "merge" webrevs Message-ID: Hi all, Please review this change that for merge style PRs generate webrevs only containing the changes done in the merge commit. Note that this is only a partial implementation, such webrevs should also be generated if there are further commits pushed to the PR. Best regards, Robin ------------- Commit messages: - Initial implementation Changes: https://git.openjdk.java.net/skara/pull/501/files Webrev: https://webrevs.openjdk.java.net/skara/501/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-276 Stats: 110 lines in 3 files changed: 107 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/501.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/501/head:pull/501 PR: https://git.openjdk.java.net/skara/pull/501 From jai.forums2013 at gmail.com Fri Mar 6 14:24:23 2020 From: jai.forums2013 at gmail.com (Jaikiran Pai) Date: Fri, 6 Mar 2020 19:54:23 +0530 Subject: Generate mercurial based webrevs from current git based jdk repo? Message-ID: I'm looking for inputs on whether the current state of git repos at [1] can be used as a source for contributing to upstream mercurial backed jdk repos. More specifically is the following workflow supported (and if it is, what are the tools to use): - Clone the github.com openjdk/jdk repo - Pick any issue or enhancement to contribute to and create a local feature/bug-fix branch for it - Work on the fix, commit it to that local git branch - Use some (variation of webrev) tool which will then generate a mercurial based patch comparing the local (git branch) against the latest upstream jdk repo's master branch (either git or mercurial). Upload this webrev to cr.openjdk.java.net for reviews. So far I've been only using mercurial repos and just creating commits locally on top of the "default" branch and then using the webrev tool to generate the webrevs. I would like to move to the git based repos if the above workflow is supported through some tooling. Of course, if/when the mercurial repos are moved to the git repos, we won't need the part where the webrev generates a mercurial patch/webrev from the git repo, so this is kind of stop-gap arrangement I am looking for. [1] https://github.com/openjdk/jdk -Jaikiran From ehelin at openjdk.java.net Mon Mar 9 08:03:47 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 9 Mar 2020 08:03:47 GMT Subject: git: openjdk/skara: csr: avoid null pointer exceptions Message-ID: Changeset: 9f69a8b8 Author: Erik Helin Date: 2020-03-09 08:03:35 +0000 URL: https://git.openjdk.java.net/skara/commit/9f69a8b8 csr: avoid null pointer exceptions Reviewed-by: rwestberg ! bots/csr/src/main/java/org/openjdk/skara/bots/csr/CSRBot.java ! bots/csr/src/test/java/org/openjdk/skara/bots/csr/CSRBotTests.java From ehelin at openjdk.java.net Mon Mar 9 08:45:09 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 9 Mar 2020 08:45:09 GMT Subject: RFR: csr: add logging Message-ID: Hi all, please review this small patch that adds some additional logging to the CSR bot. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - csr: add logging Changes: https://git.openjdk.java.net/skara/pull/503/files Webrev: https://webrevs.openjdk.java.net/skara/503/webrev.00 Stats: 18 lines in 1 file changed: 14 ins; 1 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/503.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/503/head:pull/503 PR: https://git.openjdk.java.net/skara/pull/503 From ehelin at openjdk.java.net Mon Mar 9 08:47:27 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 9 Mar 2020 08:47:27 GMT Subject: [Integrated] RFR: csr: add logging In-Reply-To: References: Message-ID: <33b7f2cd-fba3-4f0b-a2fd-25e318951077@openjdk.org> Changeset: 1b19054e Author: Erik Helin Date: 2020-03-09 08:47:17 +0000 URL: https://git.openjdk.java.net/skara/commit/1b19054e csr: add logging Reviewed-by: rwestberg ! bots/csr/src/main/java/org/openjdk/skara/bots/csr/CSRBot.java From rwestberg at openjdk.java.net Mon Mar 9 08:49:06 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 9 Mar 2020 08:49:06 GMT Subject: RFR: csr: add logging In-Reply-To: References: Message-ID: On Mon, 9 Mar 2020 08:41:07 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds some additional logging to the CSR bot. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/503 From rwestberg at openjdk.java.net Mon Mar 9 09:19:50 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 9 Mar 2020 09:19:50 GMT Subject: RFR: Allow reading the resolution property in Jira issues Message-ID: <4_2oSqXjD4mj-gW_N3Xm6rvSDOn9-7h936qDW8tnmGA=.671a383c-c443-49b0-a1c0-45d189cd10ca@github.com> Hi all, Please review this change that makes the `resolution` property available for reading in a Jira issue. It cannot be set, as it is special (can only be set when transitioning an issue). Best regards, Robin ------------- Commit messages: - Allow reading the resolution property Changes: https://git.openjdk.java.net/skara/pull/504/files Webrev: https://webrevs.openjdk.java.net/skara/504/webrev.00 Stats: 7 lines in 1 file changed: 4 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/504.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/504/head:pull/504 PR: https://git.openjdk.java.net/skara/pull/504 From rwestberg at openjdk.java.net Mon Mar 9 09:21:46 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 9 Mar 2020 09:21:46 GMT Subject: [Integrated] RFR: Allow reading the resolution property in Jira issues In-Reply-To: <4_2oSqXjD4mj-gW_N3Xm6rvSDOn9-7h936qDW8tnmGA=.671a383c-c443-49b0-a1c0-45d189cd10ca@github.com> References: <4_2oSqXjD4mj-gW_N3Xm6rvSDOn9-7h936qDW8tnmGA=.671a383c-c443-49b0-a1c0-45d189cd10ca@github.com> Message-ID: <5fadbf14-cf8d-47d0-b354-d4b9a55ae6d7@openjdk.org> Changeset: 8bd03e3f Author: Robin Westberg Date: 2020-03-09 09:21:33 +0000 URL: https://git.openjdk.java.net/skara/commit/8bd03e3f Allow reading the resolution property in Jira issues Reviewed-by: ehelin ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraProject.java From ehelin at openjdk.java.net Mon Mar 9 09:22:06 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 9 Mar 2020 09:22:06 GMT Subject: RFR: Allow reading the resolution property in Jira issues In-Reply-To: <4_2oSqXjD4mj-gW_N3Xm6rvSDOn9-7h936qDW8tnmGA=.671a383c-c443-49b0-a1c0-45d189cd10ca@github.com> References: <4_2oSqXjD4mj-gW_N3Xm6rvSDOn9-7h936qDW8tnmGA=.671a383c-c443-49b0-a1c0-45d189cd10ca@github.com> Message-ID: On Mon, 9 Mar 2020 09:13:16 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that makes the `resolution` property available for reading in a Jira issue. It cannot be set, > as it is special (can only be set when transitioning an issue). > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/504 From ehelin at openjdk.java.net Mon Mar 9 10:21:08 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 9 Mar 2020 10:21:08 GMT Subject: RFR: 262: Unresolved CSR should not cause jcheck to fail or rfr label to be removed In-Reply-To: References: Message-ID: On Mon, 9 Mar 2020 10:15:47 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that disallows integration of PRs that have a "csr" label set. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/505 From rwestberg at openjdk.java.net Mon Mar 9 10:21:08 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 9 Mar 2020 10:21:08 GMT Subject: RFR: 262: Unresolved CSR should not cause jcheck to fail or rfr label to be removed Message-ID: Hi all, Please review this change that disallows integration of PRs that have a "csr" label set. Best regards, Robin ------------- Commit messages: - Disallow integation of PRs with a "csr" label Changes: https://git.openjdk.java.net/skara/pull/505/files Webrev: https://webrevs.openjdk.java.net/skara/505/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-262 Stats: 30 lines in 7 files changed: 11 ins; 0 del; 19 mod Patch: https://git.openjdk.java.net/skara/pull/505.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/505/head:pull/505 PR: https://git.openjdk.java.net/skara/pull/505 From rwestberg at openjdk.java.net Mon Mar 9 11:05:08 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 9 Mar 2020 11:05:08 GMT Subject: [Integrated] RFR: 262: Unresolved CSR should not cause jcheck to fail or rfr label to be removed In-Reply-To: References: Message-ID: Changeset: 628185b8 Author: Robin Westberg Date: 2020-03-09 11:04:49 +0000 URL: https://git.openjdk.java.net/skara/commit/628185b8 262: Unresolved CSR should not cause jcheck to fail or rfr label to be removed Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestBot.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestBotBuilder.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestBotFactory.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/SponsorCommand.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java From ehelin at openjdk.java.net Tue Mar 10 15:28:36 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 10 Mar 2020 15:28:36 GMT Subject: RFR: 296: git webrev fails Message-ID: Hi all, please review this patch that sets the default value for `--rev` to the parent of `origin..HEAD` (essentially the same as Mercurial's revset expression `min(outgoing())^`). Testing: - Manual testing of `git-webrev` on Linux x64 Thanks, Erik ------------- Commit messages: - git-webrev: default to origin..HEAD for --rev Changes: https://git.openjdk.java.net/skara/pull/506/files Webrev: https://webrevs.openjdk.java.net/skara/506/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-296 Stats: 13 lines in 1 file changed: 8 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/506.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/506/head:pull/506 PR: https://git.openjdk.java.net/skara/pull/506 From ehelin at openjdk.java.net Tue Mar 10 15:39:50 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 10 Mar 2020 15:39:50 GMT Subject: [Integrated] RFR: 296: git webrev fails In-Reply-To: References: Message-ID: Changeset: bfa006eb Author: Erik Helin Date: 2020-03-10 15:39:31 +0000 URL: https://git.openjdk.java.net/skara/commit/bfa006eb 296: git webrev fails Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java From rwestberg at openjdk.java.net Tue Mar 10 15:40:51 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 10 Mar 2020 15:40:51 GMT Subject: RFR: 296: git webrev fails In-Reply-To: References: Message-ID: On Tue, 10 Mar 2020 15:25:07 GMT, Erik Helin wrote: > Hi all, > > please review this patch that sets the default value for `--rev` to > the parent of `origin..HEAD` (essentially the same as Mercurial's revset > expression `min(outgoing())^`). > > Testing: > - Manual testing of `git-webrev` on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/506 From ehelin at openjdk.java.net Wed Mar 11 11:45:06 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 11 Mar 2020 11:45:06 GMT Subject: RFR: 302: PR body updater should use .jcheck/conf from target branch Message-ID: Hi all, please reviews this patch that makes the pull request body updater use the .jcheck/conf from the pull request's target branch when populating the "Progress" list. Testing: - Updated one unit test - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - skara-302 Changes: https://git.openjdk.java.net/skara/pull/507/files Webrev: https://webrevs.openjdk.java.net/skara/507/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-302 Stats: 29 lines in 4 files changed: 1 ins; 13 del; 15 mod Patch: https://git.openjdk.java.net/skara/pull/507.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/507/head:pull/507 PR: https://git.openjdk.java.net/skara/pull/507 From rwestberg at openjdk.java.net Wed Mar 11 12:15:03 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 11 Mar 2020 12:15:03 GMT Subject: RFR: 302: PR body updater should use .jcheck/conf from target branch In-Reply-To: References: Message-ID: On Wed, 11 Mar 2020 11:41:31 GMT, Erik Helin wrote: > Hi all, > > please reviews this patch that makes the pull request body updater use the > .jcheck/conf from the pull request's target branch when populating the > "Progress" list. > > Testing: > - Updated one unit test > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good, would be nice if we could restore the original test at some point in the future, but it will probably require some sort of reflection trickery. ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/507 From rwestberg at openjdk.java.net Wed Mar 11 13:54:56 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 11 Mar 2020 13:54:56 GMT Subject: RFR: git-webrev: use HEAD when branch has no commits In-Reply-To: References: Message-ID: On Wed, 11 Mar 2020 13:50:38 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that fixes an issue with the default value for > `--rev` for `git-webrev`. If the current branch has no commits then > `origin..HEAD` will be an empty range, so in that case we should just fall back > to `HEAD`. > > Testing: > - Manual testing of `git-webrev` on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/508 From ehelin at openjdk.java.net Wed Mar 11 13:54:56 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 11 Mar 2020 13:54:56 GMT Subject: RFR: git-webrev: use HEAD when branch has no commits Message-ID: Hi all, please review this small patch that fixes an issue with the default value for `--rev` for `git-webrev`. If the current branch has no commits then `origin..HEAD` will be an empty range, so in that case we should just fall back to `HEAD`. Testing: - Manual testing of `git-webrev` on Linux x64 Thanks, Erik ------------- Commit messages: - git-webrev: use HEAD when branch has no commits Changes: https://git.openjdk.java.net/skara/pull/508/files Webrev: https://webrevs.openjdk.java.net/skara/508/webrev.00 Stats: 5 lines in 1 file changed: 4 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/508.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/508/head:pull/508 PR: https://git.openjdk.java.net/skara/pull/508 From erik.helin at oracle.com Wed Mar 11 16:20:07 2020 From: erik.helin at oracle.com (Erik Helin) Date: Wed, 11 Mar 2020 17:20:07 +0100 Subject: Generate mercurial based webrevs from current git based jdk repo? In-Reply-To: References: Message-ID: On 3/6/20 3:24 PM, Jaikiran Pai wrote: > I'm looking for inputs on whether the current state of git repos at [1] > can be used as a source for contributing to upstream mercurial backed > jdk repos. More specifically is the following workflow supported (and if > it is, what are the tools to use): > > - Clone the github.com openjdk/jdk repo > > - Pick any issue or enhancement to contribute to and create a local > feature/bug-fix branch for it > > - Work on the fix, commit it to that local git branch > > - Use some (variation of webrev) tool which will then generate a > mercurial based patch comparing the local (git branch) against the > latest upstream jdk repo's master branch (either git or mercurial). > Upload this webrev to cr.openjdk.java.net for reviews. > > So far I've been only using mercurial repos and just creating commits > locally on top of the "default" branch and then using the webrev tool to > generate the webrevs. I would like to move to the git based repos if the > above workflow is supported through some tooling. Yep, it is :) If you want to use Git and the read-only jdk mirror on GitHub [0] then you need install the Skara CLI tools [1] to get the Git ports of webrev, defpath and jcheck (you can ignore the instructions about personal access tokens since you will only be using git-webrev, git-jcheck and git-defpath). Once you have installed the Skara CLI tools your workflow would look like the following to create a webrev and send it out for review: $ git clone https://github.com/openjdk/jdk jdk.git $ cd jdk.git $ git checkout -b JDK-8142314 # create a local branch for the issue $ # hack, hack $ git commit -m '8142314: A bugfix' $ git webrev $ # upload webrev to cr.openjdk.java.net If you want to learn more about Git then we strongly recommend the online version of the "Pro Git" book [3]. You can then send out the resulting webrev for review. Once you have gotten reviews and are ready to push your change, then you need to use Mercurial and a Mercurial repository to do the final push: $ hg clone https://hg.openjdk.java.net/jdk/jdk jdk.hg $ cd jdk.hg $ hg apply --no-commit $ hg commit # add "Reviewed-by: " etc. $ hg push > Of course, if/when the > mercurial repos are moved to the git repos, we won't need the part where > the webrev generates a mercurial patch/webrev from the git repo, so this > is kind of stop-gap arrangement I am looking for. Correct, but it is also a nice way to teach yourself Git and get used to the Git commands. Thanks, Erik [0]: https://github.com/openjdk/jdk [1]: https://wiki.openjdk.java.net/display/SKARA/CLI+Tools [3]: https://git-scm.com/book/en/v2 > > [1] https://github.com/openjdk/jdk > > -Jaikiran > > From ehelin at openjdk.java.net Wed Mar 11 16:36:39 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 11 Mar 2020 16:36:39 GMT Subject: [Integrated] RFR: 302: PR body updater should use .jcheck/conf from target branch In-Reply-To: References: Message-ID: Changeset: a2a22376 Author: Erik Helin Date: 2020-03-11 12:47:30 +0000 URL: https://git.openjdk.java.net/skara/commit/a2a22376 302: PR body updater should use .jcheck/conf from target branch Reviewed-by: rwestberg ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/JCheck.java ! jcheck/src/test/java/org/openjdk/skara/jcheck/JCheckTests.java From ehelin at openjdk.java.net Wed Mar 11 17:00:26 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 11 Mar 2020 17:00:26 GMT Subject: [Integrated] RFR: git-webrev: use HEAD when branch has no commits In-Reply-To: References: Message-ID: Changeset: d0eb7970 Author: Erik Helin Date: 2020-03-11 17:00:12 +0000 URL: https://git.openjdk.java.net/skara/commit/d0eb7970 git-webrev: use HEAD when branch has no commits Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java From jai.forums2013 at gmail.com Thu Mar 12 05:54:55 2020 From: jai.forums2013 at gmail.com (Jaikiran Pai) Date: Thu, 12 Mar 2020 11:24:55 +0530 Subject: Generate mercurial based webrevs from current git based jdk repo? In-Reply-To: References: Message-ID: <444b59b5-13bf-4bf4-cdfb-7591cc936ca8@gmail.com> Hello Erik, On 11/03/20 9:50 pm, Erik Helin wrote: > On 3/6/20 3:24 PM, Jaikiran Pai wrote: >> I'm looking for inputs on whether the current state of git repos at [1] >> can be used as a source for contributing to upstream mercurial backed >> jdk repos. More specifically is the following workflow supported (and if >> it is, what are the tools to use): >> >> - Clone the github.com openjdk/jdk repo >> >> - Pick any issue or enhancement to contribute to and create a local >> feature/bug-fix branch for it >> >> - Work on the fix, commit it to that local git branch >> >> - Use some (variation of webrev) tool which will then generate a >> mercurial based patch comparing the local (git branch) against the >> latest upstream jdk repo's master branch (either git or mercurial). >> Upload this webrev to cr.openjdk.java.net for reviews. >> >> So far I've been only using mercurial repos and just creating commits >> locally on top of the "default" branch and then using the webrev tool to >> generate the webrevs. I would like to move to the git based repos if the >> above workflow is supported through some tooling. > > Yep, it is :) > > If you want to use Git and the read-only jdk mirror on GitHub [0] then > you need install the Skara CLI tools [1] to get the Git ports of > webrev, defpath and jcheck (you can ignore the instructions about > personal access tokens since you will only be using git-webrev, > git-jcheck and git-defpath). > > Once you have installed the Skara CLI tools your workflow would look > like the following to create a webrev and send it out for review: > > $ git clone https://github.com/openjdk/jdk jdk.git > $ cd jdk.git > $ git checkout -b JDK-8142314 # create a local branch for the issue > $ # hack, hack > $ git commit -m '8142314: A bugfix' > $ git webrev > $ # upload webrev to cr.openjdk.java.net > This is really good to hear and in fact fits seamlessly with what my workflow expectations were. I am much more used to git based workflows (like this one) than mercurial, so I really appreciate the work that has been put into making this work. I'll setup the Skara tools and give this a try soon with some of the patches that I plan to work on in the coming days. -Jaikiran From rwestberg at openjdk.java.net Fri Mar 13 08:27:52 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 13 Mar 2020 08:27:52 GMT Subject: RFR: Keep track of branch progress per notifier Message-ID: Hi all, Please review this change that makes the repository notifier keep track of the latest reported branch separately for each kind of notifier. This allows other notifications to proceed even if a single notifier fails (such as when the issue tracker is unavailable but email still works). Best regards, Robin ------------- Commit messages: - Keep track of branch progress per notifier Changes: https://git.openjdk.java.net/skara/pull/509/files Webrev: https://webrevs.openjdk.java.net/skara/509/webrev.00 Stats: 271 lines in 9 files changed: 201 ins; 11 del; 59 mod Patch: https://git.openjdk.java.net/skara/pull/509.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/509/head:pull/509 PR: https://git.openjdk.java.net/skara/pull/509 From ehelin at openjdk.java.net Fri Mar 13 09:27:54 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 13 Mar 2020 09:27:54 GMT Subject: RFR: 301: Keep track of branch progress per notifier In-Reply-To: References: Message-ID: On Fri, 13 Mar 2020 08:24:11 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that makes the repository notifier keep track of the latest reported branch separately for > each kind of notifier. This allows other notifications to proceed even if a single notifier fails (such as when the > issue tracker is unavailable but email still works). Best regards, > Robin Looks good, thanks for fixing this Robin! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/509 From rwestberg at openjdk.java.net Fri Mar 13 09:39:16 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 13 Mar 2020 09:39:16 GMT Subject: [Rev 01] RFR: 301: Keep track of branch progress per notifier In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that makes the repository notifier keep track of the latest reported branch separately for > each kind of notifier. This allows other notifications to proceed even if a single notifier fails (such as when the > issue tracker is unavailable but email still works). Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Update handling of new branches as well ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/509/files - new: https://git.openjdk.java.net/skara/pull/509/files/04abb20b..56634685 Webrevs: - full: https://webrevs.openjdk.java.net/skara/509/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/509/webrev.00-01 Stats: 18 lines in 1 file changed: 5 ins; 8 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/509.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/509/head:pull/509 PR: https://git.openjdk.java.net/skara/pull/509 From rwestberg at openjdk.java.net Fri Mar 13 11:48:29 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 13 Mar 2020 11:48:29 GMT Subject: [Integrated] RFR: Keep track of branch progress per notifier In-Reply-To: References: Message-ID: Changeset: 286ccf84 Author: Robin Westberg Date: 2020-03-13 11:48:12 +0000 URL: https://git.openjdk.java.net/skara/commit/286ccf84 301: Keep track of branch progress per notifier Reviewed-by: ehelin ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/JsonUpdater.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/MailingListUpdater.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/RepositoryUpdateConsumer.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/RepositoryWorkItem.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/ResolvedBranch.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/UpdateHistory.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdateHistoryTests.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdaterTests.java From jai.forums2013 at gmail.com Sun Mar 15 12:21:49 2020 From: jai.forums2013 at gmail.com (Jaikiran Pai) Date: Sun, 15 Mar 2020 17:51:49 +0530 Subject: git webrev fails with an IOException if remote isn't named "origin" Message-ID: I just started using skara CLI, specifically git webrev, to try out webrev generation for the JDK project against the github hosted jdk repo. I followed the skara installation guide[1] to set it up locally. I then ran the following command against my local checkout of the jdk repo: git webrev This consistently fails with the following exception: Exception in thread "main" java.io.IOException: Unexpected exit code: 128 ??? at org.openjdk.skara.vcs/org.openjdk.skara.vcs.git.GitRepository.await(GitRepository.java:103) ??? at org.openjdk.skara.vcs/org.openjdk.skara.vcs.git.GitRepository.commitMetadata(GitRepository.java:233) ??? at org.openjdk.skara.vcs/org.openjdk.skara.vcs.git.GitRepository.commitMetadata(GitRepository.java:269) ??? at org.openjdk.skara.cli/org.openjdk.skara.cli.GitWebrev.generate(GitWebrev.java:214) ??? at org.openjdk.skara.args/org.openjdk.skara.args.Command.main(Command.java:54) ??? at org.openjdk.skara.args/org.openjdk.skara.args.MultiCommandParser.lambda$parse$2(MultiCommandParser.java:64) ??? at org.openjdk.skara.cli/org.openjdk.skara.cli.GitWebrev.main(GitWebrev.java:360) ??? at org.openjdk.skara.cli/org.openjdk.skara.cli.GitSkara.main(GitSkara.java:127) Looking into the code of git webrev, hosted in the skara repo and then manually running the command that it runs, I was able to narrow down what was causing this issue. It looks like (internally) the skara code issues: git rev-list --no-color --no-abbrev origin..HEAD --reverse (I've not included the --format option, for the sake of simplicity) Running this above command manually on my setup returns the following error: fatal: ambiguous argument 'origin..HEAD': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' and then checking the exit code of that process: echo $? shows: 128 So this is the same error the git webrev command is running into. The root cause appears to be the fact that I've (intentionally) renamed the logical name of my remote repo to "upstream" and I don't really have anything called "origin" as my remote repo. Here's the output of: git remote -v upstream??? https://github.com/openjdk/jdk.git (fetch) upstream??? https://github.com/openjdk/jdk.git (push) So it looks like the skara CLI code assumes/expects the remote to be always named "origin". Is there a better way to report this error? Furthermore, I see the git webrev command can optionally be passed: --upstream URL?? The URL to the upstream repository Can the tool be enhanced to optionally take a remote name (like "upstream" in my case) instead of a URL, thus making it easier to remember and pass that value instead of passing hard to remember URLs? [1] https://wiki.openjdk.java.net/display/SKARA/CLI+Tools -Jaikiran From rwestberg at openjdk.java.net Mon Mar 16 09:41:52 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 16 Mar 2020 09:41:52 GMT Subject: RFR: Make the notifier retry logic more granular Message-ID: Hi all, Please review this change that makes the notifier retry logic more granular. Instead of marking an entire notifier as either retriable or not, allow a notifier to throw a NonRetriableException if a non-retriable operation fails. Best regards, Robin ------------- Commit messages: - Make the notifier retry logic more granular Changes: https://git.openjdk.java.net/skara/pull/510/files Webrev: https://webrevs.openjdk.java.net/skara/510/webrev.00 Stats: 563 lines in 15 files changed: 290 ins; 128 del; 145 mod Patch: https://git.openjdk.java.net/skara/pull/510.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/510/head:pull/510 PR: https://git.openjdk.java.net/skara/pull/510 From ehelin at openjdk.java.net Mon Mar 16 10:13:45 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 16 Mar 2020 10:13:45 GMT Subject: RFR: Make the notifier retry logic more granular In-Reply-To: References: Message-ID: <3ihQHIkeVJLJBG6c5Si3qoUerbxjpqTKHS8awcYX0gQ=.461bf110-dfdf-4d64-954f-1a1c6eecaed1@github.com> On Mon, 16 Mar 2020 09:37:44 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that makes the notifier retry logic more granular. Instead of marking an entire notifier as > either retriable or not, allow a notifier to throw a NonRetriableException if a non-retriable operation fails. > Best regards, > Robin Looks good, just a small suggestion on using `Throwable` instead of `RuntimeException`. bots/notify/src/main/java/org/openjdk/skara/bots/notify/NonRetriableException.java line 35: > 34: } > 35: } Suggestion: public class NonRetriableException extends Exception { private final Throwable cause; public NonRetriableException(Throwable cause) { this.cause = cause; } public Throwable cause() { return cause; } } ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/510 From rwestberg at openjdk.java.net Mon Mar 16 10:19:40 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 16 Mar 2020 10:19:40 GMT Subject: [Rev 01] RFR: Make the notifier retry logic more granular In-Reply-To: References: Message-ID: <6JwL6wzYdsrBYASBDyief2gP6gAiFeC24DwyJ851TqY=.8a3d766a-9c99-41c2-aecd-84f168c76f07@github.com> > Hi all, > > Please review this change that makes the notifier retry logic more granular. Instead of marking an entire notifier as > either retriable or not, allow a notifier to throw a NonRetriableException if a non-retriable operation fails. > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Update bots/notify/src/main/java/org/openjdk/skara/bots/notify/NonRetriableException.java Co-Authored-By: Erik Duveblad ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/510/files - new: https://git.openjdk.java.net/skara/pull/510/files/db69a722..1b0d3082 Webrevs: - full: https://webrevs.openjdk.java.net/skara/510/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/510/webrev.00-01 Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/510.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/510/head:pull/510 PR: https://git.openjdk.java.net/skara/pull/510 From rwestberg at openjdk.java.net Mon Mar 16 10:29:21 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 16 Mar 2020 10:29:21 GMT Subject: [Rev 02] RFR: Make the notifier retry logic more granular In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that makes the notifier retry logic more granular. Instead of marking an entire notifier as > either retriable or not, allow a notifier to throw a NonRetriableException if a non-retriable operation fails. > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Update further usages of NonRetriableException ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/510/files - new: https://git.openjdk.java.net/skara/pull/510/files/1b0d3082..5f351a86 Webrevs: - full: https://webrevs.openjdk.java.net/skara/510/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/510/webrev.01-02 Stats: 5 lines in 1 file changed: 0 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/510.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/510/head:pull/510 PR: https://git.openjdk.java.net/skara/pull/510 From rwestberg at openjdk.java.net Mon Mar 16 12:37:58 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 16 Mar 2020 12:37:58 GMT Subject: [Integrated] RFR: Make the notifier retry logic more granular In-Reply-To: References: Message-ID: <3eb812fa-af7e-4895-9e28-9f4300cc22fb@openjdk.org> Changeset: 27793d2b Author: Robin Westberg Date: 2020-03-16 12:37:43 +0000 URL: https://git.openjdk.java.net/skara/commit/27793d2b Make the notifier retry logic more granular Reviewed-by: ehelin ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/JsonUpdater.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/MailingListUpdater.java + bots/notify/src/main/java/org/openjdk/skara/bots/notify/NonRetriableException.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/NotifyBot.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/NotifyBotBuilder.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/NotifyBotFactory.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/RepositoryUpdateConsumer.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/RepositoryWorkItem.java - bots/notify/src/main/java/org/openjdk/skara/bots/notify/ResolvedBranch.java ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/UpdateHistory.java + bots/notify/src/main/java/org/openjdk/skara/bots/notify/UpdatedBranch.java + bots/notify/src/main/java/org/openjdk/skara/bots/notify/UpdatedTag.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdateHistoryTests.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdaterTests.java From rwestberg at openjdk.java.net Mon Mar 16 13:10:54 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 16 Mar 2020 13:10:54 GMT Subject: RFR: 309: Backport creation fails Message-ID: Hi all, Please review this change that ensures that only known properties are set when creating an issue. Best regards, Robin ------------- Commit messages: - Only set known properties when creating an issue Changes: https://git.openjdk.java.net/skara/pull/511/files Webrev: https://webrevs.openjdk.java.net/skara/511/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-309 Stats: 15 lines in 2 files changed: 6 ins; 7 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/511.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/511/head:pull/511 PR: https://git.openjdk.java.net/skara/pull/511 From ehelin at openjdk.java.net Mon Mar 16 14:25:45 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 16 Mar 2020 14:25:45 GMT Subject: RFR: 309: Backport creation fails In-Reply-To: References: Message-ID: <3arLygYwUbUgOK3He_tP2Bt6sftCvgZlg8wVzjY3msY=.3dbb4825-32de-4898-93c8-a1bc5d78de39@github.com> On Mon, 16 Mar 2020 13:06:50 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that ensures that only known properties are set when creating an issue. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/511 From rwestberg at openjdk.java.net Mon Mar 16 14:33:49 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 16 Mar 2020 14:33:49 GMT Subject: [Integrated] RFR: 309: Backport creation fails In-Reply-To: References: Message-ID: Changeset: 6468f17b Author: Robin Westberg Date: 2020-03-16 14:33:33 +0000 URL: https://git.openjdk.java.net/skara/commit/6468f17b 309: Backport creation fails Reviewed-by: ehelin ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/RepositoryWorkItem.java ! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraProject.java From rwestberg at openjdk.java.net Mon Mar 16 15:12:06 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 16 Mar 2020 15:12:06 GMT Subject: RFR: 310: RFR thread integration messages should check target branch Message-ID: Hi all, Please review this change that ensures that when the notifier sends a threaded integration message, the PR in the RFR thread targets the branch that the notifier is looking at. Best regards, Robin ------------- Commit messages: - Check that the PR target branch matches when sending a threaded notification Changes: https://git.openjdk.java.net/skara/pull/512/files Webrev: https://webrevs.openjdk.java.net/skara/512/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-310 Stats: 91 lines in 2 files changed: 91 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/512.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/512/head:pull/512 PR: https://git.openjdk.java.net/skara/pull/512 From ehelin at openjdk.java.net Tue Mar 17 08:47:19 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 17 Mar 2020 08:47:19 GMT Subject: RFR: 310: RFR thread integration messages should check target branch In-Reply-To: References: Message-ID: On Mon, 16 Mar 2020 15:08:05 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that ensures that when the notifier sends a threaded integration message, the PR in the RFR > thread targets the branch that the notifier is looking at. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/512 From rwestberg at openjdk.java.net Tue Mar 17 08:56:22 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 17 Mar 2020 08:56:22 GMT Subject: [Integrated] RFR: 310: RFR thread integration messages should check target branch In-Reply-To: References: Message-ID: Changeset: 0d08b363 Author: Robin Westberg Date: 2020-03-17 08:56:06 +0000 URL: https://git.openjdk.java.net/skara/commit/0d08b363 310: RFR thread integration messages should check target branch Reviewed-by: ehelin ! bots/notify/src/main/java/org/openjdk/skara/bots/notify/MailingListUpdater.java ! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdaterTests.java From rwestberg at openjdk.java.net Tue Mar 17 14:44:48 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 17 Mar 2020 14:44:48 GMT Subject: [Rev 01] RFR: 276: Merge style PRs should generate "merge" webrevs In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that for merge style PRs generate webrevs only containing the changes done in the merge > commit. > Note that this is only a partial implementation, such webrevs should also be generated if there are further commits > pushed to the PR. > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Generate actual merge-only webrevs ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/501/files - new: https://git.openjdk.java.net/skara/pull/501/files/9ab929e6..7c657eee Webrevs: - full: https://webrevs.openjdk.java.net/skara/501/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/501/webrev.00-01 Stats: 238 lines in 9 files changed: 163 ins; 22 del; 53 mod Patch: https://git.openjdk.java.net/skara/pull/501.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/501/head:pull/501 PR: https://git.openjdk.java.net/skara/pull/501 From rwestberg at openjdk.java.net Tue Mar 17 15:46:45 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 17 Mar 2020 15:46:45 GMT Subject: RFR: 292: Add comment to PR when it becomes outdated Message-ID: <8KYTzQblqh8EbszlhgE6tV94frn95vRfsylU87i8M7o=.bc59cf35-41d5-4445-9c55-142803f58c5c@github.com> Hi all, Please review this change that posts an instructional message on how to sync with the target branch the first time a PR is marked as outdated. Best regards, Robin ------------- Commit messages: - Post an instructional message when a PR is flagged as outdated Changes: https://git.openjdk.java.net/skara/pull/513/files Webrev: https://webrevs.openjdk.java.net/skara/513/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-292 Stats: 29 lines in 2 files changed: 29 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/513.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/513/head:pull/513 PR: https://git.openjdk.java.net/skara/pull/513 From ehelin at openjdk.java.net Wed Mar 18 08:16:13 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 18 Mar 2020 08:16:13 GMT Subject: RFR: 317: git-webrev uses wrong JBS links for commit messages Message-ID: Hi all, please review this small patch that ensures that `git-webrev` use the correct JBS project issue id:s in commit messages. Testing: - Manual testing of `git-webrev` on Linux x64 Thanks, Erik ------------- Commit messages: - skara-317 Changes: https://git.openjdk.java.net/skara/pull/514/files Webrev: https://webrevs.openjdk.java.net/skara/514/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-317 Stats: 7 lines in 1 file changed: 5 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/514.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/514/head:pull/514 PR: https://git.openjdk.java.net/skara/pull/514 From rwestberg at openjdk.java.net Wed Mar 18 08:53:18 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 18 Mar 2020 08:53:18 GMT Subject: RFR: 317: git-webrev uses wrong JBS links for commit messages In-Reply-To: References: Message-ID: On Wed, 18 Mar 2020 08:12:31 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that ensures that `git-webrev` use the correct > JBS project issue id:s in commit messages. > > Testing: > - Manual testing of `git-webrev` on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/514 From ehelin at openjdk.java.net Wed Mar 18 09:26:10 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 18 Mar 2020 09:26:10 GMT Subject: RFR: 315: Publish command is not in GitSkara.java Message-ID: <8Yqk6uUD3nX8PR9J7dabnLX0-Z7wkJ-_4Xct-TixJs4=.f952cb40-2a14-4c14-9f6a-da3ed5adade6@github.com> Hi all, please review this small patch that adds the `publish` command to `GitSkara.java` so that `git skara publish` works. Thanks, Erik ------------- Commit messages: - skara-315 Changes: https://git.openjdk.java.net/skara/pull/515/files Webrev: https://webrevs.openjdk.java.net/skara/515/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-315 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/515.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/515/head:pull/515 PR: https://git.openjdk.java.net/skara/pull/515 From ehelin at openjdk.java.net Wed Mar 18 09:26:38 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 18 Mar 2020 09:26:38 GMT Subject: RFR: 292: Add comment to PR when it becomes outdated In-Reply-To: <8KYTzQblqh8EbszlhgE6tV94frn95vRfsylU87i8M7o=.bc59cf35-41d5-4445-9c55-142803f58c5c@github.com> References: <8KYTzQblqh8EbszlhgE6tV94frn95vRfsylU87i8M7o=.bc59cf35-41d5-4445-9c55-142803f58c5c@github.com> Message-ID: On Tue, 17 Mar 2020 15:42:52 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that posts an instructional message on how to sync with the target branch the first time a PR > is marked as outdated. > Best regards, > Robin Looks good, just a small nit regarding the comment! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 545: > 544: "`" + pr.targetRef() + "` due to one or more merge conflicts. To resolve these merge conflicts " + > 545: "and update this pull request you can run the following commands:\n" + > 546: "```bash\n" + Suggestion: "and update this pull request you can run the following commands in the local repository for your personal fork:\n" + ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/513 From ehelin at openjdk.java.net Wed Mar 18 09:23:00 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 18 Mar 2020 09:23:00 GMT Subject: [Integrated] RFR: 317: git-webrev uses wrong JBS links for commit messages In-Reply-To: References: Message-ID: <07fa4820-4a99-467c-bb26-49569419f6a7@openjdk.org> Changeset: c0abd82e Author: Erik Helin Date: 2020-03-18 09:22:46 +0000 URL: https://git.openjdk.java.net/skara/commit/c0abd82e 317: git-webrev uses wrong JBS links for commit messages Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java From rwestberg at openjdk.java.net Wed Mar 18 09:50:00 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 18 Mar 2020 09:50:00 GMT Subject: [Integrated] RFR: 292: Add comment to PR when it becomes outdated In-Reply-To: <8KYTzQblqh8EbszlhgE6tV94frn95vRfsylU87i8M7o=.bc59cf35-41d5-4445-9c55-142803f58c5c@github.com> References: <8KYTzQblqh8EbszlhgE6tV94frn95vRfsylU87i8M7o=.bc59cf35-41d5-4445-9c55-142803f58c5c@github.com> Message-ID: <5d92317d-6cee-4853-9abb-217fcad65fe7@openjdk.org> Changeset: 4b7b9697 Author: Robin Westberg Date: 2020-03-18 09:49:47 +0000 URL: https://git.openjdk.java.net/skara/commit/4b7b9697 292: Add comment to PR when it becomes outdated Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java From rwestberg at openjdk.java.net Wed Mar 18 09:54:53 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 18 Mar 2020 09:54:53 GMT Subject: [Rev 01] RFR: 292: Add comment to PR when it becomes outdated In-Reply-To: <8KYTzQblqh8EbszlhgE6tV94frn95vRfsylU87i8M7o=.bc59cf35-41d5-4445-9c55-142803f58c5c@github.com> References: <8KYTzQblqh8EbszlhgE6tV94frn95vRfsylU87i8M7o=.bc59cf35-41d5-4445-9c55-142803f58c5c@github.com> Message-ID: <8GYKMbJRMea2q9_d3nfcb-zyfs5GLoMWf7_TQB995zw=.f2e7e8b0-bab1-4f92-8ebc-a15b80eaaac6@github.com> > Hi all, > > Please review this change that posts an instructional message on how to sync with the target branch the first time a PR > is marked as outdated. > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java Co-Authored-By: Erik Duveblad ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/513/files - new: https://git.openjdk.java.net/skara/pull/513/files/0a148746..ed16b404 Webrevs: - full: https://webrevs.openjdk.java.net/skara/513/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/513/webrev.00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/513.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/513/head:pull/513 PR: https://git.openjdk.java.net/skara/pull/513 From rwestberg at openjdk.java.net Wed Mar 18 09:54:54 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 18 Mar 2020 09:54:54 GMT Subject: [Rev 01] RFR: 292: Add comment to PR when it becomes outdated In-Reply-To: References: <8KYTzQblqh8EbszlhgE6tV94frn95vRfsylU87i8M7o=.bc59cf35-41d5-4445-9c55-142803f58c5c@github.com> Message-ID: On Wed, 18 Mar 2020 09:23:39 GMT, Erik Helin wrote: >> Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: >> >> Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java >> >> Co-Authored-By: Erik Duveblad > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 545: > >> 544: "`" + pr.targetRef() + "` due to one or more merge conflicts. To resolve these merge conflicts " + >> 545: "and update this pull request you can run the following commands:\n" + >> 546: "```bash\n" + > > Suggestion: > > "and update this pull request you can run the following commands in the local repository for your personal fork:\n" + Sounds good, will apply. ------------- PR: https://git.openjdk.java.net/skara/pull/513 From ehelin at openjdk.java.net Wed Mar 18 09:55:36 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 18 Mar 2020 09:55:36 GMT Subject: RFR: 319: git-info uses wrong JBS project Message-ID: Hi all, please review this patch that ensures that `git pr` reads the .jcheck/conf from the given revision, *not* from `master`. Testing: - Manual testing of `git-info` on Linux x64 Thanks, Erik ------------- Commit messages: - skara-319 Changes: https://git.openjdk.java.net/skara/pull/516/files Webrev: https://webrevs.openjdk.java.net/skara/516/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-319 Stats: 4 lines in 1 file changed: 0 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/516.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/516/head:pull/516 PR: https://git.openjdk.java.net/skara/pull/516 From rwestberg at openjdk.java.net Wed Mar 18 09:58:58 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 18 Mar 2020 09:58:58 GMT Subject: RFR: 319: git-info uses wrong JBS project In-Reply-To: References: Message-ID: On Wed, 18 Mar 2020 09:51:43 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that `git pr` reads the .jcheck/conf from > the given revision, *not* from `master`. > > Testing: > - Manual testing of `git-info` on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/516 From ehelin at openjdk.java.net Wed Mar 18 10:02:21 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 18 Mar 2020 10:02:21 GMT Subject: [Integrated] RFR: 319: git-info uses wrong JBS project In-Reply-To: References: Message-ID: <1faf5dc6-6d80-4ed4-a3b2-7c13907550ad@openjdk.org> Changeset: 6c1dd666 Author: Erik Helin Date: 2020-03-18 10:02:08 +0000 URL: https://git.openjdk.java.net/skara/commit/6c1dd666 319: git-info uses wrong JBS project Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitInfo.java From ehelin at openjdk.java.net Wed Mar 18 10:03:49 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 18 Mar 2020 10:03:49 GMT Subject: [Rev 01] RFR: 276: Merge style PRs should generate "merge" webrevs In-Reply-To: References: Message-ID: On Tue, 17 Mar 2020 14:44:48 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that for merge style PRs generate webrevs only containing the changes done in the merge >> commit. >> Note that this is only a partial implementation, such webrevs should also be generated if there are further commits >> pushed to the PR. >> Best regards, >> Robin > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Generate actual merge-only webrevs Looks good! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveItem.java line 50: > 49: } > 50: return mergeCommit; > 51: } catch (IOException e) { Suggestion: return localRepo.lookup(head).filter(c -> c.isMerge()); ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/501 From rwestberg at openjdk.java.net Wed Mar 18 10:04:48 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 18 Mar 2020 10:04:48 GMT Subject: RFR: 315: Publish command is not in GitSkara.java In-Reply-To: <8Yqk6uUD3nX8PR9J7dabnLX0-Z7wkJ-_4Xct-TixJs4=.f952cb40-2a14-4c14-9f6a-da3ed5adade6@github.com> References: <8Yqk6uUD3nX8PR9J7dabnLX0-Z7wkJ-_4Xct-TixJs4=.f952cb40-2a14-4c14-9f6a-da3ed5adade6@github.com> Message-ID: On Wed, 18 Mar 2020 09:22:07 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds the `publish` command to > `GitSkara.java` so that `git skara publish` works. > > Thanks, > Erik Marked as reviewed by rwestberg (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/515 From ehelin at openjdk.java.net Wed Mar 18 10:04:50 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 18 Mar 2020 10:04:50 GMT Subject: [Integrated] RFR: 315: Publish command is not in GitSkara.java In-Reply-To: <8Yqk6uUD3nX8PR9J7dabnLX0-Z7wkJ-_4Xct-TixJs4=.f952cb40-2a14-4c14-9f6a-da3ed5adade6@github.com> References: <8Yqk6uUD3nX8PR9J7dabnLX0-Z7wkJ-_4Xct-TixJs4=.f952cb40-2a14-4c14-9f6a-da3ed5adade6@github.com> Message-ID: Changeset: b1807540 Author: Erik Helin Date: 2020-03-18 10:04:35 +0000 URL: https://git.openjdk.java.net/skara/commit/b1807540 315: Publish command is not in GitSkara.java Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitSkara.java From rwestberg at openjdk.java.net Wed Mar 18 10:14:41 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 18 Mar 2020 10:14:41 GMT Subject: [Rev 02] RFR: 276: Merge style PRs should generate "merge" webrevs In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that for merge style PRs generate webrevs only containing the changes done in the merge > commit. > Note that this is only a partial implementation, such webrevs should also be generated if there are further commits > pushed to the PR. > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Neater filter expression to find the merge commit. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/501/files - new: https://git.openjdk.java.net/skara/pull/501/files/7c657eee..48c899eb Webrevs: - full: https://webrevs.openjdk.java.net/skara/501/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/501/webrev.01-02 Stats: 8 lines in 1 file changed: 0 ins; 7 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/501.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/501/head:pull/501 PR: https://git.openjdk.java.net/skara/pull/501 From rwestberg at openjdk.java.net Wed Mar 18 11:42:10 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 18 Mar 2020 11:42:10 GMT Subject: [Integrated] RFR: 276: Merge style PRs should generate "merge" webrevs In-Reply-To: References: Message-ID: Changeset: d45b8161 Author: Robin Westberg Date: 2020-03-18 11:41:56 +0000 URL: https://git.openjdk.java.net/skara/commit/d45b8161 276: Merge style PRs should generate "merge" webrevs Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveMessages.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java + bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevDescription.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevNotification.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/WebrevStorageTests.java ! webrev/src/main/java/org/openjdk/skara/webrev/Webrev.java From ehelin at openjdk.java.net Wed Mar 18 15:25:56 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 18 Mar 2020 15:25:56 GMT Subject: RFR: 316: git-webrev does not work without origin remote Message-ID: <2lDbKIak2cILYOwXX6ZANbxHwx55n3xCUgtqCzJMmOk=.dc314906-658e-458e-9ac5-d8799f11016c@github.com> Hi all, please review this patch that updates `git-webrev` to work with repositories with slightly more unusual configurations by default. `git-webrev` will now by default work with many more repositories that for example have multiple remotes, repositories missing a remote named "origin", etc. For the most complicated scenarios the user can now also specify `--remote` to pick the remote that should be used for calculating outgoing changes. Testing: - Manual testing of `git-webrev` on Linux x64 with some more exotic repository configurations Thanks, Erik ------------- Commit messages: - skara-316 Changes: https://git.openjdk.java.net/skara/pull/517/files Webrev: https://webrevs.openjdk.java.net/skara/517/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-316 Stats: 48 lines in 1 file changed: 43 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/517.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/517/head:pull/517 PR: https://git.openjdk.java.net/skara/pull/517 From erik.helin at oracle.com Wed Mar 18 16:13:38 2020 From: erik.helin at oracle.com (Erik Helin) Date: Wed, 18 Mar 2020 17:13:38 +0100 Subject: git webrev fails with an IOException if remote isn't named "origin" In-Reply-To: References: Message-ID: <16e57c0d-54e3-b7f6-6557-73501a51a72a@oracle.com> Thanks for the bug report Jaikiran! I created a patch for the problem, please see: https://github.com/openjdk/skara/pull/517 I think the above patch should solve the issues you are experiencing. If you ever run to such issues again, then a workaround is also to manually specify a revision to compare against with --rev. Thanks, Erik On 3/15/20 1:21 PM, Jaikiran Pai wrote: > I just started using skara CLI, specifically git webrev, to try out > webrev generation for the JDK project against the github hosted jdk > repo. I followed the skara installation guide[1] to set it up locally. > > I then ran the following command against my local checkout of the jdk repo: > > git webrev > > This consistently fails with the following exception: > > Exception in thread "main" java.io.IOException: Unexpected exit code: 128 > ??? at > org.openjdk.skara.vcs/org.openjdk.skara.vcs.git.GitRepository.await(GitRepository.java:103) > ??? at > org.openjdk.skara.vcs/org.openjdk.skara.vcs.git.GitRepository.commitMetadata(GitRepository.java:233) > ??? at > org.openjdk.skara.vcs/org.openjdk.skara.vcs.git.GitRepository.commitMetadata(GitRepository.java:269) > ??? at > org.openjdk.skara.cli/org.openjdk.skara.cli.GitWebrev.generate(GitWebrev.java:214) > ??? at > org.openjdk.skara.args/org.openjdk.skara.args.Command.main(Command.java:54) > ??? at > org.openjdk.skara.args/org.openjdk.skara.args.MultiCommandParser.lambda$parse$2(MultiCommandParser.java:64) > ??? at > org.openjdk.skara.cli/org.openjdk.skara.cli.GitWebrev.main(GitWebrev.java:360) > ??? at > org.openjdk.skara.cli/org.openjdk.skara.cli.GitSkara.main(GitSkara.java:127) > > > Looking into the code of git webrev, hosted in the skara repo and then > manually running the command that it runs, I was able to narrow down > what was causing this issue. It looks like (internally) the skara code > issues: > > git rev-list --no-color --no-abbrev origin..HEAD --reverse > > (I've not included the --format option, for the sake of simplicity) > > Running this above command manually on my setup returns the following error: > > fatal: ambiguous argument 'origin..HEAD': unknown revision or path not > in the working tree. > Use '--' to separate paths from revisions, like this: > 'git [...] -- [...]' > > and then checking the exit code of that process: > > echo $? > > shows: > > 128 > > So this is the same error the git webrev command is running into. > > The root cause appears to be the fact that I've (intentionally) renamed > the logical name of my remote repo to "upstream" and I don't really have > anything called "origin" as my remote repo. Here's the output of: > > git remote -v > > upstream??? https://github.com/openjdk/jdk.git (fetch) > upstream??? https://github.com/openjdk/jdk.git (push) > > So it looks like the skara CLI code assumes/expects the remote to be > always named "origin". > > Is there a better way to report this error? > > Furthermore, I see the git webrev command can optionally be passed: > > --upstream URL?? The URL to the upstream repository > > Can the tool be enhanced to optionally take a remote name (like > "upstream" in my case) instead of a URL, thus making it easier to > remember and pass that value instead of passing hard to remember URLs? > > [1] https://wiki.openjdk.java.net/display/SKARA/CLI+Tools > > -Jaikiran > > From jai.forums2013 at gmail.com Thu Mar 19 02:50:02 2020 From: jai.forums2013 at gmail.com (Jaikiran Pai) Date: Thu, 19 Mar 2020 08:20:02 +0530 Subject: git webrev fails with an IOException if remote isn't named "origin" In-Reply-To: <16e57c0d-54e3-b7f6-6557-73501a51a72a@oracle.com> References: <16e57c0d-54e3-b7f6-6557-73501a51a72a@oracle.com> Message-ID: <97fef455-c7a7-82a4-34c5-d9937d95db2a@gmail.com> Hello Erik, Thank you for that fix. I just pulled that PR locally and included it in my local skara repo and built it afresh. I then ran it against my local jdk repo without any remote named "origin". This time it all went fine and the webrev was generated without issues. -Jaikiran On 18/03/20 9:43 pm, Erik Helin wrote: > Thanks for the bug report Jaikiran! > > I created a patch for the problem, please see: > > ??? https://github.com/openjdk/skara/pull/517 > > I think the above patch should solve the issues you are experiencing. > If you ever run to such issues again, then a workaround is also to > manually specify a revision to compare against with --rev. > > Thanks, > Erik > > On 3/15/20 1:21 PM, Jaikiran Pai wrote: >> I just started using skara CLI, specifically git webrev, to try out >> webrev generation for the JDK project against the github hosted jdk >> repo. I followed the skara installation guide[1] to set it up locally. >> >> I then ran the following command against my local checkout of the jdk >> repo: >> >> git webrev >> >> This consistently fails with the following exception: >> >> Exception in thread "main" java.io.IOException: Unexpected exit code: >> 128 >> ???? at >> org.openjdk.skara.vcs/org.openjdk.skara.vcs.git.GitRepository.await(GitRepository.java:103) >> >> ???? at >> org.openjdk.skara.vcs/org.openjdk.skara.vcs.git.GitRepository.commitMetadata(GitRepository.java:233) >> >> ???? at >> org.openjdk.skara.vcs/org.openjdk.skara.vcs.git.GitRepository.commitMetadata(GitRepository.java:269) >> >> ???? at >> org.openjdk.skara.cli/org.openjdk.skara.cli.GitWebrev.generate(GitWebrev.java:214) >> >> ???? at >> org.openjdk.skara.args/org.openjdk.skara.args.Command.main(Command.java:54) >> >> ???? at >> org.openjdk.skara.args/org.openjdk.skara.args.MultiCommandParser.lambda$parse$2(MultiCommandParser.java:64) >> >> ???? at >> org.openjdk.skara.cli/org.openjdk.skara.cli.GitWebrev.main(GitWebrev.java:360) >> >> ???? at >> org.openjdk.skara.cli/org.openjdk.skara.cli.GitSkara.main(GitSkara.java:127) >> >> >> >> Looking into the code of git webrev, hosted in the skara repo and then >> manually running the command that it runs, I was able to narrow down >> what was causing this issue. It looks like (internally) the skara code >> issues: >> >> git rev-list --no-color --no-abbrev origin..HEAD --reverse >> >> (I've not included the --format option, for the sake of simplicity) >> >> Running this above command manually on my setup returns the following >> error: >> >> fatal: ambiguous argument 'origin..HEAD': unknown revision or path not >> in the working tree. >> Use '--' to separate paths from revisions, like this: >> 'git [...] -- [...]' >> >> and then checking the exit code of that process: >> >> echo $? >> >> shows: >> >> 128 >> >> So this is the same error the git webrev command is running into. >> >> The root cause appears to be the fact that I've (intentionally) renamed >> the logical name of my remote repo to "upstream" and I don't really have >> anything called "origin" as my remote repo. Here's the output of: >> >> git remote -v >> >> upstream??? https://github.com/openjdk/jdk.git (fetch) >> upstream??? https://github.com/openjdk/jdk.git (push) >> >> So it looks like the skara CLI code assumes/expects the remote to be >> always named "origin". >> >> Is there a better way to report this error? >> >> Furthermore, I see the git webrev command can optionally be passed: >> >> --upstream URL?? The URL to the upstream repository >> >> Can the tool be enhanced to optionally take a remote name (like >> "upstream" in my case) instead of a URL, thus making it easier to >> remember and pass that value instead of passing hard to remember URLs? >> >> [1] https://wiki.openjdk.java.net/display/SKARA/CLI+Tools >> >> -Jaikiran >> >> > From jai.forums2013 at gmail.com Thu Mar 19 02:56:15 2020 From: jai.forums2013 at gmail.com (Jaikiran Pai) Date: Thu, 19 Mar 2020 08:26:15 +0530 Subject: git webrev is extremely silent Message-ID: <7caec1e0-1f95-30f4-6d32-e4a3ef4be757@gmail.com> I have just started using the skara CLI tools to generate patches for the jdk repositories. I am used to using the (original) webrev. When using the original webrev, you see a bunch of "activity" that gets logged on the screen and it finally writes out the patch where the webrev changeset is generated. However, when I run the "git webrev" command (sometimes with additional options), it just silently returns. The first few times I tried it, I thought it wasn't really working. It's only when I looked for directory listing of potential places, where it might have generated the webrevs, did I realize that the webrev was being generated successfully and it's just that the git webrev command it way too silent and doesn't generate any messages. Adding a final summary, after the command executes successfully, including the location where the webrev was generated would help, IMO. Would this be considered a reasonable enhancement? -Jaikiran From rwestberg at openjdk.java.net Thu Mar 19 05:27:48 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 19 Mar 2020 05:27:48 GMT Subject: RFR: 316: git-webrev does not work without origin remote In-Reply-To: <2lDbKIak2cILYOwXX6ZANbxHwx55n3xCUgtqCzJMmOk=.dc314906-658e-458e-9ac5-d8799f11016c@github.com> References: <2lDbKIak2cILYOwXX6ZANbxHwx55n3xCUgtqCzJMmOk=.dc314906-658e-458e-9ac5-d8799f11016c@github.com> Message-ID: On Wed, 18 Mar 2020 15:21:59 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates `git-webrev` to work with repositories > with slightly more unusual configurations by default. `git-webrev` will now by > default work with many more repositories that for example have multiple remotes, > repositories missing a remote named "origin", etc. For the most complicated > scenarios the user can now also specify `--remote` to pick the remote that > should be used for calculating outgoing changes. > > Testing: > - Manual testing of `git-webrev` on Linux x64 with some more exotic repository > configurations > > Thanks, > Erik Looks good, just one question. cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java line 166: > 165: var cwd = Paths.get("").toAbsolutePath(); > 166: var repository = Repository.get(cwd); > 167: if (!repository.isPresent()) { What non-read-only method did you need? Can't spot it. :) ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/517 From rwestberg at openjdk.java.net Thu Mar 19 07:42:47 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 19 Mar 2020 07:42:47 GMT Subject: RFR: 304: Squash additional commits into merge commits for merge PRs Message-ID: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> Hi all, Please review this change that squashes additional commits made on top of the first merge commit, to allow updating the PR. Best regards, Robin ------------- Commit messages: - Initial implementation Changes: https://git.openjdk.java.net/skara/pull/519/files Webrev: https://webrevs.openjdk.java.net/skara/519/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-304 Stats: 128 lines in 3 files changed: 123 ins; 1 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/519.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/519/head:pull/519 PR: https://git.openjdk.java.net/skara/pull/519 From ehelin at openjdk.java.net Thu Mar 19 07:46:52 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 07:46:52 GMT Subject: RFR: 320: Add "git skara version" command Message-ID: Hi all, please review this patch that adds a `git skara version` command. I also took the opportunity to clean up `git skara help` a bit. Testing: - Manual testing on Linux x64 Thanks, Erik ------------- Commit messages: - skara-320 Changes: https://git.openjdk.java.net/skara/pull/520/files Webrev: https://webrevs.openjdk.java.net/skara/520/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-320 Stats: 24 lines in 1 file changed: 16 ins; 4 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/520.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/520/head:pull/520 PR: https://git.openjdk.java.net/skara/pull/520 From ehelin at openjdk.java.net Thu Mar 19 08:41:29 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 08:41:29 GMT Subject: RFR: 304: Squash additional commits into merge commits for merge PRs In-Reply-To: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> References: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> Message-ID: <5bw-O22hwOIdPvRev67hLaMvakSAhFUMxGkcp0-FTwA=.e7de613d-47ff-4ef1-80f5-a4ff319d6719@github.com> On Thu, 19 Mar 2020 07:39:11 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that squashes additional commits made on top of the first merge commit, to allow updating the > PR. > Best regards, > Robin Looks good in general, just a few inline comments! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 174: > 173: } > 174: if (mergeCommitIndex >= commits.size() - 1) { > 175: ret.add("A Merge PR must contain a merge commit."); What if you do a "Merge PR" with a single trivial merge just to merge to branches (that have identical commits). Too narrow of a use case to think about? bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 175: > 174: if (mergeCommitIndex >= commits.size() - 1) { > 175: ret.add("A Merge PR must contain a merge commit."); > 176: } Related to my previous comment, should the message be "A Merge PR must contain at least one merge commit and one non-merge commit"? bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java line 153: > 152: > 153: localRepo.checkout(commits.get(mergeCommitIndex).hash(), true); > 154: localRepo.squash(headHash); Check that `mergeCommitIndex < commits.size()` before and otherwise throw an exception? ------------- PR: https://git.openjdk.java.net/skara/pull/519 From ehelin at openjdk.java.net Thu Mar 19 08:32:50 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 08:32:50 GMT Subject: [Integrated] RFR: 316: git-webrev does not work without origin remote In-Reply-To: <2lDbKIak2cILYOwXX6ZANbxHwx55n3xCUgtqCzJMmOk=.dc314906-658e-458e-9ac5-d8799f11016c@github.com> References: <2lDbKIak2cILYOwXX6ZANbxHwx55n3xCUgtqCzJMmOk=.dc314906-658e-458e-9ac5-d8799f11016c@github.com> Message-ID: <12ee7b32-6538-4ea9-a4ac-69b475c4f186@openjdk.org> Changeset: 42caec11 Author: Erik Helin Date: 2020-03-19 08:32:35 +0000 URL: https://git.openjdk.java.net/skara/commit/42caec11 316: git-webrev does not work without origin remote Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java From ehelin at openjdk.java.net Thu Mar 19 08:34:19 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 08:34:19 GMT Subject: RFR: 316: git-webrev does not work without origin remote In-Reply-To: References: <2lDbKIak2cILYOwXX6ZANbxHwx55n3xCUgtqCzJMmOk=.dc314906-658e-458e-9ac5-d8799f11016c@github.com> Message-ID: On Thu, 19 Mar 2020 05:25:20 GMT, Robin Westberg wrote: >> Hi all, >> >> please review this patch that updates `git-webrev` to work with repositories >> with slightly more unusual configurations by default. `git-webrev` will now by >> default work with many more repositories that for example have multiple remotes, >> repositories missing a remote named "origin", etc. For the most complicated >> scenarios the user can now also specify `--remote` to pick the remote that >> should be used for calculating outgoing changes. >> >> Testing: >> - Manual testing of `git-webrev` on Linux x64 with some more exotic repository >> configurations >> >> Thanks, >> Erik > > cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java line 166: > >> 165: var cwd = Paths.get("").toAbsolutePath(); >> 166: var repository = Repository.get(cwd); >> 167: if (!repository.isPresent()) { > > What non-read-only method did you need? Can't spot it. :) To figure out the outgoing commits I need to find the closest merge-base with regards to all upstream branches. Since it is not certain that all upstream branches exists locally, I need to fetch the upstream branch to `FETCH_HEAD`. This is not a destructive operation for the local repository, it only mutates `FETCH_HEAD` which you shouldn't rely on anyhow staying the same. The `fetch` method is only available on `Repository`, so I had to use `Repository` instead of `ReadOnlyRepository`. ------------- PR: https://git.openjdk.java.net/skara/pull/517 From rwestberg at openjdk.java.net Thu Mar 19 09:10:28 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 19 Mar 2020 09:10:28 GMT Subject: RFR: 320: Add "git skara version" command In-Reply-To: References: Message-ID: <7Jq-WGHYFJtIbs618iVK8Hl9d8S-hd5LQTBe1p8Kqs4=.574b8726-c93d-4bc3-9ec4-19ab95bb7882@github.com> On Thu, 19 Mar 2020 07:42:45 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a `git skara version` command. I also took > the opportunity to clean up `git skara help` a bit. > > Testing: > - Manual testing on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/520 From rwestberg at openjdk.java.net Thu Mar 19 10:07:00 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 19 Mar 2020 10:07:00 GMT Subject: RFR: 304: Squash additional commits into merge commits for merge PRs In-Reply-To: <5bw-O22hwOIdPvRev67hLaMvakSAhFUMxGkcp0-FTwA=.e7de613d-47ff-4ef1-80f5-a4ff319d6719@github.com> References: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> <5bw-O22hwOIdPvRev67hLaMvakSAhFUMxGkcp0-FTwA=.e7de613d-47ff-4ef1-80f5-a4ff319d6719@github.com> Message-ID: On Thu, 19 Mar 2020 08:34:49 GMT, Erik Helin wrote: >> Hi all, >> >> Please review this change that squashes additional commits made on top of the first merge commit, to allow updating the >> PR. >> Best regards, >> Robin > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 174: > >> 173: } >> 174: if (mergeCommitIndex >= commits.size() - 1) { >> 175: ret.add("A Merge PR must contain a merge commit."); > > What if you do a "Merge PR" with a single trivial merge just to merge to branches (that have identical commits). Too > narrow of a use case to think about? Not sure if that is something we would need to support, not even sure how to create such a merge commit. :) > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 175: > >> 174: if (mergeCommitIndex >= commits.size() - 1) { >> 175: ret.add("A Merge PR must contain a merge commit."); >> 176: } > > Related to my previous comment, should the message be "A Merge PR must contain at least one merge commit and one > non-merge commit"? Sure, can update that. > bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java line 153: > >> 152: >> 153: localRepo.checkout(commits.get(mergeCommitIndex).hash(), true); >> 154: localRepo.squash(headHash); > > Check that `mergeCommitIndex < commits.size()` before and otherwise throw an exception? That should never happen (tm), the actual merge depends on jcheck passing first so we can assume that the PR is well-formed. ------------- PR: https://git.openjdk.java.net/skara/pull/519 From rwestberg at openjdk.java.net Thu Mar 19 10:11:48 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 19 Mar 2020 10:11:48 GMT Subject: [Rev 01] RFR: 304: Squash additional commits into merge commits for merge PRs In-Reply-To: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> References: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> Message-ID: > Hi all, > > Please review this change that squashes additional commits made on top of the first merge commit, to allow updating the > PR. > Best regards, > Robin Robin Westberg has updated the pull request incrementally with two additional commits since the last revision: - Fix failing tests - Update error message ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/519/files - new: https://git.openjdk.java.net/skara/pull/519/files/2499c3a8..978e08f7 Webrevs: - full: https://webrevs.openjdk.java.net/skara/519/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/519/webrev.00-01 Stats: 7 lines in 2 files changed: 0 ins; 5 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/519.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/519/head:pull/519 PR: https://git.openjdk.java.net/skara/pull/519 From ehelin at openjdk.java.net Thu Mar 19 13:35:22 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 13:35:22 GMT Subject: RFR: 314: Add help command to git-pr Message-ID: Hi all, please review this patch that enhances the default `help` command for `git pr` by quite a bit. `git pr` will now be default list the usage and flags for all available sub-commands. A user can now also run `git pr help `, e.g. `git pr help set`: $ git pr help set - set Usage: git pr set [] Flags: -u, --username NAME Username on host -r, --remote NAME Name of remote, defaults to 'origin' --assignees LIST Comma separated list of assignees --title MESSAGE The title of the pull request --open Set the pull request's state to open --closed Set the pull request's state to closed --body Set the body of the pull request --no-draft Mark the pull request as not draft --verbose Turn on verbose output --debug Turn on debugging output --version Print the version of this tool Testing: - Manual testing of `git pr` on Linux x64 Thanks, Erik ------------- Commit messages: - skara-314 Changes: https://git.openjdk.java.net/skara/pull/521/files Webrev: https://webrevs.openjdk.java.net/skara/521/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-314 Stats: 896 lines in 18 files changed: 282 ins; 111 del; 503 mod Patch: https://git.openjdk.java.net/skara/pull/521.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/521/head:pull/521 PR: https://git.openjdk.java.net/skara/pull/521 From ehelin at openjdk.java.net Thu Mar 19 13:37:01 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 13:37:01 GMT Subject: [Integrated] RFR: 320: Add "git skara version" command In-Reply-To: References: Message-ID: <4b88ae2a-b9fb-4bb7-aa28-483e963de7fe@openjdk.org> Changeset: 19f319e7 Author: Erik Helin Date: 2020-03-19 13:36:47 +0000 URL: https://git.openjdk.java.net/skara/commit/19f319e7 320: Add "git skara version" command Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitSkara.java From ehelin at openjdk.java.net Thu Mar 19 13:39:58 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 13:39:58 GMT Subject: [Rev 01] RFR: 314: Add help command to git-pr In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that enhances the default `help` command for `git pr` > by quite a bit. `git pr` will now be default list the usage and flags for all > available sub-commands. A user can now also run `git pr help `, > e.g. `git pr help set`: > > $ git pr help set > Usage: git pr set [] > Flags: > -u, --username NAME Username on host > -r, --remote NAME Name of remote, defaults to 'origin' > --assignees LIST Comma separated list of assignees > --title MESSAGE The title of the pull request > --open Set the pull request's state to open > --closed Set the pull request's state to closed > --body Set the body of the pull request > --no-draft Mark the pull request as not draft > --verbose Turn on verbose output > --debug Turn on debugging output > --version Print the version of this tool > > Testing: > - Manual testing of `git pr` on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Better formatting ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/521/files - new: https://git.openjdk.java.net/skara/pull/521/files/038c21f9..ce0731df Webrevs: - full: https://webrevs.openjdk.java.net/skara/521/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/521/webrev.00-01 Stats: 8 lines in 1 file changed: 1 ins; 1 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/521.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/521/head:pull/521 PR: https://git.openjdk.java.net/skara/pull/521 From ehelin at openjdk.java.net Thu Mar 19 13:40:49 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 13:40:49 GMT Subject: [Rev 01] RFR: 304: Squash additional commits into merge commits for merge PRs In-Reply-To: References: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> <5bw-O22hwOIdPvRev67hLaMvakSAhFUMxGkcp0-FTwA=.e7de613d-47ff-4ef1-80f5-a4ff319d6719@github.com> Message-ID: On Thu, 19 Mar 2020 10:03:45 GMT, Robin Westberg wrote: >> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 174: >> >>> 173: } >>> 174: if (mergeCommitIndex >= commits.size() - 1) { >>> 175: ret.add("A Merge PR must contain a merge commit."); >> >> What if you do a "Merge PR" with a single trivial merge just to merge to branches (that have identical commits). Too >> narrow of a use case to think about? > > Not sure if that is something we would need to support, not even sure how to create such a merge commit. :) Ok, then forget about this comment ?? >> bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java line 153: >> >>> 152: >>> 153: localRepo.checkout(commits.get(mergeCommitIndex).hash(), true); >>> 154: localRepo.squash(headHash); >> >> Check that `mergeCommitIndex < commits.size()` before and otherwise throw an exception? > > That should never happen (tm), the actual merge depends on jcheck passing first so we can assume that the PR is > well-formed. Ok, sounds good! ------------- PR: https://git.openjdk.java.net/skara/pull/519 From ehelin at openjdk.java.net Thu Mar 19 13:40:48 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 13:40:48 GMT Subject: [Rev 01] RFR: 304: Squash additional commits into merge commits for merge PRs In-Reply-To: References: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> Message-ID: On Thu, 19 Mar 2020 10:11:48 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that squashes additional commits made on top of the first merge commit, to allow updating the >> PR. >> Best regards, >> Robin > > Robin Westberg has updated the pull request incrementally with two additional commits since the last revision: > > - Fix failing tests > - Update error message Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/519 From rwestberg at openjdk.java.net Thu Mar 19 14:17:09 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 19 Mar 2020 14:17:09 GMT Subject: [Rev 01] RFR: 314: Add help command to git-pr In-Reply-To: References: Message-ID: <1GvudFhViODm_t0rYmC2y9imjfAyofo5dA32myCWzEw=.f6efa8a0-fca9-4862-b225-168b831a905e@github.com> On Thu, 19 Mar 2020 13:39:58 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that enhances the default `help` command for `git pr` >> by quite a bit. `git pr` will now be default list the usage and flags for all >> available sub-commands. A user can now also run `git pr help `, >> e.g. `git pr help set`: >> >> $ git pr help set >> Usage: git pr set [] >> Flags: >> -u, --username NAME Username on host >> -r, --remote NAME Name of remote, defaults to 'origin' >> --assignees LIST Comma separated list of assignees >> --title MESSAGE The title of the pull request >> --open Set the pull request's state to open >> --closed Set the pull request's state to closed >> --body Set the body of the pull request >> --no-draft Mark the pull request as not draft >> --verbose Turn on verbose output >> --debug Turn on debugging output >> --version Print the version of this tool >> >> Testing: >> - Manual testing of `git pr` on Linux x64 >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > Better formatting Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/521 From ehelin at openjdk.java.net Thu Mar 19 15:08:20 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 15:08:20 GMT Subject: [Integrated] RFR: 314: Add help command to git-pr In-Reply-To: References: Message-ID: <5f4b4635-2624-4266-a36a-2b7bbaffc6ae@openjdk.org> Changeset: ac71433a Author: Erik Helin Date: 2020-03-19 15:08:06 +0000 URL: https://git.openjdk.java.net/skara/commit/ac71433a 314: Add help command to git-pr Reviewed-by: rwestberg ! args/src/main/java/org/openjdk/skara/args/ArgumentParser.java ! args/src/main/java/org/openjdk/skara/args/Flag.java ! args/src/main/java/org/openjdk/skara/args/MultiCommandParser.java ! cli/src/main/java/org/openjdk/skara/cli/GitPr.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrApply.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrApprove.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrCheckout.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrClose.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrCreate.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrFetch.java + cli/src/main/java/org/openjdk/skara/cli/pr/GitPrHelp.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrInfo.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrIntegrate.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrList.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrSet.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrShow.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrSponsor.java ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrTest.java From iignatyev at openjdk.java.net Thu Mar 19 23:53:23 2020 From: iignatyev at openjdk.java.net (Igor Ignatyev) Date: Thu, 19 Mar 2020 23:53:23 GMT Subject: RFR: WIP/RFC: added ProblemLists check to jcheck Message-ID: Hi all, This is more of a request for comments than an actual PR. The idea behind the patch is to ensure that whenever someone fixes a bug, its ID is not used in any of the problem lists. As some of you might know this is not a hypothetical issue, people forget to clean problem lists quite often, which in some cases results in poorly tested patches. Although it's true that even if we ensure that all commits are correct, there still will be ways to have "fixed" bugs in problem lists, e.g. closing as WNF, duplicate, etc, it's nevertheless believed that the majority (or the most annoying) "violations" are caused by commits. The proposed check parses all problem lists specified by `dirs` (bar-separated list of test suites) and `pattern` (regexp pattern for files withing the `dirs`) and verifies that none of the issues fixed by a patch is listed in any of problem lists. The original / python-time [patch](http://cr.openjdk.java.net/~iignatyev//jcheck/problem-list/webrev.00/index.html) used a list glob-pattern, but unfortunately, Java SE doesn't have a good(fast) API to find all files matching a glob, and I didn't want to bring 3rd party dependency just for this use-case. Thanks, -- Igor ------------- Commit messages: - added tests for ProblemListsCheck - cleaned up imports - ProblemListsIssue should use set to store information about files - refiened default pattern in ProblemListsConfiguration - updated ProblemListsCheck to list files in a dir via ReadOnlyRepository - updated ProblemListsCheck to read files' content via ReadOnlyRepository - added ProblemLists check to jcheck Changes: https://git.openjdk.java.net/skara/pull/518/files Webrev: https://webrevs.openjdk.java.net/skara/518/webrev.00 Stats: 656 lines in 10 files changed: 650 ins; 1 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/518.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/518/head:pull/518 PR: https://git.openjdk.java.net/skara/pull/518 From ehelin at openjdk.java.net Thu Mar 19 23:53:23 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 23:53:23 GMT Subject: RFR: WIP/RFC: added ProblemLists check to jcheck In-Reply-To: References: Message-ID: On Thu, 19 Mar 2020 05:48:29 GMT, Igor Ignatyev wrote: > Hi all, > > This is more of a request for comments than an actual PR. > > The idea behind the patch is to ensure that whenever someone fixes a bug, its ID is not used in any of the problem > lists. As some of you might know this is not a hypothetical issue, people forget to clean problem lists quite often, > which in some cases results in poorly tested patches. Although it's true that even if we ensure that all commits are > correct, there still will be ways to have "fixed" bugs in problem lists, e.g. closing as WNF, duplicate, etc, it's > nevertheless believed that the majority (or the most annoying) "violations" are caused by commits. The proposed check > parses all problem lists specified by `dirs` (bar-separated list of test suites) and `pattern` (regexp pattern for > files withing the `dirs`) and verifies that none of the issues fixed by a patch is listed in any of problem lists. The > original / python-time [patch](http://cr.openjdk.java.net/~iignatyev//jcheck/problem-list/webrev.00/index.html) used a > list glob-pattern, but unfortunately, Java SE doesn't have a good(fast) API to find all files matching a glob, and I > didn't want to bring 3rd party dependency just for this use-case. Thanks, > -- Igor Hi Igor, thanks for contributing ?? We are in general very positive to bring in additional "jchecks" to upstream since they can easily be configured per repository. The different OpenJDK projects usually choose the checks they want enabled/disabled themselves. I think the check you are proposing makes a lot of sense, I've run into this scenario myself in the past. I had a brief look at the code, will do a more in-depth review later, but at a first glance it looks really good ?? One thing that stands out: could you please add one or more unit tests for your new check? You can use the unit tests for other checks as an inspiration, please see the tests in [jcheck/src/test/java/org/openjdk/skara/jcheck](https://github.com/openjdk/skara/tree/master/jcheck/src/test/java/org/openjdk/skara/jcheck). Thanks, Erik ------------- PR: https://git.openjdk.java.net/skara/pull/518 From iignatyev at openjdk.java.net Thu Mar 19 23:53:23 2020 From: iignatyev at openjdk.java.net (Igor Ignatyev) Date: Thu, 19 Mar 2020 23:53:23 GMT Subject: RFR: WIP/RFC: added ProblemLists check to jcheck In-Reply-To: References: Message-ID: On Thu, 19 Mar 2020 08:21:38 GMT, Erik Helin wrote: >> Hi all, >> >> This is more of a request for comments than an actual PR. >> >> The idea behind the patch is to ensure that whenever someone fixes a bug, its ID is not used in any of the problem >> lists. As some of you might know this is not a hypothetical issue, people forget to clean problem lists quite often, >> which in some cases results in poorly tested patches. Although it's true that even if we ensure that all commits are >> correct, there still will be ways to have "fixed" bugs in problem lists, e.g. closing as WNF, duplicate, etc, it's >> nevertheless believed that the majority (or the most annoying) "violations" are caused by commits. The proposed check >> parses all problem lists specified by `dirs` (bar-separated list of test suites) and `pattern` (regexp pattern for >> files withing the `dirs`) and verifies that none of the issues fixed by a patch is listed in any of problem lists. The >> original / python-time [patch](http://cr.openjdk.java.net/~iignatyev//jcheck/problem-list/webrev.00/index.html) used a >> list glob-pattern, but unfortunately, Java SE doesn't have a good(fast) API to find all files matching a glob, and I >> didn't want to bring 3rd party dependency just for this use-case. Thanks, >> -- Igor > > Hi Igor, > > thanks for contributing ?? > > We are in general very positive to bring in additional "jchecks" to upstream since they can easily be configured per > repository. The different OpenJDK projects usually choose the checks they want enabled/disabled themselves. > I think the check you are proposing makes a lot of sense, I've run into this scenario myself in the past. I had a brief > look at the code, will do a more in-depth review later, but at a first glance it looks really good ?? One thing that > stands out: could you please add one or more unit tests for your new check? You can use the unit tests for other checks > as an inspiration, please see the tests in > [jcheck/src/test/java/org/openjdk/skara/jcheck](https://github.com/openjdk/skara/tree/master/jcheck/src/test/java/org/openjdk/skara/jcheck). > Thanks, Erik Hi Erik, Thanks for your prompt response. One of the reasons I haven't written any tests for this check is that I 1st wanted to get opinions on whether such a check will be accepted to skara/jcheck as my previous experience with jcheck.py showed that it's near to impossible to extend it with any new checks. Another reason is that this check reads the content of files in a repo, which AFAICT none of the existing tests do. Anyhow, I'll work on developing tests. Cheers, -- Igor ------------- PR: https://git.openjdk.java.net/skara/pull/518 From ehelin at openjdk.java.net Thu Mar 19 23:53:24 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 19 Mar 2020 23:53:24 GMT Subject: RFR: WIP/RFC: added ProblemLists check to jcheck In-Reply-To: References: Message-ID: On Thu, 19 Mar 2020 14:27:24 GMT, Igor Ignatyev wrote: >> Hi Igor, >> >> thanks for contributing ?? >> >> We are in general very positive to bring in additional "jchecks" to upstream since they can easily be configured per >> repository. The different OpenJDK projects usually choose the checks they want enabled/disabled themselves. >> I think the check you are proposing makes a lot of sense, I've run into this scenario myself in the past. I had a brief >> look at the code, will do a more in-depth review later, but at a first glance it looks really good ?? One thing that >> stands out: could you please add one or more unit tests for your new check? You can use the unit tests for other checks >> as an inspiration, please see the tests in >> [jcheck/src/test/java/org/openjdk/skara/jcheck](https://github.com/openjdk/skara/tree/master/jcheck/src/test/java/org/openjdk/skara/jcheck). >> Thanks, Erik > > Hi Erik, > > Thanks for your prompt response. One of the reasons I haven't written any tests for this check is that I 1st wanted to > get opinions on whether such a check will be accepted to skara/jcheck as my previous experience with jcheck.py showed > that it's near to impossible to extend it with any new checks. Another reason is that this check reads the content of > files in a repo, which AFAICT none of the existing tests do. Anyhow, I'll work on developing tests. Cheers, > -- Igor Ah ok, I get it. Skara's jcheck is very extensible, it is perfectly fine for a repository to start requiring more checks after a given commit by updating .jcheck/conf. It is also fine for a repository to only utilize a subset of the available checks (this is very common in practice). Yes and no, the other checks do read at least .jcheck/conf ?? What you need to be careful with is _which_ revision you read the file contents from. You probably want to use `ReadOnlyRepository::lines` instead of reading a file directly from disk (since a user might jcheck an earlier commit than the one currently being checked out). It should be fairly easy writing a unit test showcasing this scenario ?? Thanks, Erik ------------- PR: https://git.openjdk.java.net/skara/pull/518 From iignatyev at openjdk.java.net Thu Mar 19 23:58:29 2020 From: iignatyev at openjdk.java.net (Igor Ignatyev) Date: Thu, 19 Mar 2020 23:58:29 GMT Subject: [Rev 01] RFR: WIP/RFC: added ProblemLists check to jcheck In-Reply-To: References: Message-ID: > Hi all, > > This is more of a request for comments than an actual PR. > > The idea behind the patch is to ensure that whenever someone fixes a bug, its ID is not used in any of the problem > lists. As some of you might know this is not a hypothetical issue, people forget to clean problem lists quite often, > which in some cases results in poorly tested patches. Although it's true that even if we ensure that all commits are > correct, there still will be ways to have "fixed" bugs in problem lists, e.g. closing as WNF, duplicate, etc, it's > nevertheless believed that the majority (or the most annoying) "violations" are caused by commits. The proposed check > parses all problem lists specified by `dirs` (bar-separated list of test suites) and `pattern` (regexp pattern for > files withing the `dirs`) and verifies that none of the issues fixed by a patch is listed in any of problem lists. The > original / python-time [patch](http://cr.openjdk.java.net/~iignatyev//jcheck/problem-list/webrev.00/index.html) used a > list glob-pattern, but unfortunately, Java SE doesn't have a good(fast) API to find all files matching a glob, and I > didn't want to bring 3rd party dependency just for this use-case. Thanks, > -- Igor Igor Ignatyev has updated the pull request incrementally with one additional commit since the last revision: corrected copyright year ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/518/files - new: https://git.openjdk.java.net/skara/pull/518/files/2e69f1e8..ff50cfe2 Webrevs: - full: https://webrevs.openjdk.java.net/skara/518/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/518/webrev.00-01 Stats: 2 lines in 2 files changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/518.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/518/head:pull/518 PR: https://git.openjdk.java.net/skara/pull/518 From iignatyev at openjdk.java.net Fri Mar 20 00:03:08 2020 From: iignatyev at openjdk.java.net (Igor Ignatyev) Date: Fri, 20 Mar 2020 00:03:08 GMT Subject: RFR: WIP/RFC: added ProblemLists check to jcheck In-Reply-To: References: Message-ID: On Thu, 19 Mar 2020 15:13:22 GMT, Erik Helin wrote: >> Hi Erik, >> >> Thanks for your prompt response. One of the reasons I haven't written any tests for this check is that I 1st wanted to >> get opinions on whether such a check will be accepted to skara/jcheck as my previous experience with jcheck.py showed >> that it's near to impossible to extend it with any new checks. Another reason is that this check reads the content of >> files in a repo, which AFAICT none of the existing tests do. Anyhow, I'll work on developing tests. Cheers, >> -- Igor > > Ah ok, I get it. Skara's jcheck is very extensible, it is perfectly fine for a repository to start requiring more > checks after a given commit by updating .jcheck/conf. It is also fine for a repository to only utilize a subset of the > available checks (this is very common in practice). Yes and no, the other checks do read at least .jcheck/conf ?? What > you need to be careful with is _which_ revision you read the file contents from. You probably want to use > `ReadOnlyRepository::lines` instead of reading a file directly from disk (since a user might jcheck an earlier commit > than the one currently being checked out). It should be fairly easy writing a unit test showcasing this scenario ?? > Thanks, Erik Hi Erik, thanks for the hint, I've updated the check to use `ReadOnlyRepository` to read files' content and list files in a directory. I've also added unit tests to cover different scenarios and configuration combinations. there is one thing which I would like to discuss before we (hopefully) get it integrated -- the default value for `dirs`. as `ProblemListsCheck` will most probably be used only by "jdk-based" project, it might make sense to use values which reflects jdk layout (`test/jdk|test/langtools|test/hotspot/jtreg|test/nashorn|test/jaxp`) so most projects will be able to use the default value, on the other hand, I don't want to bake in the current directory layout, so I defaulted `dirs` to `test` which thought isn't good for any of the existing OpenJDK projects. so what do you think? BTW, should I update copyright years in all the touched files? Thanks, -- Igor ------------- PR: https://git.openjdk.java.net/skara/pull/518 From rwestberg at openjdk.java.net Fri Mar 20 06:21:06 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 20 Mar 2020 06:21:06 GMT Subject: [Rev 02] RFR: 304: Squash additional commits into merge commits for merge PRs In-Reply-To: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> References: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> Message-ID: > Hi all, > > Please review this change that squashes additional commits made on top of the first merge commit, to allow updating the > PR. > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: One more test failure fix ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/519/files - new: https://git.openjdk.java.net/skara/pull/519/files/978e08f7..75969760 Webrevs: - full: https://webrevs.openjdk.java.net/skara/519/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/519/webrev.01-02 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/519.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/519/head:pull/519 PR: https://git.openjdk.java.net/skara/pull/519 From rwestberg at openjdk.java.net Fri Mar 20 07:06:40 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 20 Mar 2020 07:06:40 GMT Subject: [Integrated] RFR: 304: Squash additional commits into merge commits for merge PRs In-Reply-To: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> References: <7qdFZywqc_120bKYcAUK25gzU596lPqnOwxLyFP3rRI=.ff63c6c5-b0ee-4cb6-9bb7-136ca55925ee@github.com> Message-ID: <19a72874-1bc0-4a65-b123-a8c05d016a9e@openjdk.org> Changeset: 92d7d97a Author: Robin Westberg Date: 2020-03-20 07:06:26 +0000 URL: https://git.openjdk.java.net/skara/commit/92d7d97a 304: Squash additional commits into merge commits for merge PRs Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java From ehelin at openjdk.java.net Fri Mar 20 07:28:42 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 20 Mar 2020 07:28:42 GMT Subject: RFR: 306: Automatic merge conflicts PR only have repo in title when needed Message-ID: Hi all, please review this small patch that ensures that automatic merge conflicts PRs only shows the repo in the title if the from and target repository differs. Testing: - `make test` on Linux x64 Thanks, Erik ------------- Commit messages: - skara-306 Changes: https://git.openjdk.java.net/skara/pull/522/files Webrev: https://webrevs.openjdk.java.net/skara/522/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-306 Stats: 8 lines in 1 file changed: 4 ins; 3 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/522.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/522/head:pull/522 PR: https://git.openjdk.java.net/skara/pull/522 From rwestberg at openjdk.java.net Fri Mar 20 07:58:38 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 20 Mar 2020 07:58:38 GMT Subject: RFR: 306: Automatic merge conflicts PR only have repo in title when needed In-Reply-To: References: Message-ID: On Fri, 20 Mar 2020 07:24:51 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that ensures that automatic merge conflicts PRs > only shows the repo in the title if the from and target repository differs. > > Testing: > - `make test` on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/522 From rwestberg at openjdk.java.net Fri Mar 20 11:54:47 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 20 Mar 2020 11:54:47 GMT Subject: RFR: 325: Transient network errors can cause skipped notifications Message-ID: Hi all, Please review this change that ensures that a remote storage repository is not considered empty when materialization fails for unrelated reasons. Best regards, Robin ------------- Commit messages: - Ensure that the remote storage actually is empty before proceeding Changes: https://git.openjdk.java.net/skara/pull/523/files Webrev: https://webrevs.openjdk.java.net/skara/523/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-325 Stats: 72 lines in 3 files changed: 71 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/523.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/523/head:pull/523 PR: https://git.openjdk.java.net/skara/pull/523 From rwestberg at openjdk.java.net Fri Mar 20 14:38:37 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 20 Mar 2020 14:38:37 GMT Subject: RFR: Ensure pull requests instances are populated with complete json info Message-ID: Hi all, Please review this small change that ensures that pull requests found by searching on GitHub are populated with complete information. Best regards, Robin ------------- Commit messages: - Ensure pull requests instances are populated with complete json info Changes: https://git.openjdk.java.net/skara/pull/524/files Webrev: https://webrevs.openjdk.java.net/skara/524/webrev.00 Stats: 3 lines in 1 file changed: 1 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/524.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/524/head:pull/524 PR: https://git.openjdk.java.net/skara/pull/524 From ehelin at openjdk.java.net Mon Mar 23 06:00:16 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 06:00:16 GMT Subject: RFR: jcheck: add symlink check Message-ID: Hi all, please review this patch that adds a check for symbolic links to JCheck. Testing: - `make test` passes on Linux x64 - Added two new unit tests Thanks, Erik ------------- Commit messages: - jcheck: add symlink check Changes: https://git.openjdk.java.net/skara/pull/525/files Webrev: https://webrevs.openjdk.java.net/skara/525/webrev.00 Stats: 252 lines in 9 files changed: 251 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/525.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/525/head:pull/525 PR: https://git.openjdk.java.net/skara/pull/525 From rwestberg at openjdk.java.net Mon Mar 23 06:03:54 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 06:03:54 GMT Subject: RFR: jcheck: add symlink check In-Reply-To: References: Message-ID: On Mon, 23 Mar 2020 05:55:52 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a check for symbolic links to JCheck. > > Testing: > - `make test` passes on Linux x64 > - Added two new unit tests > > Thanks, > Erik Looks good, just a spelling comment! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestCheckIssueVisitor.java line 211: > 210: public void visit(SymlinkIssue issue) { > 211: messages.add(String.format("Symbolic linkes are not allowed (file: %s)", issue.path())); > 212: failedChecks.add(issue.check().getClass()); Suggestion: messages.add(String.format("Symbolic links are not allowed (file: %s)", issue.path())); ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/525 From ehelin at openjdk.java.net Mon Mar 23 06:11:12 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 06:11:12 GMT Subject: [Rev 01] RFR: jcheck: add symlink check In-Reply-To: References: Message-ID: <2jxvcasVDKszEiXznssy06PboY3wKXlI3QYn1oQWNxk=.a31e821b-5e5f-43c2-987c-ddce3ac55e92@github.com> > Hi all, > > please review this patch that adds a check for symbolic links to JCheck. > > Testing: > - `make test` passes on Linux x64 > - Added two new unit tests > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Fix spelling Co-Authored-By: Robin Westberg ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/525/files - new: https://git.openjdk.java.net/skara/pull/525/files/69b8fedd..24e75eec Webrevs: - full: https://webrevs.openjdk.java.net/skara/525/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/525/webrev.00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/525.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/525/head:pull/525 PR: https://git.openjdk.java.net/skara/pull/525 From ehelin at openjdk.java.net Mon Mar 23 06:18:05 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 06:18:05 GMT Subject: RFR: jcheck: check for bad whitespace in commit message Message-ID: Hi all, please review this patch that updates the "message" check in JCheck to also check for bad whitespace (tabs, carriage return, trailing) in commit messages. Testing: - `make test` passes on Linux x64 - Added three new unit tests Thanks, Erik ------------- Commit messages: - jcheck: check for bad whitespace in commit message Changes: https://git.openjdk.java.net/skara/pull/526/files Webrev: https://webrevs.openjdk.java.net/skara/526/webrev.00 Stats: 167 lines in 7 files changed: 163 ins; 1 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/526.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/526/head:pull/526 PR: https://git.openjdk.java.net/skara/pull/526 From rwestberg at openjdk.java.net Mon Mar 23 06:27:01 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 06:27:01 GMT Subject: RFR: 322: Improve error message on non-author /integrate Message-ID: <0i61Wg112acoxnEOB1pJt7Zc_WM17eP9iS_uZNp5dp0=.4cc18da1-b9a8-4738-b79b-333f6981f4ff@github.com> Hi all, Please review this change that gives a more helpful error message if a potential sponsor issues the /integrate command when they probably wanted to do /sponsor. Best regards, Robin ------------- Commit messages: - Suggest the sponsor command if integrate is given by an eligible sponsor Changes: https://git.openjdk.java.net/skara/pull/527/files Webrev: https://webrevs.openjdk.java.net/skara/527/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-322 Stats: 60 lines in 2 files changed: 59 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/527.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/527/head:pull/527 PR: https://git.openjdk.java.net/skara/pull/527 From rwestberg at openjdk.java.net Mon Mar 23 06:23:14 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 06:23:14 GMT Subject: RFR: jcheck: check for bad whitespace in commit message In-Reply-To: References: Message-ID: On Mon, 23 Mar 2020 06:14:06 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates the "message" check in JCheck to also > check for bad whitespace (tabs, carriage return, trailing) in commit messages. > > Testing: > - `make test` passes on Linux x64 > - Added three new unit tests > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/526 From ehelin at openjdk.java.net Mon Mar 23 06:34:15 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 06:34:15 GMT Subject: RFR: cli: better hg support in git-jcheck Message-ID: <6n0rZOMz4KRefXm7SyTnHVjKjA12E0ln-BqtjenqAPA=.7a88be70-dce2-4314-b75b-3cf02f73610d@github.com> Hi all, please review this patch that adds better support for the `--mercurial` flag to `git-jcheck`. Some newer (git specific) features will be disabled when `--mercurial` is passed and errors will not be shown for missing email addresses. Testing: - Manual testing of `git jcheck --mercurial` on Linux x64 Thanks, Erik ------------- Commit messages: - cli: better hg support in git-jcheck Changes: https://git.openjdk.java.net/skara/pull/528/files Webrev: https://webrevs.openjdk.java.net/skara/528/webrev.00 Stats: 14 lines in 2 files changed: 4 ins; 1 del; 9 mod Patch: https://git.openjdk.java.net/skara/pull/528.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/528/head:pull/528 PR: https://git.openjdk.java.net/skara/pull/528 From rwestberg at openjdk.java.net Mon Mar 23 07:11:54 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 07:11:54 GMT Subject: RFR: cli: better hg support in git-jcheck In-Reply-To: <6n0rZOMz4KRefXm7SyTnHVjKjA12E0ln-BqtjenqAPA=.7a88be70-dce2-4314-b75b-3cf02f73610d@github.com> References: <6n0rZOMz4KRefXm7SyTnHVjKjA12E0ln-BqtjenqAPA=.7a88be70-dce2-4314-b75b-3cf02f73610d@github.com> Message-ID: On Mon, 23 Mar 2020 06:30:14 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds better support for the `--mercurial` flag to > `git-jcheck`. Some newer (git specific) features will be disabled when > `--mercurial` is passed and errors will not be shown for missing email > addresses. > > Testing: > - Manual testing of `git jcheck --mercurial` on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/528 From ehelin at openjdk.java.net Mon Mar 23 07:34:16 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 07:34:16 GMT Subject: RFR: git-sync: use refspec instead of --prune-tags Message-ID: <9pGm118ktY7mXbnFbnvuSeca818n-jTp6H4D0elUvrc=.95eb6fe1-0380-47b9-b4c7-8fd5c005206f@github.com> Hi all, please review this small patch that uses a refspec instead of `--prune-tags` for `GitRepository.fetchRemote`. The flag `--prune-tags` was introduced in Git 2.17 and we want to support older Git versions, so I opted to use a refspec instead to achieve the same effect. Testing: - Manual testing of `git sync` on Linux x64 Thanks, Erik ------------- Commit messages: - git-sync: do not use --prune-tags Changes: https://git.openjdk.java.net/skara/pull/529/files Webrev: https://webrevs.openjdk.java.net/skara/529/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/529.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/529/head:pull/529 PR: https://git.openjdk.java.net/skara/pull/529 From ehelin at openjdk.java.net Mon Mar 23 07:29:13 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 07:29:13 GMT Subject: RFR: Ensure pull requests instances are populated with complete json info In-Reply-To: References: Message-ID: On Fri, 20 Mar 2020 14:35:06 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that ensures that pull requests found by searching on GitHub are populated with > complete information. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/524 From ehelin at openjdk.java.net Mon Mar 23 07:28:44 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 07:28:44 GMT Subject: RFR: 325: Transient network errors can cause skipped notifications In-Reply-To: References: Message-ID: On Fri, 20 Mar 2020 11:51:12 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that ensures that a remote storage repository is not considered empty when materialization > fails for unrelated reasons. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/523 From ehelin at openjdk.java.net Mon Mar 23 07:29:55 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 07:29:55 GMT Subject: RFR: 322: Improve error message on non-author /integrate In-Reply-To: <0i61Wg112acoxnEOB1pJt7Zc_WM17eP9iS_uZNp5dp0=.4cc18da1-b9a8-4738-b79b-333f6981f4ff@github.com> References: <0i61Wg112acoxnEOB1pJt7Zc_WM17eP9iS_uZNp5dp0=.4cc18da1-b9a8-4738-b79b-333f6981f4ff@github.com> Message-ID: On Mon, 23 Mar 2020 06:22:58 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that gives a more helpful error message if a potential sponsor issues the /integrate command > when they probably wanted to do /sponsor. > Best regards, > Robin Looks good, great fix! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/527 From rwestberg at openjdk.java.net Mon Mar 23 07:44:38 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 07:44:38 GMT Subject: [Integrated] RFR: 325: Transient network errors can cause skipped notifications In-Reply-To: References: Message-ID: <9d0c8a33-8533-4b5c-80cb-c18d574412a1@openjdk.org> Changeset: 1f08f7c5 Author: Robin Westberg Date: 2020-03-23 07:44:22 +0000 URL: https://git.openjdk.java.net/skara/commit/1f08f7c5 325: Transient network errors can cause skipped notifications Reviewed-by: ehelin ! storage/build.gradle ! storage/src/main/java/org/openjdk/skara/storage/HostedRepositoryStorage.java + storage/src/test/java/org/openjdk/skara/storage/HostedRepositoryStorageTests.java From rwestberg at openjdk.java.net Mon Mar 23 07:46:37 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 07:46:37 GMT Subject: [Integrated] RFR: 322: Improve error message on non-author /integrate In-Reply-To: <0i61Wg112acoxnEOB1pJt7Zc_WM17eP9iS_uZNp5dp0=.4cc18da1-b9a8-4738-b79b-333f6981f4ff@github.com> References: <0i61Wg112acoxnEOB1pJt7Zc_WM17eP9iS_uZNp5dp0=.4cc18da1-b9a8-4738-b79b-333f6981f4ff@github.com> Message-ID: <4cdbe391-d92b-492f-aef4-7b07523ef3bf@openjdk.org> Changeset: 2b645bb3 Author: Robin Westberg Date: 2020-03-23 07:46:18 +0000 URL: https://git.openjdk.java.net/skara/commit/2b645bb3 322: Improve error message on non-author /integrate Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/IntegrateTests.java From ehelin at openjdk.java.net Mon Mar 23 07:51:13 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 07:51:13 GMT Subject: [Rev 01] RFR: git-sync: use refspec instead of --prune-tags In-Reply-To: <9pGm118ktY7mXbnFbnvuSeca818n-jTp6H4D0elUvrc=.95eb6fe1-0380-47b9-b4c7-8fd5c005206f@github.com> References: <9pGm118ktY7mXbnFbnvuSeca818n-jTp6H4D0elUvrc=.95eb6fe1-0380-47b9-b4c7-8fd5c005206f@github.com> Message-ID: > Hi all, > > please review this small patch that uses a refspec instead of `--prune-tags` for > `GitRepository.fetchRemote`. The flag `--prune-tags` was introduced in Git 2.17 > and we want to support older Git versions, so I opted to use a refspec instead > to achieve the same effect. > > Testing: > - Manual testing of `git sync` on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Add refspec for non-tag heads as well ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/529/files - new: https://git.openjdk.java.net/skara/pull/529/files/0d9d2d27..7d032795 Webrevs: - full: https://webrevs.openjdk.java.net/skara/529/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/529/webrev.00-01 Stats: 3 lines in 1 file changed: 2 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/529.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/529/head:pull/529 PR: https://git.openjdk.java.net/skara/pull/529 From rwestberg at openjdk.java.net Mon Mar 23 07:51:14 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 07:51:14 GMT Subject: [Rev 01] RFR: git-sync: use refspec instead of --prune-tags In-Reply-To: References: <9pGm118ktY7mXbnFbnvuSeca818n-jTp6H4D0elUvrc=.95eb6fe1-0380-47b9-b4c7-8fd5c005206f@github.com> Message-ID: On Mon, 23 Mar 2020 07:47:01 GMT, Erik Helin wrote: >> Hi all, >> >> please review this small patch that uses a refspec instead of `--prune-tags` for >> `GitRepository.fetchRemote`. The flag `--prune-tags` was introduced in Git 2.17 >> and we want to support older Git versions, so I opted to use a refspec instead >> to achieve the same effect. >> >> Testing: >> - Manual testing of `git sync` on Linux x64 >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > Add refspec for non-tag heads as well Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/529 From ehelin at openjdk.java.net Mon Mar 23 08:05:53 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 08:05:53 GMT Subject: RFR: cli: better handling of git-jcheck --lax Message-ID: <9R5DbWzorjj2M5HnhBQFAAwXHweKHMJn7C-JjB4i5p4=.d2ae19dd-c61e-477c-9c72-3be77e672943@github.com> Hi all, please review this PR that handles "lax" for JCheck much better, both when it comes to CLI reporting and for configuration parsing. Running `git jcheck --lax` will now hide a number of issues. The "legacy" JCheck parser now also understands the `comments = lax` configuration property. Testing: - `make test` passes on Linux x64 - Manual testing of `git jcheck --lax` Thanks, Erik ------------- Commit messages: - cli: better handling of git-jcheck --lax Changes: https://git.openjdk.java.net/skara/pull/530/files Webrev: https://webrevs.openjdk.java.net/skara/530/webrev.00 Stats: 42 lines in 5 files changed: 24 ins; 0 del; 18 mod Patch: https://git.openjdk.java.net/skara/pull/530.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/530/head:pull/530 PR: https://git.openjdk.java.net/skara/pull/530 From ehelin at openjdk.java.net Mon Mar 23 08:06:43 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 08:06:43 GMT Subject: [Integrated] RFR: git-sync: use refspec instead of --prune-tags In-Reply-To: <9pGm118ktY7mXbnFbnvuSeca818n-jTp6H4D0elUvrc=.95eb6fe1-0380-47b9-b4c7-8fd5c005206f@github.com> References: <9pGm118ktY7mXbnFbnvuSeca818n-jTp6H4D0elUvrc=.95eb6fe1-0380-47b9-b4c7-8fd5c005206f@github.com> Message-ID: <7f4aa4d5-9ab2-4c9f-8623-a432962834ce@openjdk.org> Changeset: b2b8de24 Author: Erik Helin Date: 2020-03-23 08:06:30 +0000 URL: https://git.openjdk.java.net/skara/commit/b2b8de24 git-sync: use refspec instead of --prune-tags Reviewed-by: rwestberg ! vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java From ehelin at openjdk.java.net Mon Mar 23 08:08:14 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 08:08:14 GMT Subject: [Integrated] RFR: cli: better handling of git-jcheck --lax In-Reply-To: <9R5DbWzorjj2M5HnhBQFAAwXHweKHMJn7C-JjB4i5p4=.d2ae19dd-c61e-477c-9c72-3be77e672943@github.com> References: <9R5DbWzorjj2M5HnhBQFAAwXHweKHMJn7C-JjB4i5p4=.d2ae19dd-c61e-477c-9c72-3be77e672943@github.com> Message-ID: <0b3c0f8b-57e3-4a32-8aea-35cc09bad452@openjdk.org> Changeset: 4e75eeb9 Author: Erik Helin Date: 2020-03-23 08:07:58 +0000 URL: https://git.openjdk.java.net/skara/commit/4e75eeb9 cli: better handling of git-jcheck --lax Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitJCheck.java ! cli/src/main/java/org/openjdk/skara/cli/JCheckCLIVisitor.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/IssuesCheck.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/IssuesConfiguration.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/JCheckConfiguration.java From rwestberg at openjdk.java.net Mon Mar 23 08:12:01 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 08:12:01 GMT Subject: RFR: 318: The "outdated" label should be renamed to "merge-conlict" Message-ID: Hi all, Please review this change that renames the outdated label, and also drops the ready label for PRs with merge conflicts. Best regards, Robin ------------- Commit messages: - Renamed label, remove ready state if conflict Changes: https://git.openjdk.java.net/skara/pull/531/files Webrev: https://webrevs.openjdk.java.net/skara/531/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-318 Stats: 10 lines in 3 files changed: 3 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/531.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/531/head:pull/531 PR: https://git.openjdk.java.net/skara/pull/531 From ehelin at openjdk.java.net Mon Mar 23 08:12:01 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 08:12:01 GMT Subject: RFR: 318: The "outdated" label should be renamed to "merge-conlict" In-Reply-To: References: Message-ID: On Mon, 23 Mar 2020 08:03:39 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that renames the outdated label, and also drops the ready label for PRs with merge conflicts. > > Best regards, > Robin Looks good, thanks for remembering to fix `git pr status`! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/531 From rwestberg at openjdk.java.net Mon Mar 23 08:13:25 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 08:13:25 GMT Subject: [Integrated] RFR: 318: The "outdated" label should be renamed to "merge-conlict" In-Reply-To: References: Message-ID: <2779ae2a-e9a2-4936-8b0f-a118ff0d87f1@openjdk.org> Changeset: 8cbce58d Author: Robin Westberg Date: 2020-03-23 08:13:10 +0000 URL: https://git.openjdk.java.net/skara/commit/8cbce58d 318: The "outdated" label should be renamed to "merge-conlict" Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java ! cli/src/main/java/org/openjdk/skara/cli/pr/Utils.java From rwestberg at openjdk.java.net Mon Mar 23 08:09:22 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 08:09:22 GMT Subject: RFR: cli: better handling of git-jcheck --lax In-Reply-To: <9R5DbWzorjj2M5HnhBQFAAwXHweKHMJn7C-JjB4i5p4=.d2ae19dd-c61e-477c-9c72-3be77e672943@github.com> References: <9R5DbWzorjj2M5HnhBQFAAwXHweKHMJn7C-JjB4i5p4=.d2ae19dd-c61e-477c-9c72-3be77e672943@github.com> Message-ID: On Mon, 23 Mar 2020 08:01:55 GMT, Erik Helin wrote: > Hi all, > > please review this PR that handles "lax" for JCheck much better, both when it > comes to CLI reporting and for configuration parsing. Running `git jcheck --lax` > will now hide a number of issues. The "legacy" JCheck parser now also > understands the `comments = lax` configuration property. > > Testing: > - `make test` passes on Linux x64 > - Manual testing of `git jcheck --lax` > > Thanks, > Erik Looks good to me! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/530 From ehelin at openjdk.java.net Mon Mar 23 08:34:02 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 08:34:02 GMT Subject: RFR: jcheck: report all issues from "committer" check Message-ID: Hi all, please review this patch that ensures that the "committer" check in JCheck reports all issues at once instead of one at a time. Testing: - `make test` on Linux x64 - Updated two unit tests Thanks, Erik ------------- Commit messages: - jcheck: report all issues from "committer" check Changes: https://git.openjdk.java.net/skara/pull/532/files Webrev: https://webrevs.openjdk.java.net/skara/532/webrev.00 Stats: 16 lines in 2 files changed: 5 ins; 0 del; 11 mod Patch: https://git.openjdk.java.net/skara/pull/532.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/532/head:pull/532 PR: https://git.openjdk.java.net/skara/pull/532 From rwestberg at openjdk.java.net Mon Mar 23 09:00:33 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 09:00:33 GMT Subject: RFR: jcheck: report all issues from "committer" check In-Reply-To: References: Message-ID: On Mon, 23 Mar 2020 08:30:27 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that the "committer" check in JCheck > reports all issues at once instead of one at a time. > > Testing: > - `make test` on Linux x64 > - Updated two unit tests > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/532 From ehelin at openjdk.java.net Mon Mar 23 09:07:56 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 09:07:56 GMT Subject: [Integrated] RFR: jcheck: report all issues from "committer" check In-Reply-To: References: Message-ID: <16a46407-2d03-46e0-bcf6-897653840145@openjdk.org> Changeset: 4e569e8a Author: Erik Helin Date: 2020-03-23 09:07:43 +0000 URL: https://git.openjdk.java.net/skara/commit/4e569e8a jcheck: report all issues from "committer" check Reviewed-by: rwestberg ! jcheck/src/main/java/org/openjdk/skara/jcheck/CommitterCheck.java ! jcheck/src/test/java/org/openjdk/skara/jcheck/CommitterCheckTests.java From ehelin at openjdk.java.net Mon Mar 23 09:26:41 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 09:26:41 GMT Subject: RFR: jcheck: duplicate-issues should only check id and support "dup" Message-ID: Hi all, please review this patch that makes the "duplicate-issues" check in JCheck _only_ consider issue ids (e.g. `8123456`) when looking for duplicates. I also added support for the "legacy" .jcheck/conf parser to understands the `bugids = dup` configuration line. Testing: - Manual testing on Linux x64 Thanks, Erik ------------- Commit messages: - jcheck: duplicate-issues should only check id and support "dup" Changes: https://git.openjdk.java.net/skara/pull/533/files Webrev: https://webrevs.openjdk.java.net/skara/533/webrev.00 Stats: 11 lines in 2 files changed: 5 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/533.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/533/head:pull/533 PR: https://git.openjdk.java.net/skara/pull/533 From rwestberg at openjdk.java.net Mon Mar 23 09:34:56 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 09:34:56 GMT Subject: RFR: jcheck: duplicate-issues should only check id and support "dup" In-Reply-To: References: Message-ID: On Mon, 23 Mar 2020 09:23:02 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the "duplicate-issues" check in JCheck > _only_ consider issue ids (e.g. `8123456`) when looking for duplicates. I also > added support for the "legacy" .jcheck/conf parser to understands the `bugids = > dup` configuration line. > > Testing: > - Manual testing on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/533 From rwestberg at openjdk.java.net Mon Mar 23 12:07:00 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 12:07:00 GMT Subject: RFR: Reuse HttpClient instances Message-ID: Hi all, Please review this change that improves reuse of HttpClient instances, as they can be shared and creating new ones causes unnecessary thread creation. Best regards, Robin ------------- Commit messages: - Reuse HttpClient instances Changes: https://git.openjdk.java.net/skara/pull/534/files Webrev: https://webrevs.openjdk.java.net/skara/534/webrev.00 Stats: 20 lines in 3 files changed: 9 ins; 10 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/534.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/534/head:pull/534 PR: https://git.openjdk.java.net/skara/pull/534 From ehelin at openjdk.java.net Mon Mar 23 12:08:36 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 12:08:36 GMT Subject: RFR: Reuse HttpClient instances In-Reply-To: References: Message-ID: On Mon, 23 Mar 2020 12:03:21 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that improves reuse of HttpClient instances, as they can be shared and creating new ones > causes unnecessary thread creation. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/534 From ehelin at openjdk.java.net Mon Mar 23 12:10:07 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 12:10:07 GMT Subject: [Rev 01] RFR: jcheck: duplicate-issues should only check id and support "dup" In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that makes the "duplicate-issues" check in JCheck > _only_ consider issue ids (e.g. `8123456`) when looking for duplicates. I also > added support for the "legacy" .jcheck/conf parser to understands the `bugids = > dup` configuration line. > > Testing: > - Manual testing on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Add test ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/533/files - new: https://git.openjdk.java.net/skara/pull/533/files/78d33b98..8986da78 Webrevs: - full: https://webrevs.openjdk.java.net/skara/533/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/533/webrev.00-01 Stats: 145 lines in 2 files changed: 144 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/533.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/533/head:pull/533 PR: https://git.openjdk.java.net/skara/pull/533 From rwestberg at openjdk.java.net Mon Mar 23 12:12:00 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 12:12:00 GMT Subject: [Integrated] RFR: Reuse HttpClient instances In-Reply-To: References: Message-ID: Changeset: 2596472f Author: Robin Westberg Date: 2020-03-23 12:11:46 +0000 URL: https://git.openjdk.java.net/skara/commit/2596472f Reuse HttpClient instances Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java ! forge/src/main/java/org/openjdk/skara/forge/github/GitHubApplication.java ! mailinglist/src/main/java/org/openjdk/skara/mailinglist/mailman/MailmanList.java From ehelin at openjdk.java.net Mon Mar 23 12:22:26 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 12:22:26 GMT Subject: [Rev 02] RFR: jcheck: duplicate-issues should only check id and support "dup" In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that makes the "duplicate-issues" check in JCheck > _only_ consider issue ids (e.g. `8123456`) when looking for duplicates. I also > added support for the "legacy" .jcheck/conf parser to understands the `bugids = > dup` configuration line. > > Testing: > - Manual testing on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Do not rely on iteration order ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/533/files - new: https://git.openjdk.java.net/skara/pull/533/files/8986da78..01ee08f1 Webrevs: - full: https://webrevs.openjdk.java.net/skara/533/webrev.02 - incr: https://webrevs.openjdk.java.net/skara/533/webrev.01-02 Stats: 3 lines in 1 file changed: 2 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/533.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/533/head:pull/533 PR: https://git.openjdk.java.net/skara/pull/533 From rwestberg at openjdk.java.net Mon Mar 23 12:27:34 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 12:27:34 GMT Subject: [Rev 02] RFR: jcheck: duplicate-issues should only check id and support "dup" In-Reply-To: References: Message-ID: On Mon, 23 Mar 2020 12:22:26 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that makes the "duplicate-issues" check in JCheck >> _only_ consider issue ids (e.g. `8123456`) when looking for duplicates. I also >> added support for the "legacy" .jcheck/conf parser to understands the `bugids = >> dup` configuration line. >> >> Testing: >> - Manual testing on Linux x64 >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > Do not rely on iteration order Still looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/533 From ehelin at openjdk.java.net Mon Mar 23 12:49:28 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 12:49:28 GMT Subject: [Integrated] RFR: jcheck: duplicate-issues should only check id and support "dup" In-Reply-To: References: Message-ID: <6755dfcb-6cbf-46dc-8e65-a023dccbb36c@openjdk.org> Changeset: 2ccceab1 Author: Erik Helin Date: 2020-03-23 12:49:14 +0000 URL: https://git.openjdk.java.net/skara/commit/2ccceab1 jcheck: duplicate-issues should only check id and support "dup" Reviewed-by: rwestberg ! jcheck/src/main/java/org/openjdk/skara/jcheck/DuplicateIssuesCheck.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/JCheckConfiguration.java + jcheck/src/test/java/org/openjdk/skara/jcheck/DuplicateIssuesCheckTests.java From ehelin at openjdk.java.net Mon Mar 23 13:30:22 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 13:30:22 GMT Subject: RFR: hg: add support for skara and focus on webrev, defpath and jcheck Message-ID: Hi all, please review this patch that adds proper support for Mercurial for the following Skara CLI tools: - webrev - defpath - jcheck - skara Since the above tools except Skara are already backwards compatible with their Mercurial counterparts in OpenJDK, I only had to do some work on `GitSkara.java`. Since the `skara` tool now is supported a user can now run e.g. `hg skara update`. Testing: - Manual testing on Linux x64 with hg 4.9.2 and hg 5.3 and Python 2.7.16 Thanks, Erik ------------- Commit messages: - hg: add support for skara and focus on webrev, defpath and jcheck Changes: https://git.openjdk.java.net/skara/pull/535/files Webrev: https://webrevs.openjdk.java.net/skara/535/webrev.00 Stats: 185 lines in 3 files changed: 54 ins; 89 del; 42 mod Patch: https://git.openjdk.java.net/skara/pull/535.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/535/head:pull/535 PR: https://git.openjdk.java.net/skara/pull/535 From iignatyev at openjdk.java.net Mon Mar 23 13:49:38 2020 From: iignatyev at openjdk.java.net (Igor Ignatyev) Date: Mon, 23 Mar 2020 13:49:38 GMT Subject: [Rev 02] RFR: jcheck: add "problemlists" check In-Reply-To: References: Message-ID: > Hi all, > > This is more of a request for comments than an actual PR. > > The idea behind the patch is to ensure that whenever someone fixes a bug, its ID is not used in any of the problem > lists. As some of you might know this is not a hypothetical issue, people forget to clean problem lists quite often, > which in some cases results in poorly tested patches. Although it's true that even if we ensure that all commits are > correct, there still will be ways to have "fixed" bugs in problem lists, e.g. closing as WNF, duplicate, etc, it's > nevertheless believed that the majority (or the most annoying) "violations" are caused by commits. The proposed check > parses all problem lists specified by `dirs` (bar-separated list of test suites) and `pattern` (regexp pattern for > files withing the `dirs`) and verifies that none of the issues fixed by a patch is listed in any of problem lists. The > original / python-time [patch](http://cr.openjdk.java.net/~iignatyev//jcheck/problem-list/webrev.00/index.html) used a > list glob-pattern, but unfortunately, Java SE doesn't have a good(fast) API to find all files matching a glob, and I > didn't want to bring 3rd party dependency just for this use-case. Thanks, > -- Igor Igor Ignatyev has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains ten commits: - Merge branch 'master' into master - corrected copyright year - added tests for ProblemListsCheck - cleaned up imports - ProblemListsIssue should use set to store information about files - refiened default pattern in ProblemListsConfiguration - updated ProblemListsCheck to list files in a dir via ReadOnlyRepository - updated ProblemListsCheck to read files' content via ReadOnlyRepository - added ProblemLists check to jcheck ------------- Changes: https://git.openjdk.java.net/skara/pull/518/files Webrev: https://webrevs.openjdk.java.net/skara/518/webrev.02 Stats: 655 lines in 10 files changed: 650 ins; 1 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/518.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/518/head:pull/518 PR: https://git.openjdk.java.net/skara/pull/518 From ehelin at openjdk.java.net Mon Mar 23 14:21:56 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 14:21:56 GMT Subject: [Rev 02] RFR: jcheck: add "problemlists" check In-Reply-To: References: Message-ID: <5Xi1wgM12b4qg8HAz_hsXACvqnP7VnZdBOkCJxSck18=.f17e6f03-1afe-4123-b35d-b72ad8ba8d3d@github.com> On Mon, 23 Mar 2020 13:49:38 GMT, Igor Ignatyev wrote: >> Hi all, >> >> This is more of a request for comments than an actual PR. >> >> The idea behind the patch is to ensure that whenever someone fixes a bug, its ID is not used in any of the problem >> lists. As some of you might know this is not a hypothetical issue, people forget to clean problem lists quite often, >> which in some cases results in poorly tested patches. Although it's true that even if we ensure that all commits are >> correct, there still will be ways to have "fixed" bugs in problem lists, e.g. closing as WNF, duplicate, etc, it's >> nevertheless believed that the majority (or the most annoying) "violations" are caused by commits. The proposed check >> parses all problem lists specified by `dirs` (bar-separated list of test suites) and `pattern` (regexp pattern for >> files withing the `dirs`) and verifies that none of the issues fixed by a patch is listed in any of problem lists. The >> original / python-time [patch](http://cr.openjdk.java.net/~iignatyev//jcheck/problem-list/webrev.00/index.html) used a >> list glob-pattern, but unfortunately, Java SE doesn't have a good(fast) API to find all files matching a glob, and I >> didn't want to bring 3rd party dependency just for this use-case. Thanks, >> -- Igor > > Igor Ignatyev has updated the pull request with a new target base due to a merge or a rebase. The pull request now > contains ten commits: > - Merge branch 'master' into master > - corrected copyright year > - added tests for ProblemListsCheck > - cleaned up imports > - ProblemListsIssue should use set to store information about files > - refiened default pattern in ProblemListsConfiguration > - updated ProblemListsCheck to list files in a dir via ReadOnlyRepository > - updated ProblemListsCheck to read files' content via ReadOnlyRepository > - added ProblemLists check to jcheck Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/518 From rwestberg at openjdk.java.net Mon Mar 23 14:23:15 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 23 Mar 2020 14:23:15 GMT Subject: [Rev 01] RFR: hg: add support for skara and focus on webrev, defpath and jcheck In-Reply-To: References: Message-ID: On Mon, 23 Mar 2020 14:16:51 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that adds proper support for Mercurial for the >> following Skara CLI tools: >> >> - webrev >> - defpath >> - jcheck >> - skara >> >> Since the above tools except Skara are already backwards compatible with their Mercurial >> counterparts in OpenJDK, I only had to do some work on `GitSkara.java`. Since >> the `skara` tool now is supported a user can now run e.g. `hg skara update`. >> >> Testing: >> - Manual testing on Linux x64 with hg 4.9.2 and hg 5.3 and Python 2.7.16 >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > Use OpenJDK Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/535 From ehelin at openjdk.java.net Mon Mar 23 14:24:36 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 14:24:36 GMT Subject: [Integrated] RFR: hg: add support for skara and focus on webrev, defpath and jcheck In-Reply-To: References: Message-ID: Changeset: 334899a7 Author: Erik Helin Date: 2020-03-23 14:24:22 +0000 URL: https://git.openjdk.java.net/skara/commit/334899a7 hg: add support for skara and focus on webrev, defpath and jcheck Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitSkara.java ! skara.py ! skara.sh From ehelin at openjdk.java.net Mon Mar 23 14:16:51 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 14:16:51 GMT Subject: [Rev 01] RFR: hg: add support for skara and focus on webrev, defpath and jcheck In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that adds proper support for Mercurial for the > following Skara CLI tools: > > - webrev > - defpath > - jcheck > - skara > > Since the above tools except Skara are already backwards compatible with their Mercurial > counterparts in OpenJDK, I only had to do some work on `GitSkara.java`. Since > the `skara` tool now is supported a user can now run e.g. `hg skara update`. > > Testing: > - Manual testing on Linux x64 with hg 4.9.2 and hg 5.3 and Python 2.7.16 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Use OpenJDK ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/535/files - new: https://git.openjdk.java.net/skara/pull/535/files/745dc744..1d724fc6 Webrevs: - full: https://webrevs.openjdk.java.net/skara/535/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/535/webrev.00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/535.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/535/head:pull/535 PR: https://git.openjdk.java.net/skara/pull/535 From ehelin at openjdk.java.net Mon Mar 23 14:26:06 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 14:26:06 GMT Subject: [Rev 02] RFR: jcheck: add "problemlists" check In-Reply-To: <5Xi1wgM12b4qg8HAz_hsXACvqnP7VnZdBOkCJxSck18=.f17e6f03-1afe-4123-b35d-b72ad8ba8d3d@github.com> References: <5Xi1wgM12b4qg8HAz_hsXACvqnP7VnZdBOkCJxSck18=.f17e6f03-1afe-4123-b35d-b72ad8ba8d3d@github.com> Message-ID: <7J-5nCuVhXhRbhlUdndV5bQOcOyiBoXTif4w8dzYFS8=.d9bb7fcc-af84-4eb2-a253-55a01ed62e4a@github.com> On Mon, 23 Mar 2020 14:19:49 GMT, Erik Helin wrote: >> Igor Ignatyev has updated the pull request with a new target base due to a merge or a rebase. The pull request now >> contains ten commits: >> - Merge branch 'master' into master >> - corrected copyright year >> - added tests for ProblemListsCheck >> - cleaned up imports >> - ProblemListsIssue should use set to store information about files >> - refiened default pattern in ProblemListsConfiguration >> - updated ProblemListsCheck to list files in a dir via ReadOnlyRepository >> - updated ProblemListsCheck to read files' content via ReadOnlyRepository >> - added ProblemLists check to jcheck > > Looks good! Great work on the patch and on the tests Igor, this is a really solid contribution! ?? As you probably noticed I took the liberty of editing the title of this pull request to align more with Skara's (totally undocumented) conventions, I hope you don't mind? > there is one thing which I would like to discuss before we (hopefully) get it integrated -- the default value for > `dirs`. as `ProblemListsCheck` will most probably be used only by "jdk-based" project, it might make sense to use > values which reflects jdk layout (`test/jdk|test/langtools|test/hotspot/jtreg|test/nashorn|test/jaxp`) so most projects > will be able to use the default value, on the other hand, I don't want to bake in the current directory layout, so I > defaulted `dirs` to `test` which thought isn't good for any of the existing OpenJDK projects. so what do you think? I think defaulting to `test` is fine, I prefer that OpenJDK projects have to specify the directories containing `ProblemList.txt` files in their `.jcheck/conf`. That makes it clear which files that will actually be considered. > BTW, should I update copyright years in all the touched files? Yes please ?? ------------- PR: https://git.openjdk.java.net/skara/pull/518 From iignatyev at openjdk.java.net Mon Mar 23 14:36:01 2020 From: iignatyev at openjdk.java.net (Igor Ignatyev) Date: Mon, 23 Mar 2020 14:36:01 GMT Subject: [Rev 03] RFR: jcheck: add "problemlists" check In-Reply-To: References: Message-ID: > Hi all, > > This is more of a request for comments than an actual PR. > > The idea behind the patch is to ensure that whenever someone fixes a bug, its ID is not used in any of the problem > lists. As some of you might know this is not a hypothetical issue, people forget to clean problem lists quite often, > which in some cases results in poorly tested patches. Although it's true that even if we ensure that all commits are > correct, there still will be ways to have "fixed" bugs in problem lists, e.g. closing as WNF, duplicate, etc, it's > nevertheless believed that the majority (or the most annoying) "violations" are caused by commits. The proposed check > parses all problem lists specified by `dirs` (bar-separated list of test suites) and `pattern` (regexp pattern for > files withing the `dirs`) and verifies that none of the issues fixed by a patch is listed in any of problem lists. The > original / python-time [patch](http://cr.openjdk.java.net/~iignatyev//jcheck/problem-list/webrev.00/index.html) used a > list glob-pattern, but unfortunately, Java SE doesn't have a good(fast) API to find all files matching a glob, and I > didn't want to bring 3rd party dependency just for this use-case. Thanks, > -- Igor Igor Ignatyev 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: Merge branch 'master' into master ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/518/files - new: https://git.openjdk.java.net/skara/pull/518/files/24310cd9..9194d35f Webrevs: - full: https://webrevs.openjdk.java.net/skara/518/webrev.03 - incr: https://webrevs.openjdk.java.net/skara/518/webrev.02-03 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/518.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/518/head:pull/518 PR: https://git.openjdk.java.net/skara/pull/518 From iignatyev at openjdk.java.net Mon Mar 23 14:40:30 2020 From: iignatyev at openjdk.java.net (Igor Ignatyev) Date: Mon, 23 Mar 2020 14:40:30 GMT Subject: [Rev 04] RFR: jcheck: add "problemlists" check In-Reply-To: References: Message-ID: <3BybmgVIAjTttPnl0pdWsG5nj4mtb-U1JG2UD4IleoU=.666ff05c-65f3-40a0-bf04-1ef5f7b398e0@github.com> > Hi all, > > This is more of a request for comments than an actual PR. > > The idea behind the patch is to ensure that whenever someone fixes a bug, its ID is not used in any of the problem > lists. As some of you might know this is not a hypothetical issue, people forget to clean problem lists quite often, > which in some cases results in poorly tested patches. Although it's true that even if we ensure that all commits are > correct, there still will be ways to have "fixed" bugs in problem lists, e.g. closing as WNF, duplicate, etc, it's > nevertheless believed that the majority (or the most annoying) "violations" are caused by commits. The proposed check > parses all problem lists specified by `dirs` (bar-separated list of test suites) and `pattern` (regexp pattern for > files withing the `dirs`) and verifies that none of the issues fixed by a patch is listed in any of problem lists. The > original / python-time [patch](http://cr.openjdk.java.net/~iignatyev//jcheck/problem-list/webrev.00/index.html) used a > list glob-pattern, but unfortunately, Java SE doesn't have a good(fast) API to find all files matching a glob, and I > didn't want to bring 3rd party dependency just for this use-case. Thanks, > -- Igor Igor Ignatyev has updated the pull request incrementally with one additional commit since the last revision: updated copyright years ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/518/files - new: https://git.openjdk.java.net/skara/pull/518/files/9194d35f..69d89d39 Webrevs: - full: https://webrevs.openjdk.java.net/skara/518/webrev.04 - incr: https://webrevs.openjdk.java.net/skara/518/webrev.03-04 Stats: 6 lines in 6 files changed: 0 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/518.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/518/head:pull/518 PR: https://git.openjdk.java.net/skara/pull/518 From iignatyev at openjdk.java.net Mon Mar 23 14:42:44 2020 From: iignatyev at openjdk.java.net (Igor Ignatyev) Date: Mon, 23 Mar 2020 14:42:44 GMT Subject: [Rev 02] RFR: jcheck: add "problemlists" check In-Reply-To: <7J-5nCuVhXhRbhlUdndV5bQOcOyiBoXTif4w8dzYFS8=.d9bb7fcc-af84-4eb2-a253-55a01ed62e4a@github.com> References: <5Xi1wgM12b4qg8HAz_hsXACvqnP7VnZdBOkCJxSck18=.f17e6f03-1afe-4123-b35d-b72ad8ba8d3d@github.com> <7J-5nCuVhXhRbhlUdndV5bQOcOyiBoXTif4w8dzYFS8=.d9bb7fcc-af84-4eb2-a253-55a01ed62e4a@github.com> Message-ID: <-vP2C4Cih93vDYQqjVsWoqVKAqMPL9sEhKsavTZi748=.b8efa4a9-807c-4ad5-8018-80cfdd565a95@github.com> On Mon, 23 Mar 2020 14:22:26 GMT, Erik Helin wrote: >> Looks good! > > Great work on the patch and on the tests Igor, this is a really solid contribution! ?? > As you probably noticed I took the liberty of editing the title of this pull request to align more with Skara's > (totally undocumented) conventions, I hope you don't mind? >> there is one thing which I would like to discuss before we (hopefully) get it integrated -- the default value for >> `dirs`. as `ProblemListsCheck` will most probably be used only by "jdk-based" project, it might make sense to use >> values which reflects jdk layout (`test/jdk|test/langtools|test/hotspot/jtreg|test/nashorn|test/jaxp`) so most projects >> will be able to use the default value, on the other hand, I don't want to bake in the current directory layout, so I >> defaulted `dirs` to `test` which thought isn't good for any of the existing OpenJDK projects. so what do you think? > > I think defaulting to `test` is fine, I prefer that OpenJDK projects have to specify the directories containing > `ProblemList.txt` files in their `.jcheck/conf`. That makes it clear which files that will actually be considered. >> BTW, should I update copyright years in all the touched files? > > Yes please ?? Erik, thanks for reviewing this! I've updated copyrights in (hopefully) all the files. and yeah, I'm totally fine with the updated PR's title. ------------- PR: https://git.openjdk.java.net/skara/pull/518 From ehelin at openjdk.java.net Mon Mar 23 15:58:16 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 23 Mar 2020 15:58:16 GMT Subject: [Integrated] RFR: WIP/RFC: added ProblemLists check to jcheck In-Reply-To: References: Message-ID: <6b05061a-ef09-404b-83b9-cac849465a1f@openjdk.org> Changeset: 0fec136a Author: Igor Ignatyev Committer: Erik Helin Date: 2020-03-23 15:58:03 +0000 URL: https://git.openjdk.java.net/skara/commit/0fec136a jcheck: add "problemlists" check Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestCheckIssueVisitor.java ! cli/src/main/java/org/openjdk/skara/cli/JCheckCLIVisitor.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/ChecksConfiguration.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/IssueVisitor.java ! jcheck/src/main/java/org/openjdk/skara/jcheck/JCheck.java + jcheck/src/main/java/org/openjdk/skara/jcheck/ProblemListsCheck.java + jcheck/src/main/java/org/openjdk/skara/jcheck/ProblemListsConfiguration.java + jcheck/src/main/java/org/openjdk/skara/jcheck/ProblemListsIssue.java ! jcheck/src/test/java/org/openjdk/skara/jcheck/JCheckTests.java + jcheck/src/test/java/org/openjdk/skara/jcheck/ProblemListsCheckTests.java From ehelin at openjdk.java.net Tue Mar 24 07:29:54 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 24 Mar 2020 07:29:54 GMT Subject: RFR: mirror-bot: support mirroring of selected branches Message-ID: Hi all, please review this patch that enables the mirror bot to mirror only selected branches (instead of all as is done today). This is useful for projects who might have a `master` that is a replica of `jdk:master`, but don't want tags (nor potentially other branches) from the [jdk](https://git.openjdk.java.net/jdk) repository. Testing: - `make test` passes on Linux x64 - Added a new unit test Thanks, Erik ------------- Commit messages: - mirror-bot: support mirroring of selected branches Changes: https://git.openjdk.java.net/skara/pull/536/files Webrev: https://webrevs.openjdk.java.net/skara/536/webrev.00 Stats: 92 lines in 3 files changed: 85 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/536.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/536/head:pull/536 PR: https://git.openjdk.java.net/skara/pull/536 From rwestberg at openjdk.java.net Tue Mar 24 07:39:24 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 24 Mar 2020 07:39:24 GMT Subject: RFR: mirror-bot: support mirroring of selected branches In-Reply-To: References: Message-ID: <6wPb2-5fVtYWC27TShUgokM02Fdzu3nTgUwekUR-a08=.e0299c56-fe30-4329-ad3b-d670f49511b6@github.com> On Tue, 24 Mar 2020 07:25:57 GMT, Erik Helin wrote: > Hi all, > > please review this patch that enables the mirror bot to mirror only selected > branches (instead of all as is done today). This is useful for projects who > might have a `master` that is a replica of `jdk:master`, but don't want tags > (nor potentially other branches) from the > [jdk](https://git.openjdk.java.net/jdk) repository. > > Testing: > - `make test` passes on Linux x64 > - Added a new unit test > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/536 From kcr at openjdk.java.net Tue Mar 24 11:58:54 2020 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Tue, 24 Mar 2020 11:58:54 GMT Subject: RFR: mirror-bot: support mirroring of selected branches In-Reply-To: <6wPb2-5fVtYWC27TShUgokM02Fdzu3nTgUwekUR-a08=.e0299c56-fe30-4329-ad3b-d670f49511b6@github.com> References: <6wPb2-5fVtYWC27TShUgokM02Fdzu3nTgUwekUR-a08=.e0299c56-fe30-4329-ad3b-d670f49511b6@github.com> Message-ID: On Tue, 24 Mar 2020 07:37:11 GMT, Robin Westberg wrote: >> Hi all, >> >> please review this patch that enables the mirror bot to mirror only selected >> branches (instead of all as is done today). This is useful for projects who >> might have a `master` that is a replica of `jdk:master`, but don't want tags >> (nor potentially other branches) from the >> [jdk](https://git.openjdk.java.net/jdk) repository. >> >> Testing: >> - `make test` passes on Linux x64 >> - Added a new unit test >> >> Thanks, >> Erik > > Looks good! Nice. Would it be possible to have an option to also sync reachable tags, using `git push --follow-tags` in the case where only a single branch is mirrored? ------------- PR: https://git.openjdk.java.net/skara/pull/536 From ehelin at openjdk.java.net Tue Mar 24 12:35:46 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 24 Mar 2020 12:35:46 GMT Subject: [Integrated] RFR: mirror-bot: support mirroring of selected branches In-Reply-To: References: Message-ID: Changeset: 1ad79ab5 Author: Erik Helin Date: 2020-03-24 12:35:34 +0000 URL: https://git.openjdk.java.net/skara/commit/1ad79ab5 mirror-bot: support mirroring of selected branches Reviewed-by: rwestberg ! bots/mirror/src/main/java/org/openjdk/skara/bots/mirror/MirrorBot.java ! bots/mirror/src/main/java/org/openjdk/skara/bots/mirror/MirrorBotFactory.java ! bots/mirror/src/test/java/org/openjdk/skara/bots/mirror/MirrorBotTests.java From ehelin at openjdk.java.net Tue Mar 24 12:37:14 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 24 Mar 2020 12:37:14 GMT Subject: RFR: mirror-bot: support mirroring of selected branches In-Reply-To: References: <6wPb2-5fVtYWC27TShUgokM02Fdzu3nTgUwekUR-a08=.e0299c56-fe30-4329-ad3b-d670f49511b6@github.com> Message-ID: On Tue, 24 Mar 2020 11:56:16 GMT, Kevin Rushforth wrote: >> Looks good! > > Nice. Would it be possible to have an option to also sync reachable tags, using `git push --follow-tags` in the case > where only a single branch is mirrored? @kevinrushforth yes, I thought about adding that as the next feature ?? ------------- PR: https://git.openjdk.java.net/skara/pull/536 From ehelin at openjdk.java.net Tue Mar 24 12:41:34 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 24 Mar 2020 12:41:34 GMT Subject: RFR: git-pr: use commit message from most recent commit Message-ID: Hi all, please review this patch that ensure that `git pr create` always use the subject from the most recent commit as the title for the pull request. Furthermore `git pr create` will now also require a body for the pull request to be present. Testing: - Manual testing of `git pr create` on Linux x64 Thanks, Erik ------------- Commit messages: - git-pr: use commit message from most recent commit Changes: https://git.openjdk.java.net/skara/pull/537/files Webrev: https://webrevs.openjdk.java.net/skara/537/webrev.00 Stats: 9 lines in 1 file changed: 2 ins; 2 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/537.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/537/head:pull/537 PR: https://git.openjdk.java.net/skara/pull/537 From jai.forums2013 at gmail.com Tue Mar 24 12:42:35 2020 From: jai.forums2013 at gmail.com (Jaikiran Pai) Date: Tue, 24 Mar 2020 18:12:35 +0530 Subject: git webrev is extremely silent In-Reply-To: <7caec1e0-1f95-30f4-6d32-e4a3ef4be757@gmail.com> References: <7caec1e0-1f95-30f4-6d32-e4a3ef4be757@gmail.com> Message-ID: Any thoughts? -Jaikiran On 19/03/20 8:26 am, Jaikiran Pai wrote: > I have just started using the skara CLI tools to generate patches for > the jdk repositories. I am used to using the (original) webrev. When > using the original webrev, you see a bunch of "activity" that gets > logged on the screen and it finally writes out the patch where the > webrev changeset is generated. > > However, when I run the "git webrev" command (sometimes with additional > options), it just silently returns. The first few times I tried it, I > thought it wasn't really working. It's only when I looked for directory > listing of potential places, where it might have generated the webrevs, > did I realize that the webrev was being generated successfully and it's > just that the git webrev command it way too silent and doesn't generate > any messages. > > Adding a final summary, after the command executes successfully, > including the location where the webrev was generated would help, IMO. > Would this be considered a reasonable enhancement? > > -Jaikiran > > From magnus.ihse.bursie at oracle.com Tue Mar 24 12:51:36 2020 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Tue, 24 Mar 2020 13:51:36 +0100 Subject: git webrev is extremely silent In-Reply-To: References: <7caec1e0-1f95-30f4-6d32-e4a3ef4be757@gmail.com> Message-ID: On 2020-03-24 13:42, Jaikiran Pai wrote: > Any thoughts? I agree, we need not follow the user-unfriendly unix-style of "no output means success". Perhaps just a confirmation message like "Webrev generated in " would be nice. /Magnus > > -Jaikiran > > On 19/03/20 8:26 am, Jaikiran Pai wrote: >> I have just started using the skara CLI tools to generate patches for >> the jdk repositories. I am used to using the (original) webrev. When >> using the original webrev, you see a bunch of "activity" that gets >> logged on the screen and it finally writes out the patch where the >> webrev changeset is generated. >> >> However, when I run the "git webrev" command (sometimes with additional >> options), it just silently returns. The first few times I tried it, I >> thought it wasn't really working. It's only when I looked for directory >> listing of potential places, where it might have generated the webrevs, >> did I realize that the webrev was being generated successfully and it's >> just that the git webrev command it way too silent and doesn't generate >> any messages. >> >> Adding a final summary, after the command executes successfully, >> including the location where the webrev was generated would help, IMO. >> Would this be considered a reasonable enhancement? >> >> -Jaikiran >> >> From kevin.rushforth at oracle.com Tue Mar 24 12:56:35 2020 From: kevin.rushforth at oracle.com (Kevin Rushforth) Date: Tue, 24 Mar 2020 05:56:35 -0700 Subject: git webrev is extremely silent In-Reply-To: References: <7caec1e0-1f95-30f4-6d32-e4a3ef4be757@gmail.com> Message-ID: <4645aa49-566b-07e3-2842-ceb64d340f17@oracle.com> I agree. A "--quiet" option could be added for cases where you want it to be silent. -- Kevin On 3/24/2020 5:51 AM, Magnus Ihse Bursie wrote: > On 2020-03-24 13:42, Jaikiran Pai wrote: >> Any thoughts? > I agree, we need not follow the user-unfriendly unix-style of "no > output means success". Perhaps just a confirmation message like > "Webrev generated in " would be nice. > > /Magnus >> >> -Jaikiran >> >> On 19/03/20 8:26 am, Jaikiran Pai wrote: >>> I have just started using the skara CLI tools to generate patches for >>> the jdk repositories. I am used to using the (original) webrev. When >>> using the original webrev, you see a bunch of "activity" that gets >>> logged on the screen and it finally writes out the patch where the >>> webrev changeset is generated. >>> >>> However, when I run the "git webrev" command (sometimes with additional >>> options), it just silently returns. The first few times I tried it, I >>> thought it wasn't really working. It's only when I looked for directory >>> listing of potential places, where it might have generated the webrevs, >>> did I realize that the webrev was being generated successfully and it's >>> just that the git webrev command it way too silent and doesn't generate >>> any messages. >>> >>> Adding a final summary, after the command executes successfully, >>> including the location where the webrev was generated would help, IMO. >>> Would this be considered a reasonable enhancement? >>> >>> -Jaikiran >>> >>> > From jai.forums2013 at gmail.com Tue Mar 24 13:39:52 2020 From: jai.forums2013 at gmail.com (Jaikiran Pai) Date: Tue, 24 Mar 2020 19:09:52 +0530 Subject: git webrev is extremely silent In-Reply-To: <4645aa49-566b-07e3-2842-ceb64d340f17@oracle.com> References: <7caec1e0-1f95-30f4-6d32-e4a3ef4be757@gmail.com> <4645aa49-566b-07e3-2842-ceb64d340f17@oracle.com> Message-ID: <7a8079d1-fbbc-06a0-477a-0d9573e364da@gmail.com> Thanks everyone. I have created an enhancement request for this https://bugs.openjdk.java.net/browse/SKARA-327 -Jaikiran On 24/03/20 6:26 pm, Kevin Rushforth wrote: > I agree. A "--quiet" option could be added for cases where you want it > to be silent. > > -- Kevin > > > On 3/24/2020 5:51 AM, Magnus Ihse Bursie wrote: >> On 2020-03-24 13:42, Jaikiran Pai wrote: >>> Any thoughts? >> I agree, we need not follow the user-unfriendly unix-style of "no >> output means success". Perhaps just a confirmation message like >> "Webrev generated in " would be nice. >> >> /Magnus >>> >>> -Jaikiran >>> >>> On 19/03/20 8:26 am, Jaikiran Pai wrote: >>>> I have just started using the skara CLI tools to generate patches for >>>> the jdk repositories. I am used to using the (original) webrev. When >>>> using the original webrev, you see a bunch of "activity" that gets >>>> logged on the screen and it finally writes out the patch where the >>>> webrev changeset is generated. >>>> >>>> However, when I run the "git webrev" command (sometimes with >>>> additional >>>> options), it just silently returns. The first few times I tried it, I >>>> thought it wasn't really working. It's only when I looked for >>>> directory >>>> listing of potential places, where it might have generated the >>>> webrevs, >>>> did I realize that the webrev was being generated successfully and >>>> it's >>>> just that the git webrev command it way too silent and doesn't >>>> generate >>>> any messages. >>>> >>>> Adding a final summary, after the command executes successfully, >>>> including the location where the webrev was generated would help, IMO. >>>> Would this be considered a reasonable enhancement? >>>> >>>> -Jaikiran >>>> >>>> >> > From rwestberg at openjdk.java.net Wed Mar 25 08:48:39 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 25 Mar 2020 08:48:39 GMT Subject: RFR: 321: No RFR mail is sent if a PR is integrated very quickly Message-ID: Hi all, Please review this change that enables sending notification emails for PRs that have been integrated before an RFR mail was created. Best regards, Robin ------------- Commit messages: - Add support for sending mails for quickly integrated PRs Changes: https://git.openjdk.java.net/skara/pull/538/files Webrev: https://webrevs.openjdk.java.net/skara/538/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-321 Stats: 207 lines in 8 files changed: 185 ins; 1 del; 21 mod Patch: https://git.openjdk.java.net/skara/pull/538.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/538/head:pull/538 PR: https://git.openjdk.java.net/skara/pull/538 From rwestberg at openjdk.java.net Wed Mar 25 09:58:55 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 25 Mar 2020 09:58:55 GMT Subject: RFR: git-pr: use commit message from most recent commit In-Reply-To: References: Message-ID: On Tue, 24 Mar 2020 12:37:33 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensure that `git pr create` always use the subject > from the most recent commit as the title for the pull request. Furthermore > `git pr create` will now also require a body for the pull request to be present. > > Testing: > - Manual testing of `git pr create` on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/537 From rwestberg at openjdk.java.net Wed Mar 25 10:00:56 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 25 Mar 2020 10:00:56 GMT Subject: [Rev 01] RFR: 321: No RFR mail is sent if a PR is integrated very quickly In-Reply-To: References: Message-ID: > Hi all, > > Please review this change that enables sending notification emails for PRs that have been integrated before an RFR mail > was created. > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Fix failing test ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/538/files - new: https://git.openjdk.java.net/skara/pull/538/files/87955b15..01f1b169 Webrevs: - full: https://webrevs.openjdk.java.net/skara/538/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/538/webrev.00-01 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/538.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/538/head:pull/538 PR: https://git.openjdk.java.net/skara/pull/538 From ehelin at openjdk.java.net Wed Mar 25 11:05:47 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 25 Mar 2020 11:05:47 GMT Subject: [Integrated] RFR: git-pr: use commit message from most recent commit In-Reply-To: References: Message-ID: <22d3c9ba-a078-4edb-8c86-13c90377bfa6@openjdk.org> Changeset: 84586abc Author: Erik Helin Date: 2020-03-25 11:05:32 +0000 URL: https://git.openjdk.java.net/skara/commit/84586abc git-pr: use commit message from most recent commit Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/pr/GitPrCreate.java From ehelin at openjdk.java.net Wed Mar 25 11:06:34 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 25 Mar 2020 11:06:34 GMT Subject: RFR: vcs: use --recurse-submodules when pulling Message-ID: <_SPFenOSeSRzf9S0SU7WwMQ3ylCGGhKgZTiZXvzoJpI=.93839922-11c2-4e31-85a4-8b782dd8d50e@github.com> Hi all, please review this small patch that adds `--recurse-submodules` when running `GitRepository.pull`. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - vcs: use --recurse-submodules when pulling Changes: https://git.openjdk.java.net/skara/pull/539/files Webrev: https://webrevs.openjdk.java.net/skara/539/webrev.00 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/539.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/539/head:pull/539 PR: https://git.openjdk.java.net/skara/pull/539 From ehelin at openjdk.java.net Wed Mar 25 11:08:44 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 25 Mar 2020 11:08:44 GMT Subject: [Rev 01] RFR: 321: No RFR mail is sent if a PR is integrated very quickly In-Reply-To: References: Message-ID: <-wbop5zeTNzyV-4ZmPf2XM7VcVRu7EIrjck1dPi_Oqc=.de9a1b1b-02af-4841-ba7a-49cd7476b508@github.com> On Wed, 25 Mar 2020 10:00:56 GMT, Robin Westberg wrote: >> Hi all, >> >> Please review this change that enables sending notification emails for PRs that have been integrated before an RFR mail >> was created. >> Best regards, >> Robin > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Fix failing test Looks good! Funny with the "FYI" prefix, I like it ?? ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/538 From rwestberg at openjdk.java.net Wed Mar 25 11:34:48 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 25 Mar 2020 11:34:48 GMT Subject: [Integrated] RFR: 321: No RFR mail is sent if a PR is integrated very quickly In-Reply-To: References: Message-ID: <054fd90a-fdf1-4004-9156-fd42305b6af2@openjdk.org> Changeset: 899d3b67 Author: Robin Westberg Date: 2020-03-25 11:34:32 +0000 URL: https://git.openjdk.java.net/skara/commit/899d3b67 321: No RFR mail is sent if a PR is integrated very quickly Reviewed-by: ehelin ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBot.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java ! test/src/main/java/org/openjdk/skara/test/TestHost.java ! test/src/main/java/org/openjdk/skara/test/TestHostedRepository.java From rwestberg at openjdk.java.net Wed Mar 25 11:35:23 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 25 Mar 2020 11:35:23 GMT Subject: RFR: vcs: use --recurse-submodules when pulling In-Reply-To: <_SPFenOSeSRzf9S0SU7WwMQ3ylCGGhKgZTiZXvzoJpI=.93839922-11c2-4e31-85a4-8b782dd8d50e@github.com> References: <_SPFenOSeSRzf9S0SU7WwMQ3ylCGGhKgZTiZXvzoJpI=.93839922-11c2-4e31-85a4-8b782dd8d50e@github.com> Message-ID: <_EhQC0607A7tmF2U3_YWRWdHSXxO6kedJSOtngi9P5U=.fb5ebf88-60f1-459c-af35-81fa71578325@github.com> On Wed, 25 Mar 2020 11:03:01 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds `--recurse-submodules` when running > `GitRepository.pull`. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/539 From ehelin at openjdk.java.net Wed Mar 25 12:14:56 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 25 Mar 2020 12:14:56 GMT Subject: [Integrated] RFR: vcs: use --recurse-submodules when pulling In-Reply-To: <_SPFenOSeSRzf9S0SU7WwMQ3ylCGGhKgZTiZXvzoJpI=.93839922-11c2-4e31-85a4-8b782dd8d50e@github.com> References: <_SPFenOSeSRzf9S0SU7WwMQ3ylCGGhKgZTiZXvzoJpI=.93839922-11c2-4e31-85a4-8b782dd8d50e@github.com> Message-ID: <60f4ef86-81af-4913-97b3-c937cfd5d40a@openjdk.org> Changeset: 0863029c Author: Erik Helin Date: 2020-03-25 12:14:43 +0000 URL: https://git.openjdk.java.net/skara/commit/0863029c vcs: use --recurse-submodules when pulling Reviewed-by: rwestberg ! vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java From ehelin at openjdk.java.net Wed Mar 25 14:09:56 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 25 Mar 2020 14:09:56 GMT Subject: RFR: merge-bot: update merge conflict message Message-ID: <_f1_5ilVlIzWAo_t8Eaa2M_VEpQ4NC4XKeqSPTyBMNs=.a95ca445-4f3f-492d-908e-b19f37589d30@github.com> Hi all, please review this patch that updates the message in automatic merge conflict pull requests. For an example, see . Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - merge-bot: update merge conflict message Changes: https://git.openjdk.java.net/skara/pull/540/files Webrev: https://webrevs.openjdk.java.net/skara/540/webrev.00 Stats: 52 lines in 1 file changed: 20 ins; 5 del; 27 mod Patch: https://git.openjdk.java.net/skara/pull/540.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/540/head:pull/540 PR: https://git.openjdk.java.net/skara/pull/540 From rwestberg at openjdk.java.net Wed Mar 25 14:11:12 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 25 Mar 2020 14:11:12 GMT Subject: RFR: merge-bot: update merge conflict message In-Reply-To: <_f1_5ilVlIzWAo_t8Eaa2M_VEpQ4NC4XKeqSPTyBMNs=.a95ca445-4f3f-492d-908e-b19f37589d30@github.com> References: <_f1_5ilVlIzWAo_t8Eaa2M_VEpQ4NC4XKeqSPTyBMNs=.a95ca445-4f3f-492d-908e-b19f37589d30@github.com> Message-ID: On Wed, 25 Mar 2020 14:06:03 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates the message in automatic merge conflict > pull requests. For an example, see . > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good, well done! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/540 From ehelin at openjdk.java.net Wed Mar 25 14:19:24 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 25 Mar 2020 14:19:24 GMT Subject: [Integrated] RFR: merge-bot: update merge conflict message In-Reply-To: <_f1_5ilVlIzWAo_t8Eaa2M_VEpQ4NC4XKeqSPTyBMNs=.a95ca445-4f3f-492d-908e-b19f37589d30@github.com> References: <_f1_5ilVlIzWAo_t8Eaa2M_VEpQ4NC4XKeqSPTyBMNs=.a95ca445-4f3f-492d-908e-b19f37589d30@github.com> Message-ID: Changeset: 92cc5c5c Author: Erik Helin Date: 2020-03-25 14:19:12 +0000 URL: https://git.openjdk.java.net/skara/commit/92cc5c5c merge-bot: update merge conflict message Reviewed-by: rwestberg ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java From ehelin at openjdk.java.net Wed Mar 25 15:15:28 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 25 Mar 2020 15:15:28 GMT Subject: RFR: cli: use credentials when pushing to https URLs Message-ID: Hi all, please review this patch that makes `git-sync` and `git-publish` use credentials when they are pushing to `https://` URLs. I also update all `git-pr` to approve credentials that have been used successfully. Testing: - Manual testing of `git-sync`, `git-publish` and `git-pr` together with `https://` URLs Thanks, Erik ------------- Commit messages: - cli: use credentials when pushing to https URLs Changes: https://git.openjdk.java.net/skara/pull/541/files Webrev: https://webrevs.openjdk.java.net/skara/541/webrev.00 Stats: 76 lines in 3 files changed: 72 ins; 4 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/541.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/541/head:pull/541 PR: https://git.openjdk.java.net/skara/pull/541 From rwestberg at openjdk.java.net Wed Mar 25 16:15:32 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 25 Mar 2020 16:15:32 GMT Subject: RFR: cli: use credentials when pushing to https URLs In-Reply-To: References: Message-ID: On Wed, 25 Mar 2020 15:11:30 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `git-sync` and `git-publish` use credentials > when they are pushing to `https://` URLs. I also update all `git-pr` to approve > credentials that have been used successfully. > > Testing: > - Manual testing of `git-sync`, `git-publish` and `git-pr` together with > `https://` URLs > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/541 From ehelin at openjdk.java.net Wed Mar 25 16:17:04 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 25 Mar 2020 16:17:04 GMT Subject: [Integrated] RFR: cli: use credentials when pushing to https URLs In-Reply-To: References: Message-ID: <8d33d6c7-8c3e-4484-91da-149bc294496e@openjdk.org> Changeset: 4b702e77 Author: Erik Helin Date: 2020-03-25 16:16:50 +0000 URL: https://git.openjdk.java.net/skara/commit/4b702e77 cli: use credentials when pushing to https URLs Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitPublish.java ! cli/src/main/java/org/openjdk/skara/cli/GitSync.java ! cli/src/main/java/org/openjdk/skara/cli/pr/Utils.java From rwestberg at openjdk.java.net Thu Mar 26 09:01:41 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 26 Mar 2020 09:01:41 GMT Subject: RFR: Use a different (empty) thread prefix for failed automerge PRs Message-ID: Hi all, Please review this change that skips the "RFR: " prefix on mailing list threads initiated by a failed automerge PR. Best regards, Robin ------------- Commit messages: - Use a different (empty) thread prefix for failed automerge PRs Changes: https://git.openjdk.java.net/skara/pull/542/files Webrev: https://webrevs.openjdk.java.net/skara/542/webrev.00 Stats: 67 lines in 5 files changed: 60 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/542.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/542/head:pull/542 PR: https://git.openjdk.java.net/skara/pull/542 From ehelin at openjdk.java.net Thu Mar 26 09:32:06 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 26 Mar 2020 09:32:06 GMT Subject: RFR: Use a different (empty) thread prefix for failed automerge PRs In-Reply-To: References: Message-ID: <9R5thNeNysB2K69vJUBbhndezcURiRcJRUMy6onTNnw=.f721a964-fe6f-4775-8647-2b3708befb9a@github.com> On Thu, 26 Mar 2020 08:57:09 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that skips the "RFR: " prefix on mailing list threads initiated by a failed automerge PR. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/542 From rwestberg at openjdk.java.net Thu Mar 26 09:34:39 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 26 Mar 2020 09:34:39 GMT Subject: [Integrated] RFR: Use a different (empty) thread prefix for failed automerge PRs In-Reply-To: References: Message-ID: Changeset: c2bf15e6 Author: Robin Westberg Date: 2020-03-26 09:34:26 +0000 URL: https://git.openjdk.java.net/skara/commit/c2bf15e6 Use a different (empty) thread prefix for failed automerge PRs Reviewed-by: ehelin ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java ! bots/merge/src/test/java/org/openjdk/skara/bots/merge/MergeBotTests.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveItem.java ! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java ! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java From rwestberg at openjdk.java.net Thu Mar 26 12:38:17 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 26 Mar 2020 12:38:17 GMT Subject: git: openjdk/skara: Catch exceptions caused by trying to look up issues during jcheck Message-ID: Changeset: 6b490db5 Author: Robin Westberg Date: 2020-03-26 12:38:02 +0000 URL: https://git.openjdk.java.net/skara/commit/6b490db5 Catch exceptions caused by trying to look up issues during jcheck Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java From ehelin at openjdk.java.net Thu Mar 26 12:41:33 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 26 Mar 2020 12:41:33 GMT Subject: FYI: Catch exceptions caused by trying to look up issues during jcheck In-Reply-To: References: Message-ID: On Thu, 26 Mar 2020 12:34:57 GMT, Robin Westberg wrote: > Hi all, > > Please review this small fix that catches exceptions that occur when trying to lookup information on Jira issues during > a check run, as the information is only used for informational purposes. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/543 From rwestberg at openjdk.java.net Thu Mar 26 12:41:33 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 26 Mar 2020 12:41:33 GMT Subject: FYI: Catch exceptions caused by trying to look up issues during jcheck Message-ID: Hi all, Please review this small fix that catches exceptions that occur when trying to lookup information on Jira issues during a check run, as the information is only used for informational purposes. Best regards, Robin ------------- Commit messages: - Catch exceptions caused by trying to look up issues during jcheck Changes: https://git.openjdk.java.net/skara/pull/543/files Webrev: https://webrevs.openjdk.java.net/skara/543/webrev.00 Stats: 18 lines in 1 file changed: 7 ins; 1 del; 10 mod Patch: https://git.openjdk.java.net/skara/pull/543.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/543/head:pull/543 PR: https://git.openjdk.java.net/skara/pull/543 From ehelin at openjdk.java.net Thu Mar 26 12:46:48 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 26 Mar 2020 12:46:48 GMT Subject: RFR: csr-bot: allow other bots to run Message-ID: Hi all, please review this embarrassing patch that makes other bots allowed to run at the same time as the `CSRBot`. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - csr-bot: allow other bots to run Changes: https://git.openjdk.java.net/skara/pull/544/files Webrev: https://webrevs.openjdk.java.net/skara/544/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/544.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/544/head:pull/544 PR: https://git.openjdk.java.net/skara/pull/544 From ehelin at openjdk.java.net Thu Mar 26 12:52:34 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 26 Mar 2020 12:52:34 GMT Subject: [Integrated] RFR: csr-bot: allow other bots to run In-Reply-To: References: Message-ID: <7fa6a946-c712-4d7d-bb3d-c967d95642f5@openjdk.org> Changeset: c4dee6be Author: Erik Helin Date: 2020-03-26 12:52:18 +0000 URL: https://git.openjdk.java.net/skara/commit/c4dee6be csr-bot: allow other bots to run Reviewed-by: rwestberg ! bots/csr/src/main/java/org/openjdk/skara/bots/csr/CSRBot.java From rwestberg at openjdk.java.net Thu Mar 26 12:53:40 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 26 Mar 2020 12:53:40 GMT Subject: RFR: csr-bot: allow other bots to run In-Reply-To: References: Message-ID: On Thu, 26 Mar 2020 12:42:27 GMT, Erik Helin wrote: > Hi all, > > please review this embarrassing patch that makes other bots allowed to run at > the same time as the `CSRBot`. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/544 From rwestberg at openjdk.java.net Thu Mar 26 14:15:33 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 26 Mar 2020 14:15:33 GMT Subject: git: openjdk/skara: The merge bot should use hostedrepository with proper credentials Message-ID: <1b840929-2e6e-4885-8315-13cccdb6b80b@openjdk.org> Changeset: f422eab8 Author: Robin Westberg Date: 2020-03-26 14:15:19 +0000 URL: https://git.openjdk.java.net/skara/commit/f422eab8 The merge bot should use hostedrepository with proper credentials Reviewed-by: ehelin ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java From rwestberg at openjdk.java.net Thu Mar 26 14:19:01 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 26 Mar 2020 14:19:01 GMT Subject: FYI: The merge bot should use hostedrepository with proper credentials Message-ID: <586Ojf5ARK4A6b_qP_fvWkKhmf7m5v4emJB_8YxPQd8=.b6ac7766-551f-4133-9349-33950c269829@github.com> Hi all, Please review this small change that ensures that when the merge bot tries to add a label, it uses proper credentials. Best regards, Robin ------------- Commit messages: - Use hostedrepository with proper credentials Changes: https://git.openjdk.java.net/skara/pull/545/files Webrev: https://webrevs.openjdk.java.net/skara/545/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/545.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/545/head:pull/545 PR: https://git.openjdk.java.net/skara/pull/545 From ehelin at openjdk.java.net Thu Mar 26 14:19:01 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 26 Mar 2020 14:19:01 GMT Subject: FYI: The merge bot should use hostedrepository with proper credentials In-Reply-To: <586Ojf5ARK4A6b_qP_fvWkKhmf7m5v4emJB_8YxPQd8=.b6ac7766-551f-4133-9349-33950c269829@github.com> References: <586Ojf5ARK4A6b_qP_fvWkKhmf7m5v4emJB_8YxPQd8=.b6ac7766-551f-4133-9349-33950c269829@github.com> Message-ID: On Thu, 26 Mar 2020 14:09:37 GMT, Robin Westberg wrote: > Hi all, > > Please review this small change that ensures that when the merge bot tries to add a label, it uses proper credentials. > > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/545 From ehelin at openjdk.java.net Fri Mar 27 10:08:06 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 27 Mar 2020 10:08:06 GMT Subject: RFR: forge: add HostedRepository.nonTransformedWebUrl Message-ID: Hi all, please review this patch that adds the method `HostedRepository.nonTransformedWebUrl`. This will be used in a follow-up patch to improve the message from the `MergeBot`. Testing: - `make test` passes on Linux x64 - Added one new unit test Thanks, Erik ------------- Commit messages: - forge: add HostedRepository.nonTransformedWebUrl Changes: https://git.openjdk.java.net/skara/pull/546/files Webrev: https://webrevs.openjdk.java.net/skara/546/webrev.00 Stats: 37 lines in 7 files changed: 36 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/546.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/546/head:pull/546 PR: https://git.openjdk.java.net/skara/pull/546 From rwestberg at openjdk.java.net Fri Mar 27 10:09:11 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 27 Mar 2020 10:09:11 GMT Subject: RFR: forge: add HostedRepository.nonTransformedWebUrl In-Reply-To: References: Message-ID: On Fri, 27 Mar 2020 10:02:38 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the method `HostedRepository.nonTransformedWebUrl`. This will be used in a follow-up > patch to improve the message from the `MergeBot`. > Testing: > - `make test` passes on Linux x64 > - Added one new unit test > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/546 From ehelin at openjdk.java.net Fri Mar 27 14:14:13 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 27 Mar 2020 14:14:13 GMT Subject: [Integrated] RFR: forge: add HostedRepository.nonTransformedWebUrl In-Reply-To: References: Message-ID: <9369d918-fd18-41db-b067-832c7a11fdec@openjdk.org> Changeset: 0bcda973 Author: Erik Helin Date: 2020-03-27 14:13:59 +0000 URL: https://git.openjdk.java.net/skara/commit/0bcda973 forge: add HostedRepository.nonTransformedWebUrl 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/GitHubHost.java ! forge/src/main/java/org/openjdk/skara/forge/github/GitHubRepository.java ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java ! forge/src/test/java/org/openjdk/skara/forge/github/GitHubHostTests.java ! test/src/main/java/org/openjdk/skara/test/TestHostedRepository.java From ehelin at openjdk.java.net Fri Mar 27 15:01:56 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 27 Mar 2020 15:01:56 GMT Subject: RFR: merge-bot: minor improvements to message Message-ID: Hi all, please review these refinements to instructions from the merge bot. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - merge-bot: minor improvements to message Changes: https://git.openjdk.java.net/skara/pull/547/files Webrev: https://webrevs.openjdk.java.net/skara/547/webrev.00 Stats: 5 lines in 1 file changed: 0 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/547.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/547/head:pull/547 PR: https://git.openjdk.java.net/skara/pull/547 From rwestberg at openjdk.java.net Mon Mar 30 10:09:11 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 30 Mar 2020 10:09:11 GMT Subject: RFR: merge-bot: minor improvements to message In-Reply-To: References: Message-ID: On Fri, 27 Mar 2020 14:56:11 GMT, Erik Helin wrote: > Hi all, > > please review these refinements to instructions from the merge bot. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/547 From ehelin at openjdk.java.net Mon Mar 30 10:12:01 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 30 Mar 2020 10:12:01 GMT Subject: RFR: jcheck: add asString when parsing INI values Message-ID: Hi all, please review this patch that adds a call to `toString` when comparing the value for the `bugids` field from the `.jcheck/conf` of older format. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - jcheck: add asString when parsing INI values Changes: https://git.openjdk.java.net/skara/pull/548/files Webrev: https://webrevs.openjdk.java.net/skara/548/webrev.00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/548.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/548/head:pull/548 PR: https://git.openjdk.java.net/skara/pull/548 From rwestberg at openjdk.java.net Mon Mar 30 10:12:01 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 30 Mar 2020 10:12:01 GMT Subject: RFR: jcheck: add asString when parsing INI values In-Reply-To: References: Message-ID: <7xTpcXCamHqV9dkeINA0vjd4Ec890bR71nwrOeQ-rmc=.d739a304-bebf-4d4a-9242-f10bd7e1a528@github.com> On Mon, 30 Mar 2020 10:05:44 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a call to `toString` when comparing the value > for the `bugids` field from the `.jcheck/conf` of older format. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/548 From ehelin at openjdk.java.net Mon Mar 30 10:56:24 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 30 Mar 2020 10:56:24 GMT Subject: [Integrated] RFR: merge-bot: minor improvements to message In-Reply-To: References: Message-ID: <865166b1-72b1-4a88-b2ff-b45c27ba509d@openjdk.org> Changeset: eef8fffe Author: Erik Helin Date: 2020-03-30 10:56:09 +0000 URL: https://git.openjdk.java.net/skara/commit/eef8fffe merge-bot: minor improvements to message Reviewed-by: rwestberg ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java From ehelin at openjdk.java.net Mon Mar 30 10:56:43 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 30 Mar 2020 10:56:43 GMT Subject: [Integrated] RFR: jcheck: add asString when parsing INI values In-Reply-To: References: Message-ID: <60a33a93-91ee-43d5-b4e8-9be1111ef6d6@openjdk.org> Changeset: 5ed11337 Author: Erik Helin Date: 2020-03-30 10:56:29 +0000 URL: https://git.openjdk.java.net/skara/commit/5ed11337 jcheck: add asString when parsing INI values Reviewed-by: rwestberg ! jcheck/src/main/java/org/openjdk/skara/jcheck/JCheckConfiguration.java From ehelin at openjdk.java.net Mon Mar 30 11:00:23 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 30 Mar 2020 11:00:23 GMT Subject: RFR: vcs: handle clean renames in combined diff parser Message-ID: Hi all, please review this patch that makes the combined diff parser handle "clean" renames with regards to both parents. A clean rename is when the file is just renamed, no lines in the files have changed. The problem is that git does not output a `diff --combined` line, nor any hunks, for a clean rename. The combined diff parser has been updated to detect this situation and then return empty hunk lists. I also added a bunch of state checks to the combined diff parser to help diagnose future issues faster. Testing: - `make test` passes on Linux x64 - Manual testing with large merge commits Thanks, Erik ------------- Commit messages: - vcs: handle clean renames in combined diff parser Changes: https://git.openjdk.java.net/skara/pull/549/files Webrev: https://webrevs.openjdk.java.net/skara/549/webrev.00 Stats: 52 lines in 1 file changed: 45 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/549.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/549/head:pull/549 PR: https://git.openjdk.java.net/skara/pull/549 From rwestberg at openjdk.java.net Mon Mar 30 11:02:21 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 30 Mar 2020 11:02:21 GMT Subject: RFR: vcs: handle clean renames in combined diff parser In-Reply-To: References: Message-ID: On Mon, 30 Mar 2020 10:55:07 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the combined diff parser handle "clean" > renames with regards to both parents. A clean rename is when the file is just > renamed, no lines in the files have changed. The problem is that git does not > output a `diff --combined` line, nor any hunks, for a clean rename. The combined > diff parser has been updated to detect this situation and then return empty hunk > lists. > > I also added a bunch of state checks to the combined diff parser to help > diagnose future issues faster. > > Testing: > - `make test` passes on Linux x64 > - Manual testing with large merge commits > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/549 From ehelin at openjdk.java.net Mon Mar 30 11:51:03 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 30 Mar 2020 11:51:03 GMT Subject: [Integrated] RFR: vcs: handle clean renames in combined diff parser In-Reply-To: References: Message-ID: <52ae6e78-3b0d-44aa-8320-a353879cf301@openjdk.org> Changeset: 73e43b73 Author: Erik Helin Date: 2020-03-30 11:50:50 +0000 URL: https://git.openjdk.java.net/skara/commit/73e43b73 vcs: handle clean renames in combined diff parser Reviewed-by: rwestberg ! vcs/src/main/java/org/openjdk/skara/vcs/git/GitCombinedDiffParser.java From rwestberg at openjdk.java.net Mon Mar 30 12:14:31 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 30 Mar 2020 12:14:31 GMT Subject: RFR: skara: explicitly update submodules In-Reply-To: References: Message-ID: On Mon, 30 Mar 2020 12:09:02 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the `git skara update` explicitly update > eventual submodules for better compatibility with older git clients. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/550 From ehelin at openjdk.java.net Mon Mar 30 12:13:49 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 30 Mar 2020 12:13:49 GMT Subject: RFR: skara: explicitly update submodules Message-ID: Hi all, please review this patch that makes the `git skara update` explicitly update eventual submodules for better compatibility with older git clients. Thanks, Erik ------------- Commit messages: - skara: explicitly update submodules Changes: https://git.openjdk.java.net/skara/pull/550/files Webrev: https://webrevs.openjdk.java.net/skara/550/webrev.00 Stats: 19 lines in 4 files changed: 19 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/550.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/550/head:pull/550 PR: https://git.openjdk.java.net/skara/pull/550 From ehelin at openjdk.java.net Mon Mar 30 13:15:49 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 30 Mar 2020 13:15:49 GMT Subject: RFR: 339: Only show link to CONTRIBUTING.md if it exists Message-ID: Hi all, please review this patch that ensures that the pull request only shows a link to a `CONTRIBUTING.md` file in the integration message if a `CONTRIBUTING.md` actually exists. Testing: - Added two new unit tests - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - SKARA-339 Changes: https://git.openjdk.java.net/skara/pull/551/files Webrev: https://webrevs.openjdk.java.net/skara/551/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-339 Stats: 95 lines in 2 files changed: 89 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/551.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/551/head:pull/551 PR: https://git.openjdk.java.net/skara/pull/551 From rwestberg at openjdk.java.net Mon Mar 30 14:13:01 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 30 Mar 2020 14:13:01 GMT Subject: RFR: 339: Only show link to CONTRIBUTING.md if it exists In-Reply-To: References: Message-ID: On Mon, 30 Mar 2020 13:10:23 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that the pull request only shows a link to > a `CONTRIBUTING.md` file in the integration message if a `CONTRIBUTING.md` > actually exists. > > Testing: > - Added two new unit tests > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/551 From ehelin at openjdk.java.net Mon Mar 30 14:28:13 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 30 Mar 2020 14:28:13 GMT Subject: [Integrated] RFR: 339: Only show link to CONTRIBUTING.md if it exists In-Reply-To: References: Message-ID: Changeset: 870bf786 Author: Erik Helin Date: 2020-03-30 14:28:00 +0000 URL: https://git.openjdk.java.net/skara/commit/870bf786 339: Only show link to CONTRIBUTING.md if it exists Reviewed-by: rwestberg ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/IntegrateTests.java From rwestberg at openjdk.java.net Mon Mar 30 14:56:18 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 30 Mar 2020 14:56:18 GMT Subject: RFR: Proper selection of merge commit to squash commits onto for merge style PRs Message-ID: Hi all, Please review this change that properly selects the merge commit to squash eventual further commits onto in a merge-style PR. Best regards, Robin ------------- Commit messages: - Proper selection of merge commit to squash commits onto for merge style PRs Changes: https://git.openjdk.java.net/skara/pull/552/files Webrev: https://webrevs.openjdk.java.net/skara/552/webrev.00 Stats: 135 lines in 3 files changed: 115 ins; 1 del; 19 mod Patch: https://git.openjdk.java.net/skara/pull/552.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/552/head:pull/552 PR: https://git.openjdk.java.net/skara/pull/552 From ehelin at openjdk.java.net Mon Mar 30 14:57:21 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 30 Mar 2020 14:57:21 GMT Subject: RFR: Proper selection of merge commit to squash commits onto for merge style PRs In-Reply-To: References: Message-ID: On Mon, 30 Mar 2020 14:51:20 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that properly selects the merge commit to squash eventual further commits onto in a > merge-style PR. > Best regards, > Robin Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/552 From rwestberg at openjdk.java.net Mon Mar 30 15:00:42 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 30 Mar 2020 15:00:42 GMT Subject: [Integrated] RFR: Proper selection of merge commit to squash commits onto for merge style PRs In-Reply-To: References: Message-ID: Changeset: c0a0a508 Author: Robin Westberg Date: 2020-03-30 15:00:31 +0000 URL: https://git.openjdk.java.net/skara/commit/c0a0a508 Proper selection of merge commit to squash commits onto for merge style PRs Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java From ehelin at openjdk.java.net Mon Mar 30 15:46:52 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 30 Mar 2020 15:46:52 GMT Subject: [Integrated] RFR: skara: explicitly update submodules In-Reply-To: References: Message-ID: Changeset: f385ff5f Author: Erik Helin Date: 2020-03-30 15:46:36 +0000 URL: https://git.openjdk.java.net/skara/commit/f385ff5f skara: explicitly update submodules Reviewed-by: rwestberg ! cli/src/main/java/org/openjdk/skara/cli/GitSkara.java ! vcs/src/main/java/org/openjdk/skara/vcs/Repository.java ! vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java ! vcs/src/main/java/org/openjdk/skara/vcs/hg/HgRepository.java From ehelin at openjdk.java.net Tue Mar 31 07:22:50 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 31 Mar 2020 07:22:50 GMT Subject: RFR: 343: Use `ssh -G` for parsing ssh configuration files Message-ID: <8ccwLYG5halpeUeiZx9sVGUMuNZ1BWonD1QCo0_0Yo0=.11ad7d8a-94df-4a52-83f1-ed8ea6fb3922@github.com> Hi all, please review this patch that uses `ssh -G` instead of relying on my (somewhat buggy) `ssh_config` parser. Resolving hosts defined in a `ssh_config` file is actually fairly complex and my parser only handled a subset of scenarios. One drawback is that we now rely on `ssh` being present on `PATH`, but that must be the case if a user has a SSH path for a remote. Testing: - Manual testing using `git-webrev` with various paths Thanks, Erik ------------- Commit messages: - skara-343 Changes: https://git.openjdk.java.net/skara/pull/553/files Webrev: https://webrevs.openjdk.java.net/skara/553/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-343 Stats: 351 lines in 7 files changed: 30 ins; 300 del; 21 mod Patch: https://git.openjdk.java.net/skara/pull/553.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/553/head:pull/553 PR: https://git.openjdk.java.net/skara/pull/553 From rwestberg at openjdk.java.net Tue Mar 31 07:24:39 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 31 Mar 2020 07:24:39 GMT Subject: RFR: 343: Use `ssh -G` for parsing ssh configuration files In-Reply-To: <8ccwLYG5halpeUeiZx9sVGUMuNZ1BWonD1QCo0_0Yo0=.11ad7d8a-94df-4a52-83f1-ed8ea6fb3922@github.com> References: <8ccwLYG5halpeUeiZx9sVGUMuNZ1BWonD1QCo0_0Yo0=.11ad7d8a-94df-4a52-83f1-ed8ea6fb3922@github.com> Message-ID: <0PSwvatMrj3QE_EEu7t4iGQQAd0Q6K74hqU31oDtG1c=.2bcaae40-fb45-4dbb-ae7e-657a014417c4@github.com> On Tue, 31 Mar 2020 07:17:15 GMT, Erik Helin wrote: > Hi all, > > please review this patch that uses `ssh -G` instead of relying on my (somewhat > buggy) `ssh_config` parser. Resolving hosts defined in a `ssh_config` file is > actually fairly complex and my parser only handled a subset of scenarios. One > drawback is that we now rely on `ssh` being present on `PATH`, but that must be > the case if a user has a SSH path for a remote. > > Testing: > - Manual testing using `git-webrev` with various paths > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/553 From pliden at openjdk.java.net Tue Mar 31 07:47:59 2020 From: pliden at openjdk.java.net (Per =?UTF-8?B?TGlkw6lu?=) Date: Tue, 31 Mar 2020 07:47:59 GMT Subject: RFR: 343: Use `ssh -G` for parsing ssh configuration files In-Reply-To: <0PSwvatMrj3QE_EEu7t4iGQQAd0Q6K74hqU31oDtG1c=.2bcaae40-fb45-4dbb-ae7e-657a014417c4@github.com> References: <8ccwLYG5halpeUeiZx9sVGUMuNZ1BWonD1QCo0_0Yo0=.11ad7d8a-94df-4a52-83f1-ed8ea6fb3922@github.com> <0PSwvatMrj3QE_EEu7t4iGQQAd0Q6K74hqU31oDtG1c=.2bcaae40-fb45-4dbb-ae7e-657a014417c4@github.com> Message-ID: On Tue, 31 Mar 2020 07:22:31 GMT, Robin Westberg wrote: >> Hi all, >> >> please review this patch that uses `ssh -G` instead of relying on my (somewhat >> buggy) `ssh_config` parser. Resolving hosts defined in a `ssh_config` file is >> actually fairly complex and my parser only handled a subset of scenarios. One >> drawback is that we now rely on `ssh` being present on `PATH`, but that must be >> the case if a user has a SSH path for a remote. >> >> Testing: >> - Manual testing using `git-webrev` with various paths >> >> Thanks, >> Erik > > Looks good! Thanks for fixing! :) ------------- PR: https://git.openjdk.java.net/skara/pull/553 From ehelin at openjdk.java.net Tue Mar 31 07:48:25 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 31 Mar 2020 07:48:25 GMT Subject: [Integrated] RFR: 343: Use `ssh -G` for parsing ssh configuration files In-Reply-To: <8ccwLYG5halpeUeiZx9sVGUMuNZ1BWonD1QCo0_0Yo0=.11ad7d8a-94df-4a52-83f1-ed8ea6fb3922@github.com> References: <8ccwLYG5halpeUeiZx9sVGUMuNZ1BWonD1QCo0_0Yo0=.11ad7d8a-94df-4a52-83f1-ed8ea6fb3922@github.com> Message-ID: <9f855c1c-896c-4dfa-9191-3d67e280d596@openjdk.org> Changeset: 87965d81 Author: Erik Helin Date: 2020-03-31 07:48:10 +0000 URL: https://git.openjdk.java.net/skara/commit/87965d81 343: Use `ssh -G` for parsing ssh configuration files Reviewed-by: rwestberg ! cli/build.gradle ! cli/src/main/java/module-info.java ! cli/src/main/java/org/openjdk/skara/cli/Remote.java - ssh/build.gradle - ssh/src/main/java/module-info.java - ssh/src/main/java/org/openjdk/skara/ssh/SSHConfig.java - ssh/src/test/java/org/openjdk/ssh/SSHConfigTests.java From rwestberg at openjdk.java.net Tue Mar 31 08:26:35 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 31 Mar 2020 08:26:35 GMT Subject: RFR: 340: Infer master for repos in the same org for merge style PRs Message-ID: <3NriKfeLbVqhojjkuiOTTw2gyIe0eAi6MFADV-YIIBw=.c6496a1f-57fa-480e-853d-6b2e51e3548a@github.com> Hi all, Please review this change that allows a shorter form when merging the master branch from a repo in the same org. Best regards, Robin ------------- Commit messages: - If a short branch name is invalid, assume it is the name of a sibling repo Changes: https://git.openjdk.java.net/skara/pull/554/files Webrev: https://webrevs.openjdk.java.net/skara/554/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-340 Stats: 74 lines in 3 files changed: 71 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/554.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/554/head:pull/554 PR: https://git.openjdk.java.net/skara/pull/554 From ehelin at openjdk.java.net Tue Mar 31 09:09:09 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 31 Mar 2020 09:09:09 GMT Subject: RFR: 340: Infer master for repos in the same org for merge style PRs In-Reply-To: <3NriKfeLbVqhojjkuiOTTw2gyIe0eAi6MFADV-YIIBw=.c6496a1f-57fa-480e-853d-6b2e51e3548a@github.com> References: <3NriKfeLbVqhojjkuiOTTw2gyIe0eAi6MFADV-YIIBw=.c6496a1f-57fa-480e-853d-6b2e51e3548a@github.com> Message-ID: On Tue, 31 Mar 2020 08:21:50 GMT, Robin Westberg wrote: > Hi all, > > Please review this change that allows a shorter form when merging the master branch from a repo in the same org. > > Best regards, > Robin Looks good, just two minor comments inline bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 137: > 136: // Assume the name refers to a sibling repository > 137: var repoName = Path.of(pr.repository().name()).resolveSibling(branchMatcher.group(1)).toString(); > 138: return Optional.of(new MergeSource(repoName, "master")); Perhaps check that the repo actually exists? bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 131: > 130: > 131: // Verify that the branch exists > 132: var isValidBranch = prInstance.remoteBranches().stream() Suggestion: // Check if name refers to branch or repository ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/554 From rwestberg at openjdk.java.net Tue Mar 31 09:16:48 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 31 Mar 2020 09:16:48 GMT Subject: [Rev 01] RFR: 340: Infer master for repos in the same org for merge style PRs In-Reply-To: <3NriKfeLbVqhojjkuiOTTw2gyIe0eAi6MFADV-YIIBw=.c6496a1f-57fa-480e-853d-6b2e51e3548a@github.com> References: <3NriKfeLbVqhojjkuiOTTw2gyIe0eAi6MFADV-YIIBw=.c6496a1f-57fa-480e-853d-6b2e51e3548a@github.com> Message-ID: > Hi all, > > Please review this change that allows a shorter form when merging the master branch from a repo in the same org. > > Best regards, > Robin Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Fix failing test ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/554/files - new: https://git.openjdk.java.net/skara/pull/554/files/1e971005..a681b8a3 Webrevs: - full: https://webrevs.openjdk.java.net/skara/554/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/554/webrev.00-01 Stats: 6 lines in 1 file changed: 4 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/554.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/554/head:pull/554 PR: https://git.openjdk.java.net/skara/pull/554 From rwestberg at openjdk.java.net Tue Mar 31 09:18:09 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 31 Mar 2020 09:18:09 GMT Subject: [Rev 01] RFR: 340: Infer master for repos in the same org for merge style PRs In-Reply-To: References: <3NriKfeLbVqhojjkuiOTTw2gyIe0eAi6MFADV-YIIBw=.c6496a1f-57fa-480e-853d-6b2e51e3548a@github.com> Message-ID: On Tue, 31 Mar 2020 09:06:01 GMT, Erik Helin wrote: >> Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: >> >> Fix failing test > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 137: > >> 136: // Assume the name refers to a sibling repository >> 137: var repoName = Path.of(pr.repository().name()).resolveSibling(branchMatcher.group(1)).toString(); >> 138: return Optional.of(new MergeSource(repoName, "master")); > > Perhaps check that the repo actually exists? It will be checked a bit later (around line 193). > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 131: > >> 130: >> 131: // Verify that the branch exists >> 132: var isValidBranch = prInstance.remoteBranches().stream() > > Suggestion: > > // Check if name refers to branch or repository So the check is only done partially here.. :) ------------- PR: https://git.openjdk.java.net/skara/pull/554 From rwestberg at openjdk.java.net Tue Mar 31 09:42:32 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 31 Mar 2020 09:42:32 GMT Subject: [Integrated] RFR: 340: Infer master for repos in the same org for merge style PRs In-Reply-To: <3NriKfeLbVqhojjkuiOTTw2gyIe0eAi6MFADV-YIIBw=.c6496a1f-57fa-480e-853d-6b2e51e3548a@github.com> References: <3NriKfeLbVqhojjkuiOTTw2gyIe0eAi6MFADV-YIIBw=.c6496a1f-57fa-480e-853d-6b2e51e3548a@github.com> Message-ID: Changeset: 32bba611 Author: Robin Westberg Date: 2020-03-31 09:42:18 +0000 URL: https://git.openjdk.java.net/skara/commit/32bba611 340: Infer master for repos in the same org for merge style PRs Reviewed-by: ehelin ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java From ehelin at openjdk.java.net Tue Mar 31 13:29:01 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 31 Mar 2020 13:29:01 GMT Subject: RFR: 344: PR should warn when source branch is an upstream branch Message-ID: Hi all, please review this patch that warns contributors that creates a poll request from a branch that is already present in the upstream repository. This is rarely what you want to do and therefore we should issue a warning. Testing: - `make test` passes on Linux x64 Thanks, Erik ------------- Commit messages: - skara-344 Changes: https://git.openjdk.java.net/skara/pull/555/files Webrev: https://webrevs.openjdk.java.net/skara/555/webrev.00 Issue: https://bugs.openjdk.java.net/browse/SKARA-344 Stats: 316 lines in 10 files changed: 309 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/555.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/555/head:pull/555 PR: https://git.openjdk.java.net/skara/pull/555 From rwestberg at openjdk.java.net Tue Mar 31 13:54:20 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 31 Mar 2020 13:54:20 GMT Subject: RFR: 344: PR should warn when source branch is an upstream branch In-Reply-To: References: Message-ID: On Tue, 31 Mar 2020 13:24:22 GMT, Erik Helin wrote: > Hi all, > > please review this patch that warns contributors that creates a poll request > from a branch that is already present in the upstream repository. This is rarely > what you want to do and therefore we should issue a warning. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/555 From ehelin at openjdk.java.net Tue Mar 31 14:44:47 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 31 Mar 2020 14:44:47 GMT Subject: [Rev 01] RFR: 344: PR should warn when source branch is an upstream branch In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that warns contributors that creates a poll request > from a branch that is already present in the upstream repository. This is rarely > what you want to do and therefore we should issue a warning. > > Testing: > - `make test` passes on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Make HostedBranch a class ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/555/files - new: https://git.openjdk.java.net/skara/pull/555/files/db7e007b..e2dae17f Webrevs: - full: https://webrevs.openjdk.java.net/skara/555/webrev.01 - incr: https://webrevs.openjdk.java.net/skara/555/webrev.00-01 Stats: 245 lines in 7 files changed: 35 ins; 204 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/555.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/555/head:pull/555 PR: https://git.openjdk.java.net/skara/pull/555 From ehelin at openjdk.java.net Tue Mar 31 14:44:48 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 31 Mar 2020 14:44:48 GMT Subject: [Rev 01] RFR: 344: PR should warn when source branch is an upstream branch In-Reply-To: References: Message-ID: On Tue, 31 Mar 2020 13:52:11 GMT, Robin Westberg wrote: >> Erik Helin has updated the pull request incrementally with one additional commit since the last revision: >> >> Make HostedBranch a class > > Looks good! Thanks @rwestberg for reviewing! Based on a offline discussion I changed `HostedBranch` from being an `interface` to a `class`. ------------- PR: https://git.openjdk.java.net/skara/pull/555 From rwestberg at openjdk.java.net Tue Mar 31 14:44:47 2020 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 31 Mar 2020 14:44:47 GMT Subject: [Rev 01] RFR: 344: PR should warn when source branch is an upstream branch In-Reply-To: References: Message-ID: On Tue, 31 Mar 2020 14:38:28 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that warns contributors that creates a poll request >> from a branch that is already present in the upstream repository. This is rarely >> what you want to do and therefore we should issue a warning. >> >> Testing: >> - `make test` passes on Linux x64 >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > Make HostedBranch a class Even better! :) ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/555 From ehelin at openjdk.java.net Tue Mar 31 14:47:42 2020 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 31 Mar 2020 14:47:42 GMT Subject: [Integrated] RFR: 344: PR should warn when source branch is an upstream branch In-Reply-To: References: Message-ID: Changeset: c231092f Author: Erik Helin Date: 2020-03-31 14:47:28 +0000 URL: https://git.openjdk.java.net/skara/commit/c231092f 344: PR should warn when source branch is an upstream branch Reviewed-by: rwestberg ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java ! bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryHostedRepository.java + forge/src/main/java/org/openjdk/skara/forge/HostedBranch.java ! forge/src/main/java/org/openjdk/skara/forge/HostedRepository.java ! forge/src/main/java/org/openjdk/skara/forge/github/GitHubRepository.java ! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java ! test/src/main/java/org/openjdk/skara/test/TestHostedRepository.java