From rwestberg at openjdk.java.net Mon Mar 1 14:26:26 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 1 Mar 2021 14:26:26 GMT Subject: RFR: Read resolvedInBuild JBS property properly Message-ID: The resolvedInBuild property was not read correctly from JBS, leading to incorrect issue labels. ------------- Commit messages: - Read resolvedInBuild JBS property properly Changes: https://git.openjdk.java.net/skara/pull/1042/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1042&range=00 Stats: 64 lines in 3 files changed: 61 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1042.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1042/head:pull/1042 PR: https://git.openjdk.java.net/skara/pull/1042 From rwestberg at openjdk.java.net Mon Mar 1 14:34:27 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 1 Mar 2021 14:34:27 GMT Subject: RFR: pr: update all local branches for commit comments In-Reply-To: References: Message-ID: On Sun, 28 Feb 2021 20:05:22 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `CommitCommentsWorkItem` properly update all local branches prior to calling `ReadOnlyRepository.commitMetdata`. `ReadOnlyRepository.commitMetadata` is essentially `rev-list ?all` for Git and all local refs need to be updated for this to work. In order to make as few networks call as possible I manually merge each local branch with its remote counterpart (instead of doing `pull`). > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommitCommentsWorkItem.java line 70: > 68: var localRepoPath = scratchPath.resolve("pr").resolve("commit-comments").resolve(bot.repo().name()); > 69: var localRepo = hostedRepositoryPool.materialize(bot.repo(), localRepoPath); > 70: localRepo.fetchAllRemotes(false); Not sure this is needed? The materialize call should have done a fetchAll as well.. ------------- PR: https://git.openjdk.java.net/skara/pull/1041 From rwestberg at openjdk.java.net Wed Mar 3 14:30:18 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 3 Mar 2021 14:30:18 GMT Subject: RFR: 666: Integrated message delivered to wrong thread Message-ID: If the head of a closed PR was present in the target branch, we considered the PR as integrated. But that's not necessarily true as anything could be the PR head depending on what you push. Just skip that part of the code. ------------- Commit messages: - Closed PR should not be considered as integrated Changes: https://git.openjdk.java.net/skara/pull/1043/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1043&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-666 Stats: 4 lines in 1 file changed: 0 ins; 4 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1043.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1043/head:pull/1043 PR: https://git.openjdk.java.net/skara/pull/1043 From shade at redhat.com Thu Mar 4 11:32:02 2021 From: shade at redhat.com (Aleksey Shipilev) Date: Thu, 4 Mar 2021 12:32:02 +0100 Subject: Re-opening PRs Message-ID: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> Hi, Look at this issue: https://github.com/openjdk/jdk/pull/1343 It was closed by bot due to timeout: "@shipilev This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it!" Cool, but there is no way for me to reopen the PR. It must be because the bot closed the PR, and I don't have enough privileges to reopen? What users like me are expected to do here? -- Thanks, -Aleksey From neugens at redhat.com Thu Mar 4 13:01:57 2021 From: neugens at redhat.com (Mario Torre) Date: Thu, 4 Mar 2021 14:01:57 +0100 Subject: Re-opening PRs In-Reply-To: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> References: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> Message-ID: More generally, we should probably disable those automatic stuff-closing bots, it doesn't make much sense to me. Cheers, Mario On Thu, Mar 4, 2021 at 12:32 PM Aleksey Shipilev wrote: > > Hi, > > Look at this issue: > https://github.com/openjdk/jdk/pull/1343 > > It was closed by bot due to timeout: > > "@shipilev This pull request has been inactive for more than 8 weeks and will now be automatically > closed. If you would like to continue working on this pull request in the future, feel free to > reopen it!" > > Cool, but there is no way for me to reopen the PR. > > It must be because the bot closed the PR, and I don't have enough privileges to reopen? > What users like me are expected to do here? > > -- > Thanks, > -Aleksey > -- Mario Torre Manager, Software Engineering Red Hat GmbH 9704 A60C B4BE A8B8 0F30 9205 5D7E 4952 3F65 7898 From dalibor.topic at oracle.com Thu Mar 4 14:02:45 2021 From: dalibor.topic at oracle.com (Dalibor Topic) Date: Thu, 4 Mar 2021 15:02:45 +0100 Subject: Re-opening PRs In-Reply-To: References: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> Message-ID: <3a402772-2c66-dd9c-da0f-14c7d508558a@oracle.com> On 04.03.2021 14:01, Mario Torre wrote: > More generally, we should probably disable those automatic stuff-closing > bots, it doesn't make much sense to me. I think that they are generally quite useful in reducing the conceptual? mental? load from requests gone stale for some reason, as long as it's possible to reopen them later, if necessary. There is probably a philosophical discussion over a cup of coffee about an unseen pull request falling in a forest buried in here, somewhere. ;) cheers, dalibor topic > > Cheers, > Mario > > > On Thu, Mar 4, 2021 at 12:32 PM Aleksey Shipilev wrote: >> >> Hi, >> >> Look at this issue: >> https://github.com/openjdk/jdk/pull/1343 >> >> It was closed by bot due to timeout: >> >> "@shipilev This pull request has been inactive for more than 8 weeks and will now be automatically >> closed. If you would like to continue working on this pull request in the future, feel free to >> reopen it!" >> >> Cool, but there is no way for me to reopen the PR. >> >> It must be because the bot closed the PR, and I don't have enough privileges to reopen? >> What users like me are expected to do here? >> >> -- >> Thanks, >> -Aleksey >> > > > -- > Mario Torre > Manager, Software Engineering > Red Hat GmbH > 9704 A60C B4BE A8B8 0F30 9205 5D7E 4952 3F65 7898 > -- Dalibor Topic Consulting Product Manager Phone: +494089091214 , Mobile: +491737185961 , Video: dalibor.topic at oracle.com Oracle Global Services Germany GmbH Hauptverwaltung: Riesstr. 25, D-80992 M?nchen Registergericht: Amtsgericht M?nchen, HRB 246209 Gesch?ftsf?hrer: Ralf Herrmann From shade at redhat.com Thu Mar 4 15:11:32 2021 From: shade at redhat.com (Aleksey Shipilev) Date: Thu, 4 Mar 2021 16:11:32 +0100 Subject: Re-opening PRs In-Reply-To: <3a402772-2c66-dd9c-da0f-14c7d508558a@oracle.com> References: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> <3a402772-2c66-dd9c-da0f-14c7d508558a@oracle.com> Message-ID: On 3/4/21 3:02 PM, Dalibor Topic wrote: > I think that they are generally quite useful in reducing the conceptual? > mental? load from requests gone stale for some reason, as long as it's > possible to reopen them later, if necessary. So, back to my question: how do I reopen the PRs closed by the bot? I don't think current GitHub permissions allow this... -- Thanks, -Aleksey From neugens at redhat.com Thu Mar 4 15:11:48 2021 From: neugens at redhat.com (Mario Torre) Date: Thu, 4 Mar 2021 16:11:48 +0100 Subject: Re-opening PRs In-Reply-To: <3a402772-2c66-dd9c-da0f-14c7d508558a@oracle.com> References: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> <3a402772-2c66-dd9c-da0f-14c7d508558a@oracle.com> Message-ID: On Thu, Mar 4, 2021 at 3:03 PM Dalibor Topic wrote: > > > > On 04.03.2021 14:01, Mario Torre wrote: > > More generally, we should probably disable those automatic stuff-closing > > bots, it doesn't make much sense to me. > > I think that they are generally quite useful in reducing the conceptual? > mental? load from requests gone stale for some reason, as long as it's > possible to reopen them later, if necessary. Maybe. I don't know I find those problematic. funnily enough there was a thread on twitter just about this sort of things just yesterday initiated by Bruno. But, as you noted: > There is probably a philosophical discussion over a cup of coffee about > an unseen pull request falling in a forest buried in here, somewhere. ;) Yes, this! Cheers, Mario -- Mario Torre Manager, Software Engineering Red Hat GmbH 9704 A60C B4BE A8B8 0F30 9205 5D7E 4952 3F65 7898 From volker.simonis at gmail.com Thu Mar 4 15:44:15 2021 From: volker.simonis at gmail.com (Volker Simonis) Date: Thu, 4 Mar 2021 16:44:15 +0100 Subject: How do I update my local copy of a pull request? Message-ID: Hi, every PR request has the following instruction for downloading it locally: $ git fetch https://git.openjdk.java.net/jdk pull/2570/head:pull/2570 $ git checkout pull/2570 That works well for the first time. But what do I have to do if the PR was updated with more commits (or force-pushed with a new version). While on the local branch "pull/2570" another "git fetch https://git.openjdk.java.net/jdk pull/2570/head:pull/2570" fails with: fatal: Refusing to fetch into current branch refs/heads/pull/2570 of non-bare repository If I switch to another branch first (i.e. "git checkout master") the second "fetch" completes successfully (but I have to switch back to my pull/2570 branch afterwards). Instead of issuing a second fetch command on my "pull/2570" branch, I tried a simple "git pull" which returns: There is no tracking information for the current branch. Please specify which branch you want to merge with. See git-pull(1) for details. git pull If you wish to set tracking information for this branch you can do so with: git branch --set-upstream-to=/ pull/2570 The first advice is good, because "git pull https://git.openjdk.java.net/jdk pull/2570/head" will indeed update my branch. But the second advice (i.e. set tracking information for the pull request branch) doesn't seem to work: git branch --set-upstream-to=https://git.openjdk.java.net/jdk/pull/2570/head pull/2570 error: the requested upstream branch 'https://git.openjdk.java.net/jdk/pull/2570/head' does not exist hint: hint: If you are planning on basing your work on an upstream hint: branch that already exists at the remote, you may need to hint: run "git fetch" to retrieve it. Doing a "git fetch https://git.openjdk.java.net/jdk pull/2570/head" as advised succeeds, but unfortunately doesn't fix the problem with "--set-upstream-to...". So to cut a long story short, it seems the simplest way of updating the local copy of a pull request is to run "git pull https://git.openjdk.java.net/jdk pull/2570/head". If this isn't something totally obvious, maybe we could at it to the "Download" information at the end of each pull request? And there are still two remaining questions: 1. Why can't I set an upstream for the local pull request branch? 2. Why do all the instructions mention "https://git.openjdk.java.net/jdk" instead of "https://github.com/openjdk/jdk/". This always gives me the warning "warning: redirecting to https://github.com/openjdk/jdk/". Might this also cause other problems? Thank you and best regards, Volker From thomas.stuefe at gmail.com Thu Mar 4 17:05:38 2021 From: thomas.stuefe at gmail.com (=?UTF-8?Q?Thomas_St=C3=BCfe?=) Date: Thu, 4 Mar 2021 18:05:38 +0100 Subject: Re-opening PRs In-Reply-To: References: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> Message-ID: I would prefer that too. ..Thomas On Thu, Mar 4, 2021 at 2:02 PM Mario Torre wrote: > More generally, we should probably disable those automatic stuff-closing > bots, it doesn't make much sense to me. > > Cheers, > Mario > > > On Thu, Mar 4, 2021 at 12:32 PM Aleksey Shipilev wrote: > > > > Hi, > > > > Look at this issue: > > https://github.com/openjdk/jdk/pull/1343 > > > > It was closed by bot due to timeout: > > > > "@shipilev This pull request has been inactive for more than 8 weeks and > will now be automatically > > closed. If you would like to continue working on this pull request in > the future, feel free to > > reopen it!" > > > > Cool, but there is no way for me to reopen the PR. > > > > It must be because the bot closed the PR, and I don't have enough > privileges to reopen? > > What users like me are expected to do here? > > > > -- > > Thanks, > > -Aleksey > > > > > -- > Mario Torre > Manager, Software Engineering > Red Hat GmbH > 9704 A60C B4BE A8B8 0F30 9205 5D7E 4952 3F65 7898 > > From kevin.rushforth at oracle.com Thu Mar 4 17:18:15 2021 From: kevin.rushforth at oracle.com (Kevin Rushforth) Date: Thu, 4 Mar 2021 09:18:15 -0800 Subject: Re-opening PRs In-Reply-To: References: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> Message-ID: <4591efbf-4f82-41ae-09eb-11c4b68c2371@oracle.com> This can be configured on a per-project basis. For example, the jfx project is not setup to auto-close old PRs. If the jdk project so chooses, it can easily be disabled for that project as well. Perhaps you can raise this issue on jdk-dev? As for the other point, I can't think of a good reason that the PR author should not be able to reopen their own PR. That sounds like a problem with the way the jdk repo, or perhaps the openjdk group, on GitHub is configured. -- Kevin On 3/4/2021 9:05 AM, Thomas St?fe wrote: > I would prefer that too. > > ..Thomas > > On Thu, Mar 4, 2021 at 2:02 PM Mario Torre wrote: > >> More generally, we should probably disable those automatic stuff-closing >> bots, it doesn't make much sense to me. >> >> Cheers, >> Mario >> >> >> On Thu, Mar 4, 2021 at 12:32 PM Aleksey Shipilev wrote: >>> Hi, >>> >>> Look at this issue: >>> https://github.com/openjdk/jdk/pull/1343 >>> >>> It was closed by bot due to timeout: >>> >>> "@shipilev This pull request has been inactive for more than 8 weeks and >> will now be automatically >>> closed. If you would like to continue working on this pull request in >> the future, feel free to >>> reopen it!" >>> >>> Cool, but there is no way for me to reopen the PR. >>> >>> It must be because the bot closed the PR, and I don't have enough >> privileges to reopen? >>> What users like me are expected to do here? >>> >>> -- >>> Thanks, >>> -Aleksey >>> >> >> -- >> Mario Torre >> Manager, Software Engineering >> Red Hat GmbH >> 9704 A60C B4BE A8B8 0F30 9205 5D7E 4952 3F65 7898 >> >> From dalibor.topic at oracle.com Fri Mar 5 00:25:18 2021 From: dalibor.topic at oracle.com (Dalibor Topic) Date: Fri, 5 Mar 2021 01:25:18 +0100 Subject: How do I update my local copy of a pull request? In-Reply-To: References: Message-ID: <7859b91c-e63b-1804-7eda-b917a3f89cdc@oracle.com> Volker wrote: > 2. Why do all the instructions mention > "https://git.openjdk.java.net/jdk" instead of > "https://github.com/openjdk/jdk/". This always gives me the warning > "warning: redirecting to https://github.com/openjdk/jdk/". Might this > also cause other problems? From https://openjdk.java.net/jeps/369: The domain https://git.openjdk.java.net/ redirects to the OpenJDK Community's current source-code hosting provider. Source-code URLs recorded in JBS issues and mailing-list messages use this domain rather than the domain of the current provider. In order to prevent the Skara tooling from depending upon a particular provider's API, support for multiple external providers has been a strict requirement from the beginning. All of the tooling is also required to work with the open-source GitLab Community Edition (GitLab CE). cheers, dalibor topic -- Dalibor Topic Consulting Product Manager Phone: +494089091214 , Mobile: +491737185961 , Video: dalibor.topic at oracle.com Oracle Global Services Germany GmbH Hauptverwaltung: Riesstr. 25, D-80992 M?nchen Registergericht: Amtsgericht M?nchen, HRB 246209 Gesch?ftsf?hrer: Ralf Herrmann From volker.simonis at gmail.com Fri Mar 5 07:45:18 2021 From: volker.simonis at gmail.com (Volker Simonis) Date: Fri, 5 Mar 2021 08:45:18 +0100 Subject: How do I update my local copy of a pull request? In-Reply-To: <7859b91c-e63b-1804-7eda-b917a3f89cdc@oracle.com> References: <7859b91c-e63b-1804-7eda-b917a3f89cdc@oracle.com> Message-ID: Hi Dalibor, Thanks for the link. I think the reason for having this indirection is reasonable. Do you know if there's a way to disable the warnings? Best regards, Volker Dalibor Topic schrieb am Fr., 5. M?rz 2021, 01:25: > Volker wrote: > > > 2. Why do all the instructions mention > > "https://git.openjdk.java.net/jdk" instead of > > "https://github.com/openjdk/jdk/". This always gives me the warning > > "warning: redirecting to https://github.com/openjdk/jdk/". Might this > > also cause other problems? > > > From https://openjdk.java.net/jeps/369: > > The domain https://git.openjdk.java.net/ redirects to the OpenJDK > Community's current source-code hosting provider. Source-code URLs > recorded in JBS issues and mailing-list messages use this domain rather > than the domain of the current provider. > > In order to prevent the Skara tooling from depending upon a particular > provider's API, support for multiple external providers has been a > strict requirement from the beginning. All of the tooling is also > required to work with the open-source GitLab Community Edition (GitLab CE). > > cheers, > dalibor topic > > -- > Dalibor Topic > Consulting Product Manager > Phone: +494089091214 , Mobile: +491737185961 > , Video: dalibor.topic at oracle.com > > > Oracle Global Services Germany GmbH > Hauptverwaltung: Riesstr. 25, D-80992 M?nchen > Registergericht: Amtsgericht M?nchen, HRB 246209 > Gesch?ftsf?hrer: Ralf Herrmann > > From shade at redhat.com Fri Mar 5 13:28:27 2021 From: shade at redhat.com (Aleksey Shipilev) Date: Fri, 5 Mar 2021 14:28:27 +0100 Subject: Re-opening PRs In-Reply-To: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> References: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> Message-ID: On 3/4/21 12:32 PM, Aleksey Shipilev wrote: > Look at this issue: > https://github.com/openjdk/jdk/pull/1343 > > It was closed by bot due to timeout: > > "@shipilev This pull request has been inactive for more than 8 weeks and will now be automatically > closed. If you would like to continue working on this pull request in the future, feel free to > reopen it!" > > Cool, but there is no way for me to reopen the PR. > > It must be because the bot closed the PR, and I don't have enough privileges to reopen? > What users like me are expected to do here? Any hints/solutions? Should I just open another PR and live with two reviews referenced from the JIRA bug? It would be inconvenient, because it loses the discussion in the old PR. -- Thanks, -Aleksey From robin.westberg at oracle.com Fri Mar 5 13:44:38 2021 From: robin.westberg at oracle.com (Robin Westberg) Date: Fri, 5 Mar 2021 13:44:38 +0000 Subject: Re-opening PRs In-Reply-To: References: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> Message-ID: <674B0ED1-6B21-4A9B-BBBC-FF32C524EFAE@oracle.com> Hi Aleksey, > On 5 Mar 2021, at 14:28, Aleksey Shipilev wrote: > > On 3/4/21 12:32 PM, Aleksey Shipilev wrote: >> Look at this issue: >> https://github.com/openjdk/jdk/pull/1343 >> It was closed by bot due to timeout: >> "@shipilev This pull request has been inactive for more than 8 weeks and will now be automatically >> closed. If you would like to continue working on this pull request in the future, feel free to >> reopen it!" >> Cool, but there is no way for me to reopen the PR. >> It must be because the bot closed the PR, and I don't have enough privileges to reopen? >> What users like me are expected to do here? > > Any hints/solutions? > > Should I just open another PR and live with two reviews referenced from the JIRA bug? It would be inconvenient, because it loses the discussion in the old PR. I guess the only solution other than opening a new one would be to get an admin to reopen the PR. I?m fairly certain that it has been possible for regular users to reopen PRs in the past, so it is possible that something has changed on the GitHub side.. But as it stands, it certainly is a bit inconvenient. So my suggestion is that I reopen PR #1343 and disable automatic closing of PRs for now. Best regards, Robin > > -- > Thanks, > -Aleksey > From shade at redhat.com Fri Mar 5 16:17:36 2021 From: shade at redhat.com (Aleksey Shipilev) Date: Fri, 5 Mar 2021 17:17:36 +0100 Subject: Re-opening PRs In-Reply-To: <674B0ED1-6B21-4A9B-BBBC-FF32C524EFAE@oracle.com> References: <92d2af9e-6345-1da9-4c02-0a20241be6f8@redhat.com> <674B0ED1-6B21-4A9B-BBBC-FF32C524EFAE@oracle.com> Message-ID: <4afb42d4-e7e0-f40c-ae23-b7cd15c4b98b@redhat.com> On 3/5/21 2:44 PM, Robin Westberg wrote: > I guess the only solution other than opening a new one would be to get an admin to reopen the PR. > I?m fairly certain that it has been possible for regular users to reopen PRs in the past, so it > is possible that something has changed on the GitHub side.. But as it stands, it certainly is a > bit inconvenient. So my suggestion is that I reopen PR #1343 and disable automatic closing of PRs > for now. Yeah, it would be nice to tame the autoclosing bot a bit, until this is resolved. -- Thanks, -Aleksey From rwestberg at openjdk.java.net Tue Mar 9 09:48:45 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 9 Mar 2021 09:48:45 GMT Subject: RFR: 708: Email version of UI file comment used the wrong version of the file Message-ID: <7mj8UTFATaB0qwRCLDdxWJcMsiit-8RuaJsY0kgEfkU=.6114ea95-258d-4201-bbd1-63cc81843965@github.com> When a comment is made on the "previous" version of a change, the line number may not match the reported hash. This should improve things. Tested manually on https://github.com/openjdk/jdk/pull/2843/files . ------------- Commit messages: - Improve GitHub review comment line number parsing Changes: https://git.openjdk.java.net/skara/pull/1044/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1044&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-708 Stats: 20 lines in 1 file changed: 8 ins; 1 del; 11 mod Patch: https://git.openjdk.java.net/skara/pull/1044.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1044/head:pull/1044 PR: https://git.openjdk.java.net/skara/pull/1044 From rwestberg at openjdk.java.net Tue Mar 9 14:53:04 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 9 Mar 2021 14:53:04 GMT Subject: [skara] RFR: 636: Quote @-characters in bridged emails Message-ID: It's not enough to use \ to escape the @ character, so we can use this: @nomention instead to prevent unwanted mentions. ------------- Commit messages: - Add additional quoting of @ character Changes: https://git.openjdk.java.net/skara/pull/1045/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1045&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-636 Stats: 12 lines in 2 files changed: 10 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1045.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1045/head:pull/1045 PR: https://git.openjdk.java.net/skara/pull/1045 From ihse at openjdk.java.net Tue Mar 9 16:29:44 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 9 Mar 2021 16:29:44 GMT Subject: RFR: 636: Quote @-characters in bridged emails In-Reply-To: References: Message-ID: On Tue, 9 Mar 2021 14:49:44 GMT, Robin Westberg wrote: > It's not enough to use \ to escape the @ character, so we can use this: @nomention instead to prevent unwanted mentions. LGTM ------------- Marked as reviewed by ihse (Committer). PR: https://git.openjdk.java.net/skara/pull/1045 From ehelin at openjdk.java.net Wed Mar 10 09:40:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 09:40:56 GMT Subject: RFR: Read resolvedInBuild JBS property properly In-Reply-To: References: Message-ID: On Mon, 1 Mar 2021 14:23:30 GMT, Robin Westberg wrote: > The resolvedInBuild property was not read correctly from JBS, leading to incorrect issue labels. Looks good, I just have a minor comment inline! jbs/src/main/java/org/openjdk/skara/jbs/Backports.java line 77: > 75: } > 76: if (issue.properties().containsKey("customfield_10006")) { > 77: return JdkVersion.parse(versionString.get(0), issue.properties().get("customfield_10006").asString()); Would you mind creating a variable naming the custom field? For example: var resolvedInBuild = "customfield_10006"; if (issue.properties().containsKey(resolvedInBuild)) { ------------- PR: https://git.openjdk.java.net/skara/pull/1042 From ehelin at openjdk.java.net Wed Mar 10 09:42:34 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 09:42:34 GMT Subject: RFR: 666: Integrated message delivered to wrong thread In-Reply-To: References: Message-ID: <34LK_DZ_csL6tsRP6xxZZUPxx2bE77_jD2rZXIPLM_E=.8e47a8f6-97a1-48f0-b228-0fa1c8836e1c@github.com> On Wed, 3 Mar 2021 14:27:00 GMT, Robin Westberg wrote: > If the head of a closed PR was present in the target branch, we considered the PR as integrated. But that's not necessarily true as anything could be the PR head depending on what you push. Just skip that part of the code. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1043 From ehelin at openjdk.java.net Wed Mar 10 09:43:34 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 09:43:34 GMT Subject: RFR: 708: Email version of UI file comment used the wrong version of the file In-Reply-To: <7mj8UTFATaB0qwRCLDdxWJcMsiit-8RuaJsY0kgEfkU=.6114ea95-258d-4201-bbd1-63cc81843965@github.com> References: <7mj8UTFATaB0qwRCLDdxWJcMsiit-8RuaJsY0kgEfkU=.6114ea95-258d-4201-bbd1-63cc81843965@github.com> Message-ID: <0cabYFTBQswQk2smzqLyx78KXy-eOzT1L5q6YPdAQ1c=.dadeb8b6-1d4b-4f13-bc01-b23a3bbcdaaf@github.com> On Tue, 9 Mar 2021 09:45:35 GMT, Robin Westberg wrote: > When a comment is made on the "previous" version of a change, the line number may not match the reported hash. This should improve things. Tested manually on https://github.com/openjdk/jdk/pull/2843/files . Looks good, thanks for fixing! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1044 From ehelin at openjdk.java.net Wed Mar 10 09:45:32 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 09:45:32 GMT Subject: RFR: 636: Quote @-characters in bridged emails In-Reply-To: References: Message-ID: On Tue, 9 Mar 2021 14:49:44 GMT, Robin Westberg wrote: > It's not enough to use \ to escape the @ character, so we can use this: @nomention instead to prevent unwanted mentions. Haha, nice workaround with the HTML comment ?? Looks good, thanks for fixing this :partying_face: ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1045 From ihse at openjdk.java.net Wed Mar 10 10:07:34 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Wed, 10 Mar 2021 10:07:34 GMT Subject: RFR: 708: Email version of UI file comment used the wrong version of the file In-Reply-To: <7mj8UTFATaB0qwRCLDdxWJcMsiit-8RuaJsY0kgEfkU=.6114ea95-258d-4201-bbd1-63cc81843965@github.com> References: <7mj8UTFATaB0qwRCLDdxWJcMsiit-8RuaJsY0kgEfkU=.6114ea95-258d-4201-bbd1-63cc81843965@github.com> Message-ID: On Tue, 9 Mar 2021 09:45:35 GMT, Robin Westberg wrote: > When a comment is made on the "previous" version of a change, the line number may not match the reported hash. This should improve things. Tested manually on https://github.com/openjdk/jdk/pull/2843/files . LGTM. ------------- Marked as reviewed by ihse (Committer). PR: https://git.openjdk.java.net/skara/pull/1044 From ihse at openjdk.java.net Wed Mar 10 10:18:46 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Wed, 10 Mar 2021 10:18:46 GMT Subject: [skara] RFR: Read resolvedInBuild JBS property properly In-Reply-To: References: Message-ID: On Mon, 1 Mar 2021 14:23:30 GMT, Robin Westberg wrote: > The resolvedInBuild property was not read correctly from JBS, leading to incorrect issue labels. LGTM (but I agree with Erik's suggestion). ------------- Marked as reviewed by ihse (Committer). PR: https://git.openjdk.java.net/skara/pull/1042 From ehelin at openjdk.java.net Wed Mar 10 10:22:08 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 10:22:08 GMT Subject: RFR: pr: update all local branches for commit comments [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that makes `CommitCommentsWorkItem` properly update all local branches prior to calling `ReadOnlyRepository.commitMetdata`. `ReadOnlyRepository.commitMetadata` is essentially `rev-list ?all` for Git and all local refs need to be updated for this to work. In order to make as few networks call as possible I manually merge each local branch with its remote counterpart (instead of doing `pull`). > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: No need to fetch remotes ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1041/files - new: https://git.openjdk.java.net/skara/pull/1041/files/be4c8b33..ba156b91 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1041&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1041&range=00-01 Stats: 1 line in 1 file changed: 0 ins; 1 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1041.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1041/head:pull/1041 PR: https://git.openjdk.java.net/skara/pull/1041 From rwestberg at openjdk.java.net Wed Mar 10 10:22:09 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Mar 2021 10:22:09 GMT Subject: RFR: pr: update all local branches for commit comments [v2] In-Reply-To: References: Message-ID: On Wed, 10 Mar 2021 10:19:47 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that makes `CommitCommentsWorkItem` properly update all local branches prior to calling `ReadOnlyRepository.commitMetdata`. `ReadOnlyRepository.commitMetadata` is essentially `rev-list ?all` for Git and all local refs need to be updated for this to work. In order to make as few networks call as possible I manually merge each local branch with its remote counterpart (instead of doing `pull`). >> >> Testing: >> - [x] `make test` passes on Linux x64 >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > No need to fetch remotes Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1041 From ehelin at openjdk.java.net Wed Mar 10 10:22:10 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 10:22:10 GMT Subject: RFR: pr: update all local branches for commit comments [v2] In-Reply-To: References: Message-ID: On Mon, 1 Mar 2021 14:32:09 GMT, Robin Westberg wrote: > Not sure this is needed? The materialize call should have done a fetchAll as well.. The `materialize` doesn't do a `fetchAll`, but `materialize` will clone from the remote URI every time (passing the seed repo's directory to `--reference-if-possible`). So yes, you are correct, we don't need to update the remotes here. Fixed in most recent commit ?? ------------- PR: https://git.openjdk.java.net/skara/pull/1041 From ihse at openjdk.java.net Wed Mar 10 10:24:35 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Wed, 10 Mar 2021 10:24:35 GMT Subject: RFR: pr: update all local branches for commit comments [v2] In-Reply-To: References: Message-ID: On Wed, 10 Mar 2021 10:22:08 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that makes `CommitCommentsWorkItem` properly update all local branches prior to calling `ReadOnlyRepository.commitMetdata`. `ReadOnlyRepository.commitMetadata` is essentially `rev-list ?all` for Git and all local refs need to be updated for this to work. In order to make as few networks call as possible I manually merge each local branch with its remote counterpart (instead of doing `pull`). >> >> Testing: >> - [x] `make test` passes on Linux x64 >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > No need to fetch remotes LGTM ------------- Marked as reviewed by ihse (Committer). PR: https://git.openjdk.java.net/skara/pull/1041 From rwestberg at openjdk.java.net Wed Mar 10 10:25:23 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Mar 2021 10:25:23 GMT Subject: Integrated: 708: Email version of UI file comment used the wrong version of the file In-Reply-To: <7mj8UTFATaB0qwRCLDdxWJcMsiit-8RuaJsY0kgEfkU=.6114ea95-258d-4201-bbd1-63cc81843965@github.com> References: <7mj8UTFATaB0qwRCLDdxWJcMsiit-8RuaJsY0kgEfkU=.6114ea95-258d-4201-bbd1-63cc81843965@github.com> Message-ID: On Tue, 9 Mar 2021 09:45:35 GMT, Robin Westberg wrote: > When a comment is made on the "previous" version of a change, the line number may not match the reported hash. This should improve things. Tested manually on https://github.com/openjdk/jdk/pull/2843/files . This pull request has now been integrated. Changeset: 10ee68e4 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/10ee68e4 Stats: 20 lines in 1 file changed: 8 ins; 1 del; 11 mod 708: Email version of UI file comment used the wrong version of the file Reviewed-by: ehelin, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1044 From rwestberg at openjdk.java.net Wed Mar 10 10:25:12 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Mar 2021 10:25:12 GMT Subject: Integrated: 636: Quote @-characters in bridged emails In-Reply-To: References: Message-ID: <_nvX3BWV6uIuqmQ4ctEfShsAtangRb08hcjMIodqteU=.944529ce-5729-4904-8eb1-21fc178f672b@github.com> On Tue, 9 Mar 2021 14:49:44 GMT, Robin Westberg wrote: > It's not enough to use \ to escape the @ character, so we can use this: @nomention instead to prevent unwanted mentions. This pull request has now been integrated. Changeset: 421b1b6a Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/421b1b6a Stats: 12 lines in 2 files changed: 10 ins; 0 del; 2 mod 636: Quote @-characters in bridged emails Reviewed-by: ihse, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1045 From rwestberg at openjdk.java.net Wed Mar 10 10:25:48 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Mar 2021 10:25:48 GMT Subject: Integrated: 666: Integrated message delivered to wrong thread In-Reply-To: References: Message-ID: On Wed, 3 Mar 2021 14:27:00 GMT, Robin Westberg wrote: > If the head of a closed PR was present in the target branch, we considered the PR as integrated. But that's not necessarily true as anything could be the PR head depending on what you push. Just skip that part of the code. This pull request has now been integrated. Changeset: 591fb2c5 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/591fb2c5 Stats: 4 lines in 1 file changed: 0 ins; 4 del; 0 mod 666: Integrated message delivered to wrong thread Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1043 From rwestberg at openjdk.java.net Wed Mar 10 10:26:00 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Mar 2021 10:26:00 GMT Subject: Withdrawn: Add additional sync label tests, adjust the implementation to match In-Reply-To: References: Message-ID: On Wed, 24 Feb 2021 07:48:05 GMT, Robin Westberg wrote: > Adjust the implementation of the sync label rules to match expectations. This pull request has been closed without being integrated. ------------- PR: https://git.openjdk.java.net/skara/pull/1033 From ehelin at openjdk.java.net Wed Mar 10 10:31:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 10:31:40 GMT Subject: Integrated: pr: update all local branches for commit comments In-Reply-To: References: Message-ID: On Sun, 28 Feb 2021 20:05:22 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `CommitCommentsWorkItem` properly update all local branches prior to calling `ReadOnlyRepository.commitMetdata`. `ReadOnlyRepository.commitMetadata` is essentially `rev-list ?all` for Git and all local refs need to be updated for this to work. In order to make as few networks call as possible I manually merge each local branch with its remote counterpart (instead of doing `pull`). > > Testing: > - [x] `make test` passes on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 589227fb Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/589227fb Stats: 2 lines in 1 file changed: 1 ins; 0 del; 1 mod pr: update all local branches for commit comments Reviewed-by: rwestberg, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1041 From rwestberg at openjdk.java.net Wed Mar 10 10:35:39 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Mar 2021 10:35:39 GMT Subject: RFR: Read resolvedInBuild JBS property properly In-Reply-To: References: Message-ID: On Wed, 10 Mar 2021 09:38:12 GMT, Erik Helin wrote: >> The resolvedInBuild property was not read correctly from JBS, leading to incorrect issue labels. > > jbs/src/main/java/org/openjdk/skara/jbs/Backports.java line 77: > >> 75: } >> 76: if (issue.properties().containsKey("customfield_10006")) { >> 77: return JdkVersion.parse(versionString.get(0), issue.properties().get("customfield_10006").asString()); > > Would you mind creating a variable naming the custom field? For example: > > var resolvedInBuild = "customfield_10006"; > if (issue.properties().containsKey(resolvedInBuild)) { This exist in quite a few places already, and properly fixing it would require a larger refactoring. So I think we should do that separately. ------------- PR: https://git.openjdk.java.net/skara/pull/1042 From ehelin at openjdk.java.net Wed Mar 10 14:08:55 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 14:08:55 GMT Subject: RFR: Read resolvedInBuild JBS property properly In-Reply-To: References: Message-ID: On Mon, 1 Mar 2021 14:23:30 GMT, Robin Westberg wrote: > The resolvedInBuild property was not read correctly from JBS, leading to incorrect issue labels. Marked as reviewed by ehelin (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1042 From ehelin at openjdk.java.net Wed Mar 10 14:08:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 14:08:56 GMT Subject: RFR: Read resolvedInBuild JBS property properly In-Reply-To: References: Message-ID: On Wed, 10 Mar 2021 10:33:25 GMT, Robin Westberg wrote: >> jbs/src/main/java/org/openjdk/skara/jbs/Backports.java line 77: >> >>> 75: } >>> 76: if (issue.properties().containsKey("customfield_10006")) { >>> 77: return JdkVersion.parse(versionString.get(0), issue.properties().get("customfield_10006").asString()); >> >> Would you mind creating a variable naming the custom field? For example: >> >> var resolvedInBuild = "customfield_10006"; >> if (issue.properties().containsKey(resolvedInBuild)) { > > This exist in quite a few places already, and properly fixing it would require a larger refactoring. So I think we should do that separately. Ok, sounds good! ------------- PR: https://git.openjdk.java.net/skara/pull/1042 From ehelin at openjdk.java.net Wed Mar 10 15:00:10 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 15:00:10 GMT Subject: RFR: network: allow raw body in RestRequest Message-ID: Hi all, please review this patch that allows a raw body to be supplied to the `RestRequest.QueryBuilder.body` method. Thanks, Erik ------------- Commit messages: - network: allow raw body in RestRequest Changes: https://git.openjdk.java.net/skara/pull/1046/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1046&range=00 Stats: 60 lines in 2 files changed: 54 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/1046.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1046/head:pull/1046 PR: https://git.openjdk.java.net/skara/pull/1046 From ehelin at openjdk.java.net Wed Mar 10 15:14:26 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 15:14:26 GMT Subject: RFR: forge: add methods addCollaborator and canPush Message-ID: Hi all, please review this patch that adds two methods to `HostedRepository`: - `addCollabarator` - `canPush` These methods can be used to check and grant access for a user to a particular hosted repository. Thanks, Erik ------------- Depends on: https://git.openjdk.java.net/skara/pull/1046 Commit messages: - forge: add methods addCollaborator and canPush Changes: https://git.openjdk.java.net/skara/pull/1047/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1047&range=00 Stats: 62 lines in 5 files changed: 62 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1047.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1047/head:pull/1047 PR: https://git.openjdk.java.net/skara/pull/1047 From rwestberg at openjdk.java.net Wed Mar 10 15:52:15 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Mar 2021 15:52:15 GMT Subject: Integrated: Read resolvedInBuild JBS property properly In-Reply-To: References: Message-ID: On Mon, 1 Mar 2021 14:23:30 GMT, Robin Westberg wrote: > The resolvedInBuild property was not read correctly from JBS, leading to incorrect issue labels. This pull request has now been integrated. Changeset: 2c63cede Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/2c63cede Stats: 64 lines in 3 files changed: 61 ins; 0 del; 3 mod Read resolvedInBuild JBS property properly Reviewed-by: ehelin, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1042 From rwestberg at openjdk.java.net Wed Mar 10 16:05:47 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Mar 2021 16:05:47 GMT Subject: RFR: network: allow raw body in RestRequest In-Reply-To: References: Message-ID: On Wed, 10 Mar 2021 14:57:08 GMT, Erik Helin wrote: > Hi all, > > please review this patch that allows a raw body to be supplied to the `RestRequest.QueryBuilder.body` method. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1046 From rwestberg at openjdk.java.net Wed Mar 10 16:07:00 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 10 Mar 2021 16:07:00 GMT Subject: [skara] RFR: forge: add methods addCollaborator and canPush In-Reply-To: References: Message-ID: On Wed, 10 Mar 2021 15:11:30 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds two methods to `HostedRepository`: > > - `addCollabarator` > - `canPush` > > These methods can be used to check and grant access for a user to a particular hosted repository. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1047 From ehelin at openjdk.java.net Wed Mar 10 18:59:42 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 18:59:42 GMT Subject: Integrated: network: allow raw body in RestRequest In-Reply-To: References: Message-ID: On Wed, 10 Mar 2021 14:57:08 GMT, Erik Helin wrote: > Hi all, > > please review this patch that allows a raw body to be supplied to the `RestRequest.QueryBuilder.body` method. > > Thanks, > Erik This pull request has now been integrated. Changeset: 2e89f01e Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/2e89f01e Stats: 60 lines in 2 files changed: 54 ins; 0 del; 6 mod network: allow raw body in RestRequest Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1046 From ehelin at openjdk.java.net Wed Mar 10 19:01:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 19:01:40 GMT Subject: [skara] RFR: forge: add methods addCollaborator and canPush [v2] In-Reply-To: References: Message-ID: <3XaYZ1Shmp9WIxDAJ18h1TnONVjF6ShEkVO-2vg6xpc=.50a9ded6-443d-4dde-aff0-0fa3bc1b96af@github.com> > Hi all, > > please review this patch that adds two methods to `HostedRepository`: > > - `addCollabarator` > - `canPush` > > These methods can be used to check and grant access for a user to a particular hosted repository. > > Thanks, > Erik Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1047/files - new: https://git.openjdk.java.net/skara/pull/1047/files/e75f5a0c..e75f5a0c Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1047&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1047&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1047.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1047/head:pull/1047 PR: https://git.openjdk.java.net/skara/pull/1047 From ehelin at openjdk.java.net Wed Mar 10 19:01:41 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 10 Mar 2021 19:01:41 GMT Subject: [skara] Integrated: forge: add methods addCollaborator and canPush In-Reply-To: References: Message-ID: On Wed, 10 Mar 2021 15:11:30 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds two methods to `HostedRepository`: > > - `addCollabarator` > - `canPush` > > These methods can be used to check and grant access for a user to a particular hosted repository. > > Thanks, > Erik This pull request has now been integrated. Changeset: a1337d80 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/a1337d80 Stats: 62 lines in 5 files changed: 62 ins; 0 del; 0 mod forge: add methods addCollaborator and canPush Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1047 From rwestberg at openjdk.java.net Thu Mar 11 10:30:58 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 11 Mar 2021 10:30:58 GMT Subject: RFR: Allow merge PRs with an exact hash [v2] In-Reply-To: References: Message-ID: > Make it possible to create a merge-style PR with commits that are not already present in another existing repository. In this case, the hash of the commit to be merged must be specified, to allow for proper rebase / squash of the merge commit itself. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Allow configuration of integrators who can create merge-style pull requests ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1026/files - new: https://git.openjdk.java.net/skara/pull/1026/files/6d9ea629..cce9630f Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1026&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1026&range=00-01 Stats: 154 lines in 5 files changed: 142 ins; 5 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/1026.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1026/head:pull/1026 PR: https://git.openjdk.java.net/skara/pull/1026 From ehelin at openjdk.java.net Thu Mar 11 10:36:28 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 11 Mar 2021 10:36:28 GMT Subject: RFR: Allow merge PRs with an exact hash [v2] In-Reply-To: References: Message-ID: On Thu, 11 Mar 2021 10:30:58 GMT, Robin Westberg wrote: >> Make it possible to create a merge-style PR with commits that are not already present in another existing repository. In this case, the hash of the commit to be merged must be specified, to allow for proper rebase / squash of the merge commit itself. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Allow configuration of integrators who can create merge-style pull requests Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1026 From ehelin at openjdk.java.net Thu Mar 11 10:48:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 11 Mar 2021 10:48:27 GMT Subject: RFR: forge: add HostedRepository.restrictPushAccess Message-ID: <4_LORoCqY23isj4MvH3x93a0AfIfiFkmu_P2cd0BXCo=.d0af6714-dcfd-4105-acd1-981f85b78742@github.com> Hi all, please review this small patch that adds the method `HostedRepository.restrictPushAccess`. As the name implies the method can be used to restrict the user on a forge that can push to a specific branch in a hosted repository. Unfortunately this is hard to implement in `TestHostedRepository` (even if we would use hooks), so I opted to just do nothing in `TestHostedRepository`. Thanks, Erik ------------- Commit messages: - forge: add HostedRepository.restrictPushAccess Changes: https://git.openjdk.java.net/skara/pull/1048/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1048&range=00 Stats: 29 lines in 5 files changed: 29 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1048.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1048/head:pull/1048 PR: https://git.openjdk.java.net/skara/pull/1048 From rwestberg at openjdk.java.net Thu Mar 11 10:48:28 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 11 Mar 2021 10:48:28 GMT Subject: RFR: forge: add HostedRepository.restrictPushAccess In-Reply-To: <4_LORoCqY23isj4MvH3x93a0AfIfiFkmu_P2cd0BXCo=.d0af6714-dcfd-4105-acd1-981f85b78742@github.com> References: <4_LORoCqY23isj4MvH3x93a0AfIfiFkmu_P2cd0BXCo=.d0af6714-dcfd-4105-acd1-981f85b78742@github.com> Message-ID: On Thu, 11 Mar 2021 10:44:18 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds the method `HostedRepository.restrictPushAccess`. As the name implies the method can be used to restrict the user on a forge that can push to a specific branch in a hosted repository. Unfortunately this is hard to implement in `TestHostedRepository` (even if we would use hooks), so I opted to just do nothing in `TestHostedRepository`. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1048 From ehelin at openjdk.java.net Thu Mar 11 11:00:21 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 11 Mar 2021 11:00:21 GMT Subject: Integrated: forge: add HostedRepository.restrictPushAccess In-Reply-To: <4_LORoCqY23isj4MvH3x93a0AfIfiFkmu_P2cd0BXCo=.d0af6714-dcfd-4105-acd1-981f85b78742@github.com> References: <4_LORoCqY23isj4MvH3x93a0AfIfiFkmu_P2cd0BXCo=.d0af6714-dcfd-4105-acd1-981f85b78742@github.com> Message-ID: On Thu, 11 Mar 2021 10:44:18 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds the method `HostedRepository.restrictPushAccess`. As the name implies the method can be used to restrict the user on a forge that can push to a specific branch in a hosted repository. Unfortunately this is hard to implement in `TestHostedRepository` (even if we would use hooks), so I opted to just do nothing in `TestHostedRepository`. > > Thanks, > Erik This pull request has now been integrated. Changeset: fd80e0a6 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/fd80e0a6 Stats: 29 lines in 5 files changed: 29 ins; 0 del; 0 mod forge: add HostedRepository.restrictPushAccess Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1048 From ihse at openjdk.java.net Thu Mar 11 11:04:08 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 11 Mar 2021 11:04:08 GMT Subject: RFR: 913: Skara should honor .gitconfig and /etc/gitconfig Message-ID: In SKARA-868, the fix to ignore .gitconfig and /etc/gitconfig was applied universally, which is causing trouble for users. The intention from the filer was to just disable this when running the Skara tests. I still think we should have a way to ignore gitconfig when running tests, but we need to keep honoring the git configuration at runtime. ------------- Commit messages: - 913: Skara should honor .gitconfig and /etc/gitconfig Changes: https://git.openjdk.java.net/skara/pull/1049/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1049&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-913 Stats: 33 lines in 4 files changed: 17 ins; 0 del; 16 mod Patch: https://git.openjdk.java.net/skara/pull/1049.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1049/head:pull/1049 PR: https://git.openjdk.java.net/skara/pull/1049 From ihse at openjdk.java.net Thu Mar 11 11:53:50 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 11 Mar 2021 11:53:50 GMT Subject: [skara] RFR: 912: PR title correction logic can get stuck Message-ID: The PR title correct logic introduced with SKARA-572 can end up trying to correct the title forever. An observed case is where the JBS title ends with a trailing space. When trying to update the PR title to include this trailing space, it will be stripped by GitLab and no update will actually be done. This will then get retried again and again. The fix is to strip the JBS title before doing any comparisons. ------------- Commit messages: - 912: PR title correction logic can get stuck Changes: https://git.openjdk.java.net/skara/pull/1050/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1050&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-912 Stats: 22 lines in 3 files changed: 17 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/1050.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1050/head:pull/1050 PR: https://git.openjdk.java.net/skara/pull/1050 From magnus.ihse.bursie at oracle.com Thu Mar 11 12:02:31 2021 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Thu, 11 Mar 2021 13:02:31 +0100 Subject: [skara] RFR: 912: PR title correction logic can get stuck In-Reply-To: References: Message-ID: How come this email got a [skara] prefixed to the subject? But not the one for SKARA-913??? Hm... Checking my email history, there seems to be a handful of mails that has gotten a [skara] prefix, starting February 10th (but most of the mails do *not* get this). Did some configuration change happen that day? Is this prefix added by Skara mailing list bots, or by Mailman? I find this kinds of prefix annoying, but the intermittency is certainly even more annoying! /Magnus On 2021-03-11 12:53, Magnus Ihse Bursie wrote: > The PR title correct logic introduced with SKARA-572 can end up trying to correct the title forever. An observed case is where the JBS title ends with a trailing space. When trying to update the PR title to include this trailing space, it will be stripped by GitLab and no update will actually be done. This will then get retried again and again. > > The fix is to strip the JBS title before doing any comparisons. > > ------------- > > Commit messages: > - 912: PR title correction logic can get stuck > > Changes: https://git.openjdk.java.net/skara/pull/1050/files > Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1050&range=00 > Issue: https://bugs.openjdk.java.net/browse/SKARA-912 > Stats: 22 lines in 3 files changed: 17 ins; 0 del; 5 mod > Patch: https://git.openjdk.java.net/skara/pull/1050.diff > Fetch: git fetch https://git.openjdk.java.net/skara pull/1050/head:pull/1050 > > PR: https://git.openjdk.java.net/skara/pull/1050 From rwestberg at openjdk.java.net Thu Mar 11 13:28:55 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 11 Mar 2021 13:28:55 GMT Subject: RFR: 912: PR title correction logic can get stuck In-Reply-To: References: Message-ID: On Thu, 11 Mar 2021 11:50:30 GMT, Magnus Ihse Bursie wrote: > The PR title correct logic introduced with SKARA-572 can end up trying to correct the title forever. An observed case is where the JBS title ends with a trailing space. When trying to update the PR title to include this trailing space, it will be stripped by GitLab and no update will actually be done. This will then get retried again and again. > > The fix is to strip the JBS title before doing any comparisons. bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java line 950: > 948: > 949: // The PR title should contain the issue title without trailing space > 950: assertEquals("TEST-1: My second issue ending in space", prCutOff2.title()); Looks like this test is currently failing, should this be TEST-2? bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java line 173: > 171: var issue = project.issue(id); > 172: if (issue.isPresent()) { > 173: var issueTitle = issue.get().title().strip(); The title() method is called in a lot of places, perhaps it would be better to perform the stripping closer to the source? ------------- PR: https://git.openjdk.java.net/skara/pull/1050 From ehelin at openjdk.java.net Thu Mar 11 13:35:05 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 11 Mar 2021 13:35:05 GMT Subject: RFR: 913: Skara should honor .gitconfig and /etc/gitconfig In-Reply-To: References: Message-ID: <1eKugOUX7HV3UrXQBPsVvtR-SBHkJ_3E6Jt157kkDSE=.bba6239b-624f-4abb-a6cf-af69bed25633@github.com> On Thu, 11 Mar 2021 11:01:00 GMT, Magnus Ihse Bursie wrote: > In SKARA-868, the fix to ignore .gitconfig and /etc/gitconfig was applied universally, which is causing trouble for users. The intention from the filer was to just disable this when running the Skara tests. I still think we should have a way to ignore gitconfig when running tests, but we need to keep honoring the git configuration at runtime. vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java line 53: > 51: private static final Hash EMPTY_TREE = new Hash("4b825dc642cb6eb9a060e54bf8d69288fbee4904"); > 52: > 53: public static void ignoreUserConfiguration(boolean ignore) { I would probably have named the method `ignoreConfiguration` and skipped the `boolean ignore` parameter. It doesn't seem like we ever pass `false` to `ignoreUserConfiguration`. If we need it in then in the future then we can add a method like `enableConfiguration`. ------------- PR: https://git.openjdk.java.net/skara/pull/1049 From ihse at openjdk.java.net Thu Mar 11 14:00:48 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 11 Mar 2021 14:00:48 GMT Subject: RFR: 913: Skara should honor .gitconfig and /etc/gitconfig [v2] In-Reply-To: References: Message-ID: > In SKARA-868, the fix to ignore .gitconfig and /etc/gitconfig was applied universally, which is causing trouble for users. The intention from the filer was to just disable this when running the Skara tests. I still think we should have a way to ignore gitconfig when running tests, but we need to keep honoring the git configuration at runtime. Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: Updates as requested by reviewer. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1049/files - new: https://git.openjdk.java.net/skara/pull/1049/files/fbfe160a..06162f82 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1049&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1049&range=00-01 Stats: 7 lines in 3 files changed: 0 ins; 1 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/1049.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1049/head:pull/1049 PR: https://git.openjdk.java.net/skara/pull/1049 From ehelin at openjdk.java.net Thu Mar 11 14:00:49 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 11 Mar 2021 14:00:49 GMT Subject: RFR: 913: Skara should honor .gitconfig and /etc/gitconfig [v2] In-Reply-To: References: Message-ID: On Thu, 11 Mar 2021 13:58:11 GMT, Magnus Ihse Bursie wrote: >> In SKARA-868, the fix to ignore .gitconfig and /etc/gitconfig was applied universally, which is causing trouble for users. The intention from the filer was to just disable this when running the Skara tests. I still think we should have a way to ignore gitconfig when running tests, but we need to keep honoring the git configuration at runtime. > > Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: > > Updates as requested by reviewer. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1049 From ihse at openjdk.java.net Thu Mar 11 14:01:23 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 11 Mar 2021 14:01:23 GMT Subject: [skara] RFR: 912: PR title correction logic can get stuck In-Reply-To: References: Message-ID: <1Bk4AReLMKTSKJuGIamyZdXvdgFvDPGtF_bsgWTSw9E=.3141a0c7-f9b3-4e94-b799-f4ee76935899@github.com> On Thu, 11 Mar 2021 13:26:36 GMT, Robin Westberg wrote: >> The PR title correct logic introduced with SKARA-572 can end up trying to correct the title forever. An observed case is where the JBS title ends with a trailing space. When trying to update the PR title to include this trailing space, it will be stripped by GitLab and no update will actually be done. This will then get retried again and again. >> >> The fix is to strip the JBS title before doing any comparisons. > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java line 173: > >> 171: var issue = project.issue(id); >> 172: if (issue.isPresent()) { >> 173: var issueTitle = issue.get().title().strip(); > > The title() method is called in a lot of places, perhaps it would be better to perform the stripping closer to the source? I'm not sure what you mean by that? We did use `issue.get().title()` in lots of places, but I replaces them with `issueTitle `to only have a single strip. That's as close to the source I can see possible. > bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java line 950: > >> 948: >> 949: // The PR title should contain the issue title without trailing space >> 950: assertEquals("TEST-1: My second issue ending in space", prCutOff2.title()); > > Looks like this test is currently failing, should this be TEST-2? Yeah, my bad... i commented out the test before while developing to speed up the re-run time. Didn't realize this changed the behavior when bringing it back. Will fix. ------------- PR: https://git.openjdk.java.net/skara/pull/1050 From ihse at openjdk.java.net Thu Mar 11 14:06:32 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 11 Mar 2021 14:06:32 GMT Subject: RFR: 912: PR title correction logic can get stuck [v2] In-Reply-To: References: Message-ID: > The PR title correct logic introduced with SKARA-572 can end up trying to correct the title forever. An observed case is where the JBS title ends with a trailing space. When trying to update the PR title to include this trailing space, it will be stripped by GitLab and no update will actually be done. This will then get retried again and again. > > The fix is to strip the JBS title before doing any comparisons. Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: Fix issue numbering in test. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1050/files - new: https://git.openjdk.java.net/skara/pull/1050/files/63d915c4..6464ea93 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1050&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1050&range=00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1050.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1050/head:pull/1050 PR: https://git.openjdk.java.net/skara/pull/1050 From ihse at openjdk.java.net Thu Mar 11 14:10:22 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 11 Mar 2021 14:10:22 GMT Subject: Integrated: 913: Skara should honor .gitconfig and /etc/gitconfig In-Reply-To: References: Message-ID: On Thu, 11 Mar 2021 11:01:00 GMT, Magnus Ihse Bursie wrote: > In SKARA-868, the fix to ignore .gitconfig and /etc/gitconfig was applied universally, which is causing trouble for users. The intention from the filer was to just disable this when running the Skara tests. I still think we should have a way to ignore gitconfig when running tests, but we need to keep honoring the git configuration at runtime. This pull request has now been integrated. Changeset: dbef34b8 Author: Magnus Ihse Bursie URL: https://git.openjdk.java.net/skara/commit/dbef34b8 Stats: 33 lines in 4 files changed: 16 ins; 0 del; 17 mod 913: Skara should honor .gitconfig and /etc/gitconfig Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1049 From magnus.ihse.bursie at oracle.com Thu Mar 11 15:56:39 2021 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Thu, 11 Mar 2021 16:56:39 +0100 Subject: How do I update my local copy of a pull request? In-Reply-To: References: Message-ID: On 2021-03-04 16:44, Volker Simonis wrote: > Hi, > > every PR request has the following instruction for downloading it locally: > > $ git fetch https://git.openjdk.java.net/jdk pull/2570/head:pull/2570 > $ git checkout pull/2570 > > That works well for the first time. But what do I have to do if the PR > was updated with more commits (or force-pushed with a new version). > > While on the local branch "pull/2570" another "git fetch > https://git.openjdk.java.net/jdk pull/2570/head:pull/2570" fails with: > > fatal: Refusing to fetch into current branch refs/heads/pull/2570 of > non-bare repository > > If I switch to another branch first (i.e. "git checkout master") the > second "fetch" completes successfully (but I have to switch back to my > pull/2570 branch afterwards). > > Instead of issuing a second fetch command on my "pull/2570" branch, I > tried a simple "git pull" which returns: > > There is no tracking information for the current branch. > Please specify which branch you want to merge with. > See git-pull(1) for details. > > git pull > > If you wish to set tracking information for this branch you can do so with: > > git branch --set-upstream-to=/ pull/2570 > > The first advice is good, because "git pull > https://git.openjdk.java.net/jdk pull/2570/head" will indeed update my > branch. But the second advice (i.e. set tracking information for the > pull request branch) doesn't seem to work: > > git branch --set-upstream-to=https://git.openjdk.java.net/jdk/pull/2570/head > pull/2570 > error: the requested upstream branch > 'https://git.openjdk.java.net/jdk/pull/2570/head' does not exist > hint: > hint: If you are planning on basing your work on an upstream > hint: branch that already exists at the remote, you may need to > hint: run "git fetch" to retrieve it. > > Doing a "git fetch https://git.openjdk.java.net/jdk pull/2570/head" as > advised succeeds, but unfortunately doesn't fix the problem with > "--set-upstream-to...". > > So to cut a long story short, it seems the simplest way of updating > the local copy of a pull request is to run "git pull > https://git.openjdk.java.net/jdk pull/2570/head". If this isn't > something totally obvious, maybe we could at it to the "Download" > information at the end of each pull request? Perhaps something like this: --- Download To checkout this PR locally: |$ git fetch https://git.openjdk.java.net/jdk pull/2930/head:pull/2930| |$ git checkout pull/2930| | | To update a local copy with changes in the PR: |$ git pull https://git.openjdk.java.net/jdk pull/2930/head||| || --- Does that seem okay? > And there are still two remaining questions: > > 1. Why can't I set an upstream for the local pull request branch? Beats me. I've struggled with this as much as you have, but in contrast with you, I just gave up. :-) /Magnus > > 2. Why do all the instructions mention > "https://git.openjdk.java.net/jdk" instead of > "https://github.com/openjdk/jdk/". This always gives me the warning > "warning: redirecting to https://github.com/openjdk/jdk/". Might this > also cause other problems? > > Thank you and best regards, > Volker From magnus.ihse.bursie at oracle.com Thu Mar 11 16:00:31 2021 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Thu, 11 Mar 2021 17:00:31 +0100 Subject: How do I update my local copy of a pull request? In-Reply-To: References: <7859b91c-e63b-1804-7eda-b917a3f89cdc@oracle.com> Message-ID: <4d5c085b-4a19-cdec-73be-1bde13029544@oracle.com> On 2021-03-05 08:45, Volker Simonis wrote: > Hi Dalibor, > > Thanks for the link. I think the reason for having this indirection is > reasonable. > > Do you know if there's a way to disable the warnings? Unfortunately, there seems to be no way to disable that warning. :( /Magnus > > Best regards, > Volker > > > Dalibor Topic schrieb am Fr., 5. M?rz 2021, > 01:25: > >> Volker wrote: >> >>> 2. Why do all the instructions mention >>> "https://git.openjdk.java.net/jdk" instead of >>> "https://github.com/openjdk/jdk/". This always gives me the warning >>> "warning: redirecting to https://github.com/openjdk/jdk/". Might this >>> also cause other problems? >> >> From https://openjdk.java.net/jeps/369: >> >> The domain https://git.openjdk.java.net/ redirects to the OpenJDK >> Community's current source-code hosting provider. Source-code URLs >> recorded in JBS issues and mailing-list messages use this domain rather >> than the domain of the current provider. >> >> In order to prevent the Skara tooling from depending upon a particular >> provider's API, support for multiple external providers has been a >> strict requirement from the beginning. All of the tooling is also >> required to work with the open-source GitLab Community Edition (GitLab CE). >> >> cheers, >> dalibor topic >> >> -- >> Dalibor Topic >> Consulting Product Manager >> Phone: +494089091214 , Mobile: +491737185961 >> , Video: dalibor.topic at oracle.com >> >> >> Oracle Global Services Germany GmbH >> Hauptverwaltung: Riesstr. 25, D-80992 M?nchen >> Registergericht: Amtsgericht M?nchen, HRB 246209 >> Gesch?ftsf?hrer: Ralf Herrmann >> >> From volker.simonis at gmail.com Fri Mar 12 08:11:45 2021 From: volker.simonis at gmail.com (Volker Simonis) Date: Fri, 12 Mar 2021 09:11:45 +0100 Subject: How do I update my local copy of a pull request? In-Reply-To: References: Message-ID: On Thu, Mar 11, 2021 at 4:56 PM Magnus Ihse Bursie wrote: > > > > On 2021-03-04 16:44, Volker Simonis wrote: > > Hi, > > every PR request has the following instruction for downloading it locally: > > $ git fetch https://git.openjdk.java.net/jdk pull/2570/head:pull/2570 > $ git checkout pull/2570 > > That works well for the first time. But what do I have to do if the PR > was updated with more commits (or force-pushed with a new version). > > While on the local branch "pull/2570" another "git fetch > https://git.openjdk.java.net/jdk pull/2570/head:pull/2570" fails with: > > fatal: Refusing to fetch into current branch refs/heads/pull/2570 of > non-bare repository > > If I switch to another branch first (i.e. "git checkout master") the > second "fetch" completes successfully (but I have to switch back to my > pull/2570 branch afterwards). > > Instead of issuing a second fetch command on my "pull/2570" branch, I > tried a simple "git pull" which returns: > > There is no tracking information for the current branch. > Please specify which branch you want to merge with. > See git-pull(1) for details. > > git pull > > If you wish to set tracking information for this branch you can do so with: > > git branch --set-upstream-to=/ pull/2570 > > The first advice is good, because "git pull > https://git.openjdk.java.net/jdk pull/2570/head" will indeed update my > branch. But the second advice (i.e. set tracking information for the > pull request branch) doesn't seem to work: > > git branch --set-upstream-to=https://git.openjdk.java.net/jdk/pull/2570/head > pull/2570 > error: the requested upstream branch > 'https://git.openjdk.java.net/jdk/pull/2570/head' does not exist > hint: > hint: If you are planning on basing your work on an upstream > hint: branch that already exists at the remote, you may need to > hint: run "git fetch" to retrieve it. > > Doing a "git fetch https://git.openjdk.java.net/jdk pull/2570/head" as > advised succeeds, but unfortunately doesn't fix the problem with > "--set-upstream-to...". > > So to cut a long story short, it seems the simplest way of updating > the local copy of a pull request is to run "git pull > https://git.openjdk.java.net/jdk pull/2570/head". If this isn't > something totally obvious, maybe we could at it to the "Download" > information at the end of each pull request? > > > > Perhaps something like this: > --- > > Download > > To checkout this PR locally: > > $ git fetch https://git.openjdk.java.net/jdk pull/2930/head:pull/2930 > $ git checkout pull/2930 > > > To update a local copy with changes in the PR: > > $ git pull https://git.openjdk.java.net/jdk pull/2930/head > That sounds good. Maybe be even a little more specific like: To update a local copy of the PR: $ checkout pull/2930 $ git pull https://git.openjdk.java.net/jdk pull/2930/head > --- > > Does that seem okay? > > And there are still two remaining questions: > > 1. Why can't I set an upstream for the local pull request branch? > > Beats me. > > I've struggled with this as much as you have, but in contrast with you, I just gave up. :-) Thanks for your confession Magnus. If even you didn't manage to achieve this I feel a little less like a complete idiot :-) > > /Magnus > > > 2. Why do all the instructions mention > "https://git.openjdk.java.net/jdk" instead of > "https://github.com/openjdk/jdk/". This always gives me the warning > "warning: redirecting to https://github.com/openjdk/jdk/". Might this > also cause other problems? > > Thank you and best regards, > Volker > > From rwestberg at openjdk.java.net Fri Mar 12 08:20:19 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Mar 2021 08:20:19 GMT Subject: RFR: 912: PR title correction logic can get stuck [v2] In-Reply-To: <1Bk4AReLMKTSKJuGIamyZdXvdgFvDPGtF_bsgWTSw9E=.3141a0c7-f9b3-4e94-b799-f4ee76935899@github.com> References: <1Bk4AReLMKTSKJuGIamyZdXvdgFvDPGtF_bsgWTSw9E=.3141a0c7-f9b3-4e94-b799-f4ee76935899@github.com> Message-ID: On Thu, 11 Mar 2021 13:58:58 GMT, Magnus Ihse Bursie wrote: >> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java line 173: >> >>> 171: var issue = project.issue(id); >>> 172: if (issue.isPresent()) { >>> 173: var issueTitle = issue.get().title().strip(); >> >> The title() method is called in a lot of places, perhaps it would be better to perform the stripping closer to the source? > > I'm not sure what you mean by that? We did use `issue.get().title()` in lots of places, but I replaced them with `issueTitle `to only have a single strip. That's as close to the source I can see possible. I was thinking of usages outside of this particular function, perhaps like https://github.com/openjdk/skara/blob/dbef34b8c9785ec185a70365324063a02b1ec010/bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java#L256 - we probably don't want trailing tabs or spaces there either.. So instead of searching for more of these, my suggestion was to add a call to strip before returning from the title() method to avoid similar problems. ------------- PR: https://git.openjdk.java.net/skara/pull/1050 From ehelin at openjdk.java.net Fri Mar 12 08:44:33 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Mar 2021 08:44:33 GMT Subject: RFR: pr: update /backport command Message-ID: Hi all, please review this patch that updates the `/backport` commit command. This new version will _not_ create the pull request, instead it provides a link that the user can click to create the pull request. That is, the bot will still cherry-pick the original commit into its own repo, but the the user will create the pull request with a branch in the bot's repository as the source branch. This has the large benefit that the PR author is the person doing the backport (in the old model the bot was the PR author, that came with a number of issues). The bot will grant the backporter exclusive access to the branch with the backport in its repository in case the person doing the backport need to make additional changes. Thanks, Erik ------------- Commit messages: - pr: update /backport command Changes: https://git.openjdk.java.net/skara/pull/1051/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1051&range=00 Stats: 88 lines in 2 files changed: 30 ins; 25 del; 33 mod Patch: https://git.openjdk.java.net/skara/pull/1051.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1051/head:pull/1051 PR: https://git.openjdk.java.net/skara/pull/1051 From rwestberg at openjdk.java.net Fri Mar 12 08:45:04 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Mar 2021 08:45:04 GMT Subject: [skara] Integrated: Allow merge PRs with an exact hash In-Reply-To: References: Message-ID: On Mon, 22 Feb 2021 09:35:52 GMT, Robin Westberg wrote: > Make it possible to create a merge-style PR with commits that are not already present in another existing repository. In this case, the hash of the commit to be merged must be specified, to allow for proper rebase / squash of the merge commit itself. This pull request has now been integrated. Changeset: 236a071f Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/236a071f Stats: 316 lines in 6 files changed: 305 ins; 5 del; 6 mod Allow merge PRs with an exact hash Reviewed-by: ihse, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1026 From rwestberg at openjdk.java.net Fri Mar 12 08:46:54 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Mar 2021 08:46:54 GMT Subject: [skara] RFR: pr: update /backport command In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 08:41:33 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates the `/backport` commit command. This new version will _not_ create the pull request, instead it provides a link that the user can click to create the pull request. That is, the bot will still cherry-pick the original commit into its own repo, but the the user will create the pull request with a branch in the bot's repository as the source branch. This has the large benefit that the PR author is the person doing the backport (in the old model the bot was the PR author, that came with a number of issues). > > The bot will grant the backporter exclusive access to the branch with the backport in its repository in case the person doing the backport need to make additional changes. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1051 From ehelin at openjdk.java.net Fri Mar 12 08:54:20 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Mar 2021 08:54:20 GMT Subject: [skara] Integrated: pr: update /backport command In-Reply-To: References: Message-ID: <5KqBTwcKrRSuKpqny-4_9VV9vzvaE7xtER7WP4CHucM=.24131f10-1048-4d3d-abdd-ba4e84b70685@github.com> On Fri, 12 Mar 2021 08:41:33 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates the `/backport` commit command. This new version will _not_ create the pull request, instead it provides a link that the user can click to create the pull request. That is, the bot will still cherry-pick the original commit into its own repo, but the the user will create the pull request with a branch in the bot's repository as the source branch. This has the large benefit that the PR author is the person doing the backport (in the old model the bot was the PR author, that came with a number of issues). > > The bot will grant the backporter exclusive access to the branch with the backport in its repository in case the person doing the backport need to make additional changes. > > Thanks, > Erik This pull request has now been integrated. Changeset: edb217f8 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/edb217f8 Stats: 88 lines in 2 files changed: 30 ins; 25 del; 33 mod pr: update /backport command Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1051 From ihse at openjdk.java.net Fri Mar 12 10:41:44 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Mar 2021 10:41:44 GMT Subject: RFR: 912: PR title correction logic can get stuck [v3] In-Reply-To: References: Message-ID: > The PR title correct logic introduced with SKARA-572 can end up trying to correct the title forever. An observed case is where the JBS title ends with a trailing space. When trying to update the PR title to include this trailing space, it will be stripped by GitLab and no update will actually be done. This will then get retried again and again. > > The fix is to strip the JBS title before doing any comparisons. Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: Move strip() into implementation of title(), as requested by reviewer. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1050/files - new: https://git.openjdk.java.net/skara/pull/1050/files/6464ea93..2de1e70f Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1050&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1050&range=01-02 Stats: 12 lines in 7 files changed: 0 ins; 0 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/1050.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1050/head:pull/1050 PR: https://git.openjdk.java.net/skara/pull/1050 From ihse at openjdk.java.net Fri Mar 12 10:41:44 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Mar 2021 10:41:44 GMT Subject: RFR: 912: PR title correction logic can get stuck [v3] In-Reply-To: References: <1Bk4AReLMKTSKJuGIamyZdXvdgFvDPGtF_bsgWTSw9E=.3141a0c7-f9b3-4e94-b799-f4ee76935899@github.com> Message-ID: On Fri, 12 Mar 2021 08:18:05 GMT, Robin Westberg wrote: >> I'm not sure what you mean by that? We did use `issue.get().title()` in lots of places, but I replaced them with `issueTitle `to only have a single strip. That's as close to the source I can see possible. > > I was thinking of usages outside of this particular function, perhaps like https://github.com/openjdk/skara/blob/dbef34b8c9785ec185a70365324063a02b1ec010/bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java#L256 - we probably don't want trailing tabs or spaces there either.. So instead of searching for more of these, my suggestion was to add a call to strip before returning from the title() method to avoid similar problems. Seems a bit more risky since this can have effects on lots of other code. But sure, I fix it. I did try to look through the existing calls to title() and at least make a quick check that it seemed okay to strip the title. ------------- PR: https://git.openjdk.java.net/skara/pull/1050 From rwestberg at openjdk.java.net Fri Mar 12 11:56:51 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Mar 2021 11:56:51 GMT Subject: RFR: 912: PR title correction logic can get stuck [v3] In-Reply-To: References: Message-ID: <8GKpg6xoV_i9CobazYxNgveeQtdjW9GKAQTB2XZTAgg=.956813b0-dab8-4264-b746-6fb5f230e75f@github.com> On Fri, 12 Mar 2021 10:41:44 GMT, Magnus Ihse Bursie wrote: >> The PR title correct logic introduced with SKARA-572 can end up trying to correct the title forever. An observed case is where the JBS title ends with a trailing space. When trying to update the PR title to include this trailing space, it will be stripped by GitLab and no update will actually be done. This will then get retried again and again. >> >> The fix is to strip the JBS title before doing any comparisons. > > Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: > > Move strip() into implementation of title(), as requested by reviewer. Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1050 From rwestberg at openjdk.java.net Fri Mar 12 11:56:51 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Mar 2021 11:56:51 GMT Subject: RFR: 912: PR title correction logic can get stuck [v3] In-Reply-To: References: <1Bk4AReLMKTSKJuGIamyZdXvdgFvDPGtF_bsgWTSw9E=.3141a0c7-f9b3-4e94-b799-f4ee76935899@github.com> Message-ID: <1w7PIjynmo4r2Q8FDT5gJ7TE4jn05dX4a-4i_QX7nxo=.4d24b3d6-b834-4728-bed3-772264f3439b@github.com> On Fri, 12 Mar 2021 10:39:06 GMT, Magnus Ihse Bursie wrote: >> I was thinking of usages outside of this particular function, perhaps like https://github.com/openjdk/skara/blob/dbef34b8c9785ec185a70365324063a02b1ec010/bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java#L256 - we probably don't want trailing tabs or spaces there either.. So instead of searching for more of these, my suggestion was to add a call to strip before returning from the title() method to avoid similar problems. > > Seems a bit more risky since this can have effects on lots of other code. But sure, I fix it. I did try to look through the existing calls to title() and at least make a quick check that it seemed okay to strip the title. Thanks! Yeah if this change breaks anything, I think it's better that we find out now rather than worry about it. :) ------------- PR: https://git.openjdk.java.net/skara/pull/1050 From ihse at openjdk.java.net Fri Mar 12 13:15:09 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Mar 2021 13:15:09 GMT Subject: Integrated: 912: PR title correction logic can get stuck In-Reply-To: References: Message-ID: On Thu, 11 Mar 2021 11:50:30 GMT, Magnus Ihse Bursie wrote: > The PR title correct logic introduced with SKARA-572 can end up trying to correct the title forever. An observed case is where the JBS title ends with a trailing space. When trying to update the PR title to include this trailing space, it will be stripped by GitLab and no update will actually be done. This will then get retried again and again. > > The fix is to strip the JBS title before doing any comparisons. This pull request has now been integrated. Changeset: e664a653 Author: Magnus Ihse Bursie URL: https://git.openjdk.java.net/skara/commit/e664a653 Stats: 32 lines in 8 files changed: 17 ins; 0 del; 15 mod 912: PR title correction logic can get stuck Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1050 From ehelin at openjdk.java.net Fri Mar 12 14:59:20 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Mar 2021 14:59:20 GMT Subject: RFR: vcs: add support for pushing single tag Message-ID: Hi all, please review this patch that adds support to `Repository` for pushing a single tag. This is a bit hard to test with `HgRepository` given that tags in Mercurial are just commits, so I only added a test case for `GitRepository`. Thanks, Erik ------------- Commit messages: - vcs: add support for pushing single tag Changes: https://git.openjdk.java.net/skara/pull/1052/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1052&range=00 Stats: 69 lines in 4 files changed: 69 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1052.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1052/head:pull/1052 PR: https://git.openjdk.java.net/skara/pull/1052 From ehelin at openjdk.java.net Fri Mar 12 15:08:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Mar 2021 15:08:56 GMT Subject: RFR: forge: add webUrl(Tag tag) method Message-ID: Hi all, please review this small patch that adds support to `HostedRepository` for getting the web URL for a given tag. Thanks, Erik ------------- Commit messages: - forge: add webUrl(Tag tag) method Changes: https://git.openjdk.java.net/skara/pull/1054/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1054&range=00 Stats: 23 lines in 5 files changed: 23 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1054.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1054/head:pull/1054 PR: https://git.openjdk.java.net/skara/pull/1054 From ihse at openjdk.java.net Fri Mar 12 15:04:59 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Mar 2021 15:04:59 GMT Subject: RFR: Improve the Download message in PR description Message-ID: Both @simonis and I have struggled of finding the proper way to update a checked-out PR. Let's update the help text with Volker's findings of the best way to do this! ------------- Commit messages: - Improve the Download message in PR description Changes: https://git.openjdk.java.net/skara/pull/1053/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1053&range=00 Stats: 11 lines in 1 file changed: 9 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1053.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1053/head:pull/1053 PR: https://git.openjdk.java.net/skara/pull/1053 From ehelin at openjdk.java.net Fri Mar 12 15:09:50 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 12 Mar 2021 15:09:50 GMT Subject: RFR: Improve the Download message in PR description In-Reply-To: References: Message-ID: <6tZzz9Vyk8MQI1XpmfZEAjKlIv4KFmseo7SEqp8c5o0=.6cbf643d-ce8d-4d87-a0cd-c183569c851e@github.com> On Fri, 12 Mar 2021 15:02:04 GMT, Magnus Ihse Bursie wrote: > Both @simonis and I have struggled of finding the proper way to update a checked-out PR. Let's update the help text with Volker's findings of the best way to do this! You mean when you are updating your local copy of someone else's pull request? Because otherwise you just pull from your personal fork, right? ------------- PR: https://git.openjdk.java.net/skara/pull/1053 From ihse at openjdk.java.net Fri Mar 12 16:12:57 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Mar 2021 16:12:57 GMT Subject: RFR: Improve the Download message in PR description In-Reply-To: References: <6tZzz9Vyk8MQI1XpmfZEAjKlIv4KFmseo7SEqp8c5o0=.6cbf643d-ce8d-4d87-a0cd-c183569c851e@github.com> Message-ID: On Fri, 12 Mar 2021 15:14:25 GMT, Magnus Ihse Bursie wrote: >> You mean when you are updating your local copy of someone else's pull request? Because otherwise you just pull from your personal fork, right? > > If you follow the instructions in the Download section to get a local copy of the PR, this works just fine. However, if you want to update your local copy when the PR has changed with new code, this turned out to be a non-trivial exercise in gitology for both me and Volker (and many more, I presume). I think this is understood from the context of the "Download" part. See this thread https://mail.openjdk.java.net/pipermail/skara-dev/2021-March/004322.html ------------- PR: https://git.openjdk.java.net/skara/pull/1053 From rwestberg at openjdk.java.net Fri Mar 12 16:13:00 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Mar 2021 16:13:00 GMT Subject: [skara] RFR: forge: add webUrl(Tag tag) method In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 15:06:13 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds support to `HostedRepository` for getting the web URL for a given tag. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1054 From ihse at openjdk.java.net Fri Mar 12 16:12:57 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Mar 2021 16:12:57 GMT Subject: RFR: Improve the Download message in PR description In-Reply-To: <6tZzz9Vyk8MQI1XpmfZEAjKlIv4KFmseo7SEqp8c5o0=.6cbf643d-ce8d-4d87-a0cd-c183569c851e@github.com> References: <6tZzz9Vyk8MQI1XpmfZEAjKlIv4KFmseo7SEqp8c5o0=.6cbf643d-ce8d-4d87-a0cd-c183569c851e@github.com> Message-ID: On Fri, 12 Mar 2021 15:07:40 GMT, Erik Helin wrote: >> Both @simonis and I have struggled of finding the proper way to update a checked-out PR. Let's update the help text with Volker's findings of the best way to do this! > > You mean when you are updating your local copy of someone else's pull request? Because otherwise you just pull from your personal fork, right? If you follow the instructions in the Download section to get a local copy of the PR, this works just fine. However, if you want to update your local copy when the PR has changed with new code, this turned out to be a non-trivial exercise in gitology for both me and Volker (and many more, I presume). I think this is understood from the context of the "Download" part. ------------- PR: https://git.openjdk.java.net/skara/pull/1053 From rwestberg at openjdk.java.net Fri Mar 12 16:12:54 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 12 Mar 2021 16:12:54 GMT Subject: [skara] RFR: vcs: add support for pushing single tag In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 14:56:31 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds support to `Repository` for pushing a single tag. This is a bit hard to test with `HgRepository` given that tags in Mercurial are just commits, so I only added a test case for `GitRepository`. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1052 From ihse at openjdk.java.net Fri Mar 12 16:13:08 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Mar 2021 16:13:08 GMT Subject: [skara] RFR: Add missing copyright headers Message-ID: Multiple java files are missing copyright headers. I have now added proper copyright headers for those. The starting year in the copyright line was determined by "git log --follow" on each file, and using the year of the first commit. Some commit messages indicated that the code might have arrived there due to some refactoring, but I have not been motivated digging down further to track the origins of the code. ------------- Commit messages: - Add missing copyright headers Changes: https://git.openjdk.java.net/skara/pull/1055/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1055&range=00 Stats: 222 lines in 10 files changed: 220 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1055.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1055/head:pull/1055 PR: https://git.openjdk.java.net/skara/pull/1055 From ihse at openjdk.java.net Fri Mar 12 16:12:55 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Mar 2021 16:12:55 GMT Subject: [skara] RFR: vcs: add support for pushing single tag In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 14:56:31 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds support to `Repository` for pushing a single tag. This is a bit hard to test with `HgRepository` given that tags in Mercurial are just commits, so I only added a test case for `GitRepository`. > > Thanks, > Erik Looks good to me ------------- Marked as reviewed by ihse (Committer). PR: https://git.openjdk.java.net/skara/pull/1052 From ihse at openjdk.java.net Fri Mar 12 16:13:00 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 12 Mar 2021 16:13:00 GMT Subject: [skara] RFR: forge: add webUrl(Tag tag) method In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 15:06:13 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds support to `HostedRepository` for getting the web URL for a given tag. > > Thanks, > Erik LGTM ------------- PR: https://git.openjdk.java.net/skara/pull/1054 From ehelin at openjdk.java.net Mon Mar 15 09:03:53 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Mar 2021 09:03:53 GMT Subject: Integrated: vcs: add support for pushing single tag In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 14:56:31 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds support to `Repository` for pushing a single tag. This is a bit hard to test with `HgRepository` given that tags in Mercurial are just commits, so I only added a test case for `GitRepository`. > > Thanks, > Erik This pull request has now been integrated. Changeset: d93932e0 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/d93932e0 Stats: 69 lines in 4 files changed: 69 ins; 0 del; 0 mod vcs: add support for pushing single tag Reviewed-by: rwestberg, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1052 From ehelin at openjdk.java.net Mon Mar 15 09:03:33 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Mar 2021 09:03:33 GMT Subject: [skara] Integrated: forge: add webUrl(Tag tag) method In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 15:06:13 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds support to `HostedRepository` for getting the web URL for a given tag. > > Thanks, > Erik This pull request has now been integrated. Changeset: 263bdaf6 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/263bdaf6 Stats: 23 lines in 5 files changed: 23 ins; 0 del; 0 mod forge: add webUrl(Tag tag) method Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1054 From ehelin at openjdk.java.net Mon Mar 15 09:03:31 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Mar 2021 09:03:31 GMT Subject: RFR: Add missing copyright headers In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 16:00:35 GMT, Magnus Ihse Bursie wrote: > Multiple java files are missing copyright headers. I have now added proper copyright headers for those. > > The starting year in the copyright line was determined by "git log --follow" on each file, and using the year of the first commit. Some commit messages indicated that the code might have arrived there due to some refactoring, but I have not been motivated digging down further to track the origins of the code. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1055 From ehelin at openjdk.java.net Mon Mar 15 09:11:41 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Mar 2021 09:11:41 GMT Subject: RFR: pr: add /tag commit command Message-ID: <0Gorc6JtvMuUzPIVGsv0q9pEpvz4PbQZxGP_K5A_1Gw=.2b7c3b65-fc25-4df4-8c01-c120447ff448@github.com> Hi all, please review this patch that adds the `/tag` commit command. As the name implies, the command is used to create a tag with the given name referring to the commit the command is applied to. The command will check that the tag isn't already used and that it conforms to an eventual `.jcheck/conf` configuration. Thanks, Erik ------------- Commit messages: - pr: add /tag commit command Changes: https://git.openjdk.java.net/skara/pull/1056/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1056&range=00 Stats: 426 lines in 3 files changed: 425 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1056.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1056/head:pull/1056 PR: https://git.openjdk.java.net/skara/pull/1056 From rwestberg at openjdk.java.net Mon Mar 15 09:15:32 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Mar 2021 09:15:32 GMT Subject: [skara] RFR: pr: add /tag commit command In-Reply-To: <0Gorc6JtvMuUzPIVGsv0q9pEpvz4PbQZxGP_K5A_1Gw=.2b7c3b65-fc25-4df4-8c01-c120447ff448@github.com> References: <0Gorc6JtvMuUzPIVGsv0q9pEpvz4PbQZxGP_K5A_1Gw=.2b7c3b65-fc25-4df4-8c01-c120447ff448@github.com> Message-ID: On Mon, 15 Mar 2021 09:08:54 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `/tag` commit command. As the name implies, the command is used to create a tag with the given name referring to the commit the command is applied to. The command will check that the tag isn't already used and that it conforms to an eventual `.jcheck/conf` configuration. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1056 From ehelin at openjdk.java.net Mon Mar 15 09:26:44 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 15 Mar 2021 09:26:44 GMT Subject: Integrated: pr: add /tag commit command In-Reply-To: <0Gorc6JtvMuUzPIVGsv0q9pEpvz4PbQZxGP_K5A_1Gw=.2b7c3b65-fc25-4df4-8c01-c120447ff448@github.com> References: <0Gorc6JtvMuUzPIVGsv0q9pEpvz4PbQZxGP_K5A_1Gw=.2b7c3b65-fc25-4df4-8c01-c120447ff448@github.com> Message-ID: On Mon, 15 Mar 2021 09:08:54 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `/tag` commit command. As the name implies, the command is used to create a tag with the given name referring to the commit the command is applied to. The command will check that the tag isn't already used and that it conforms to an eventual `.jcheck/conf` configuration. > > Thanks, > Erik This pull request has now been integrated. Changeset: 0b326a68 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/0b326a68 Stats: 426 lines in 3 files changed: 425 ins; 0 del; 1 mod pr: add /tag commit command Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1056 From ihse at openjdk.java.net Mon Mar 15 10:14:23 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 15 Mar 2021 10:14:23 GMT Subject: Integrated: Add missing copyright headers In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 16:00:35 GMT, Magnus Ihse Bursie wrote: > Multiple java files are missing copyright headers. I have now added proper copyright headers for those. > > The starting year in the copyright line was determined by "git log --follow" on each file, and using the year of the first commit. Some commit messages indicated that the code might have arrived there due to some refactoring, but I have not been motivated digging down further to track the origins of the code. This pull request has now been integrated. Changeset: b39d50b1 Author: Magnus Ihse Bursie URL: https://git.openjdk.java.net/skara/commit/b39d50b1 Stats: 222 lines in 10 files changed: 220 ins; 0 del; 2 mod Add missing copyright headers Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1055 From rwestberg at openjdk.java.net Mon Mar 15 10:42:47 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Mar 2021 10:42:47 GMT Subject: RFR: Add support for using ssh cloning with GitLab Message-ID: Add support for configuring a GitLab forge to use ssh for cloning repositories using a private ssh key. ------------- Commit messages: - Add support for using ssh cloning with GitLab Changes: https://git.openjdk.java.net/skara/pull/1057/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1057&range=00 Stats: 78 lines in 4 files changed: 56 ins; 4 del; 18 mod Patch: https://git.openjdk.java.net/skara/pull/1057.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1057/head:pull/1057 PR: https://git.openjdk.java.net/skara/pull/1057 From ihse at openjdk.java.net Mon Mar 15 11:56:53 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 15 Mar 2021 11:56:53 GMT Subject: RFR: Add support for using ssh cloning with GitLab In-Reply-To: References: Message-ID: On Mon, 15 Mar 2021 10:39:44 GMT, Robin Westberg wrote: > Add support for configuring a GitLab forge to use ssh for cloning repositories using a private ssh key. forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabForgeFactory.java line 71: > 69: > 70: try { > 71: Files.writeString(cfgFile, result + filtered.strip() + "\n", StandardCharsets.UTF_8); Can this result in us writing to a users .ssh/config when running Skara CLI tools? forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabForgeFactory.java line 63: > 61: var existingMatcher = existingBlock.matcher(existing); > 62: var filtered = existingMatcher.replaceAll(""); > 63: var result = "Match host=" + userHost + "\n" + I don't think this is valid .ssh/config syntax. Afaik it should be `Match `, that is, no `=`. I see no tests in this PR. Are you sure this works? ------------- PR: https://git.openjdk.java.net/skara/pull/1057 From rwestberg at openjdk.java.net Mon Mar 15 12:40:39 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Mar 2021 12:40:39 GMT Subject: RFR: Add support for using ssh cloning with GitLab In-Reply-To: References: Message-ID: On Mon, 15 Mar 2021 11:53:36 GMT, Magnus Ihse Bursie wrote: >> Add support for configuring a GitLab forge to use ssh for cloning repositories using a private ssh key. > > forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabForgeFactory.java line 71: > >> 69: >> 70: try { >> 71: Files.writeString(cfgFile, result + filtered.strip() + "\n", StandardCharsets.UTF_8); > > Can this result in us writing to a users .ssh/config when running Skara CLI tools? No, CLI tools never pass a configuration object when creating a Forge. > forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabForgeFactory.java line 63: > >> 61: var existingMatcher = existingBlock.matcher(existing); >> 62: var filtered = existingMatcher.replaceAll(""); >> 63: var result = "Match host=" + userHost + "\n" + > > I don't think this is valid .ssh/config syntax. Afaik it should be `Match `, that is, no `=`. I see no tests in this PR. Are you sure this works? Yes, tested it manually and seems to work fine. And no, there are no automated tests that exercise GitLab or GitHub APIs, except for running them with a special credential configuration.. ------------- PR: https://git.openjdk.java.net/skara/pull/1057 From ihse at openjdk.java.net Mon Mar 15 12:40:39 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 15 Mar 2021 12:40:39 GMT Subject: RFR: Add support for using ssh cloning with GitLab In-Reply-To: References: Message-ID: On Mon, 15 Mar 2021 12:36:09 GMT, Robin Westberg wrote: >> forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabForgeFactory.java line 71: >> >>> 69: >>> 70: try { >>> 71: Files.writeString(cfgFile, result + filtered.strip() + "\n", StandardCharsets.UTF_8); >> >> Can this result in us writing to a users .ssh/config when running Skara CLI tools? > > No, CLI tools never pass a configuration object when creating a Forge. Good. ------------- PR: https://git.openjdk.java.net/skara/pull/1057 From ihse at openjdk.java.net Mon Mar 15 12:50:26 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 15 Mar 2021 12:50:26 GMT Subject: RFR: Add support for using ssh cloning with GitLab In-Reply-To: References: Message-ID: On Mon, 15 Mar 2021 12:38:26 GMT, Robin Westberg wrote: >> forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabForgeFactory.java line 63: >> >>> 61: var existingMatcher = existingBlock.matcher(existing); >>> 62: var filtered = existingMatcher.replaceAll(""); >>> 63: var result = "Match host=" + userHost + "\n" + >> >> I don't think this is valid .ssh/config syntax. Afaik it should be `Match `, that is, no `=`. I see no tests in this PR. Are you sure this works? > > Yes, tested it manually and seems to work fine. And no, there are no automated tests that exercise GitLab or GitHub APIs, except for running them with a special credential configuration.. I still think this does not follow the documented ssh config file syntax (https://man7.org/linux/man-pages/man5/ssh_config.5.html). And even if that works on your machine right now, it can break on a future update of ssh. ------------- PR: https://git.openjdk.java.net/skara/pull/1057 From rwestberg at openjdk.java.net Mon Mar 15 13:07:48 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Mar 2021 13:07:48 GMT Subject: RFR: Add support for using ssh cloning with GitLab [v2] In-Reply-To: References: Message-ID: <2NumaR56ULOjsKOs0FS7jJ4niQ17fF1oqDj1JCtv-oI=.e4d96568-a572-40e9-a00e-7ce7d1f45dd9@github.com> > Add support for configuring a GitLab forge to use ssh for cloning repositories using a private ssh key. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Use different configuration syntax ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1057/files - new: https://git.openjdk.java.net/skara/pull/1057/files/169c0cae..bf926255 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1057&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1057&range=00-01 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1057.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1057/head:pull/1057 PR: https://git.openjdk.java.net/skara/pull/1057 From rwestberg at openjdk.java.net Mon Mar 15 13:10:09 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 15 Mar 2021 13:10:09 GMT Subject: RFR: Add support for using ssh cloning with GitLab [v2] In-Reply-To: References: Message-ID: On Mon, 15 Mar 2021 12:48:16 GMT, Magnus Ihse Bursie wrote: >> Yes, tested it manually and seems to work fine. And no, there are no automated tests that exercise GitLab or GitHub APIs, except for running them with a special credential configuration.. > > I still think this does not follow the documented ssh config file syntax (https://man7.org/linux/man-pages/man5/ssh_config.5.html). And even if that works on your machine right now, it can break on a future update of ssh. > Configuration options may be separated by whitespace or optional whitespace and exactly one ?=? Still, works without it as well, so can certainly change it.. ------------- PR: https://git.openjdk.java.net/skara/pull/1057 From kcr at openjdk.java.net Mon Mar 15 13:13:26 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Mon, 15 Mar 2021 13:13:26 GMT Subject: RFR: pr: add /tag commit command In-Reply-To: References: <0Gorc6JtvMuUzPIVGsv0q9pEpvz4PbQZxGP_K5A_1Gw=.2b7c3b65-fc25-4df4-8c01-c120447ff448@github.com> Message-ID: On Mon, 15 Mar 2021 09:13:24 GMT, Robin Westberg wrote: >> Hi all, >> >> please review this patch that adds the `/tag` commit command. As the name implies, the command is used to create a tag with the given name referring to the commit the command is applied to. The command will check that the tag isn't already used and that it conforms to an eventual `.jcheck/conf` configuration. >> >> Thanks, >> Erik > > Looks good! Will a project be able to configure the role / review requirements for adding a tag? For example, I can imagine that some projects might want to allow a Reviewer to add a tag without needing review approval from another Reviewer. ------------- PR: https://git.openjdk.java.net/skara/pull/1056 From ihse at openjdk.java.net Mon Mar 15 13:43:02 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 15 Mar 2021 13:43:02 GMT Subject: RFR: Add support for using ssh cloning with GitLab [v2] In-Reply-To: <2NumaR56ULOjsKOs0FS7jJ4niQ17fF1oqDj1JCtv-oI=.e4d96568-a572-40e9-a00e-7ce7d1f45dd9@github.com> References: <2NumaR56ULOjsKOs0FS7jJ4niQ17fF1oqDj1JCtv-oI=.e4d96568-a572-40e9-a00e-7ce7d1f45dd9@github.com> Message-ID: On Mon, 15 Mar 2021 13:07:48 GMT, Robin Westberg wrote: >> Add support for configuring a GitLab forge to use ssh for cloning repositories using a private ssh key. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Use different configuration syntax LGTM ------------- Marked as reviewed by ihse (Committer). PR: https://git.openjdk.java.net/skara/pull/1057 From magnus.ihse.bursie at oracle.com Mon Mar 15 13:45:55 2021 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Mon, 15 Mar 2021 14:45:55 +0100 Subject: RFR: pr: add /tag commit command In-Reply-To: References: <0Gorc6JtvMuUzPIVGsv0q9pEpvz4PbQZxGP_K5A_1Gw=.2b7c3b65-fc25-4df4-8c01-c120447ff448@github.com> Message-ID: On 2021-03-15 14:13, Kevin Rushforth wrote: > On Mon, 15 Mar 2021 09:13:24 GMT, Robin Westberg wrote: > >>> Hi all, >>> >>> please review this patch that adds the `/tag` commit command. As the name implies, the command is used to create a tag with the given name referring to the commit the command is applied to. The command will check that the tag isn't already used and that it conforms to an eventual `.jcheck/conf` configuration. >>> >>> Thanks, >>> Erik >> Looks good! > Will a project be able to configure the role / review requirements for adding a tag? For example, I can imagine that some projects might want to allow a Reviewer to add a tag without needing review approval from another Reviewer. Tagging has never required review approval, now, has it? I thought integrator just applied tags for builds, basically on their own discretion. So my question is basically the opposite: are there projects where tagging *should* require a review procedure? /Magnus > > ------------- > > PR: https://git.openjdk.java.net/skara/pull/1056 From kcr at openjdk.java.net Mon Mar 15 15:40:19 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Mon, 15 Mar 2021 15:40:19 GMT Subject: RFR: pr: add /tag commit command In-Reply-To: References: <0Gorc6JtvMuUzPIVGsv0q9pEpvz4PbQZxGP_K5A_1Gw=.2b7c3b65-fc25-4df4-8c01-c120447ff448@github.com> Message-ID: <_QE2uYHMPkMp2ceFq2hwLgpBegmMHdsYuI-QlymwzSg=.aca33851-8a5c-462c-bebc-c279e1f2441d@github.com> On Mon, 15 Mar 2021 13:11:08 GMT, Kevin Rushforth wrote: >> Looks good! > > Will a project be able to configure the role / review requirements for adding a tag? For example, I can imagine that some projects might want to allow a Reviewer to add a tag without needing review approval from another Reviewer. > So my question is basically the opposite: are there projects where tagging *should* require a review procedure? Probably not. ------------- PR: https://git.openjdk.java.net/skara/pull/1056 From ehelin at openjdk.java.net Tue Mar 16 08:15:41 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 08:15:41 GMT Subject: RFR: vcs: add ReadOnlyRepository.commitMetadataFor Message-ID: Hi all, please review this patch that adds the method `ReadOnlyRepository.commitMetadataFor`. I opted to *not* implement the Mercurial version due to the way `HgRepository` tries to mimic Git branches using bookmarks. The Skara code that uses `HgRepository` has never needed to use branches, so the the current bookmark implementation is more of a proof-of-concept. The implementation of the `ReadOnlyRepository.commitMetadataFor` for `HgRepository` would look something like the following: @Override public List commitMetadataFor(List branches) throws IOException { var cmd = new ArrayList(); cmd.addAll(List.of("hg", "log", "--template", HgCommitMetadata.TEMPLATE)); for (var branch : branches) { cmd.add("--rev"); cmd.add("0:" + branch.name()); } return readMetadata(cmd); } The above will get messy however if `branches` contains a proper branch (e.g. `default`) and not just a bookmark. This can be solved, but I don't think it is worth it right now. If we ever need to write a tool interacting with Mercurial repositories that needs `commitMetadataFor` then we can implement the method then. Please also note that I had to name the method `commitMetadataFor` instead of just overloading `commitMetadata` since we already have `commitMetadata(List)`. Thanks, Erik ------------- Commit messages: - vcs: add ReadOnlyRepository.commitMetadataFor Changes: https://git.openjdk.java.net/skara/pull/1058/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1058&range=00 Stats: 71 lines in 5 files changed: 71 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1058.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1058/head:pull/1058 PR: https://git.openjdk.java.net/skara/pull/1058 From rwestberg at openjdk.java.net Tue Mar 16 08:25:21 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Mar 2021 08:25:21 GMT Subject: RFR: vcs: add ReadOnlyRepository.commitMetadataFor In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 08:12:19 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the method `ReadOnlyRepository.commitMetadataFor`. I opted to *not* implement the Mercurial version due to the way `HgRepository` tries to mimic Git branches using bookmarks. The Skara code that uses `HgRepository` has never needed to use branches, so the the current bookmark implementation is more of a proof-of-concept. The implementation of the `ReadOnlyRepository.commitMetadataFor` for `HgRepository` would look something like the following: > > @Override > public List commitMetadataFor(List branches) throws IOException { > var cmd = new ArrayList(); > cmd.addAll(List.of("hg", "log", "--template", HgCommitMetadata.TEMPLATE)); > for (var branch : branches) { > cmd.add("--rev"); > cmd.add("0:" + branch.name()); > } > return readMetadata(cmd); > } > > The above will get messy however if `branches` contains a proper branch (e.g. `default`) and not just a bookmark. This can be solved, but I don't think it is worth it right now. If we ever need to write a tool interacting with Mercurial repositories that needs `commitMetadataFor` then we can implement the method then. > > Please also note that I had to name the method `commitMetadataFor` instead of just overloading `commitMetadata` since we already have `commitMetadata(List)`. > > Thanks, > Erik Sounds reasonable! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1058 From ehelin at openjdk.java.net Tue Mar 16 08:36:48 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 08:36:48 GMT Subject: Integrated: vcs: add ReadOnlyRepository.commitMetadataFor In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 08:12:19 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the method `ReadOnlyRepository.commitMetadataFor`. I opted to *not* implement the Mercurial version due to the way `HgRepository` tries to mimic Git branches using bookmarks. The Skara code that uses `HgRepository` has never needed to use branches, so the the current bookmark implementation is more of a proof-of-concept. The implementation of the `ReadOnlyRepository.commitMetadataFor` for `HgRepository` would look something like the following: > > @Override > public List commitMetadataFor(List branches) throws IOException { > var cmd = new ArrayList(); > cmd.addAll(List.of("hg", "log", "--template", HgCommitMetadata.TEMPLATE)); > for (var branch : branches) { > cmd.add("--rev"); > cmd.add("0:" + branch.name()); > } > return readMetadata(cmd); > } > > The above will get messy however if `branches` contains a proper branch (e.g. `default`) and not just a bookmark. This can be solved, but I don't think it is worth it right now. If we ever need to write a tool interacting with Mercurial repositories that needs `commitMetadataFor` then we can implement the method then. > > Please also note that I had to name the method `commitMetadataFor` instead of just overloading `commitMetadata` since we already have `commitMetadata(List)`. > > Thanks, > Erik This pull request has now been integrated. Changeset: 902698ad Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/902698ad Stats: 71 lines in 5 files changed: 71 ins; 0 del; 0 mod vcs: add ReadOnlyRepository.commitMetadataFor Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1058 From ehelin at openjdk.java.net Tue Mar 16 09:02:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 09:02:45 GMT Subject: [skara] RFR: bot: don't run watchdogTrigger test on Windows Message-ID: Hi all, please review this small patch that disables the `BotRunnerTests.watchdogTrigger` on Windows. The bots aren't fully supported on Windows and this test has a tendency to fail intermittently in our GitHub Actions on Windows. So, lets disable the test on Windows for now until the bots one day might get proper Windows support. Thanks, Erik ------------- Commit messages: - bot: don't run watchdogTrigger test on Windows Changes: https://git.openjdk.java.net/skara/pull/1059/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1059&range=00 Stats: 4 lines in 1 file changed: 4 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1059.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1059/head:pull/1059 PR: https://git.openjdk.java.net/skara/pull/1059 From rwestberg at openjdk.java.net Tue Mar 16 09:02:45 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Mar 2021 09:02:45 GMT Subject: [skara] RFR: bot: don't run watchdogTrigger test on Windows In-Reply-To: References: Message-ID: <0JRiP2-itmwGQoZOKd9o9xrPITdtwbVFM8w5eQBwUbQ=.c60187e5-f5aa-4b23-b988-1aa20dba6da1@github.com> On Tue, 16 Mar 2021 08:59:11 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that disables the `BotRunnerTests.watchdogTrigger` on Windows. The bots aren't fully supported on Windows and this test has a tendency to fail intermittently in our GitHub Actions on Windows. So, lets disable the test on Windows for now until the bots one day might get proper Windows support. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1059 From ihse at openjdk.java.net Tue Mar 16 09:21:32 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 16 Mar 2021 09:21:32 GMT Subject: RFR: bot: don't run watchdogTrigger test on Windows In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 08:59:11 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that disables the `BotRunnerTests.watchdogTrigger` on Windows. The bots aren't fully supported on Windows and this test has a tendency to fail intermittently in our GitHub Actions on Windows. So, lets disable the test on Windows for now until the bots one day might get proper Windows support. > > Thanks, > Erik Marked as reviewed by ihse (Committer). ------------- PR: https://git.openjdk.java.net/skara/pull/1059 From rwestberg at openjdk.java.net Tue Mar 16 09:24:15 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Mar 2021 09:24:15 GMT Subject: [skara] RFR: 785: Failed tag updates are not automatically retried Message-ID: When the issue notifier encounters an error during tag processing, it flags the tag as in need of retry. However, the retry flag was not actually checked in subsequent runs. ------------- Commit messages: - Check if a tag update is marked for retry Changes: https://git.openjdk.java.net/skara/pull/1060/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1060&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-785 Stats: 101 lines in 2 files changed: 97 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1060.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1060/head:pull/1060 PR: https://git.openjdk.java.net/skara/pull/1060 From ehelin at openjdk.java.net Tue Mar 16 09:49:53 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 09:49:53 GMT Subject: [skara] RFR: Improve the Download message in PR description In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 15:02:04 GMT, Magnus Ihse Bursie wrote: > Both @simonis and I have struggled of finding the proper way to update a checked-out PR. Let's update the help text with Volker's findings of the best way to do this! Looks good ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1053 From ehelin at openjdk.java.net Tue Mar 16 09:49:54 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 09:49:54 GMT Subject: [skara] RFR: Improve the Download message in PR description In-Reply-To: References: <6tZzz9Vyk8MQI1XpmfZEAjKlIv4KFmseo7SEqp8c5o0=.6cbf643d-ce8d-4d87-a0cd-c183569c851e@github.com> Message-ID: <4FF1S-XX-J7SOXexfljWUKE0rYSPso3X48vQ4er04AY=.ff0e1784-9bf1-49fa-9d65-0f6651489b40@github.com> On Fri, 12 Mar 2021 15:15:06 GMT, Magnus Ihse Bursie wrote: >> If you follow the instructions in the Download section to get a local copy of the PR, this works just fine. However, if you want to update your local copy when the PR has changed with new code, this turned out to be a non-trivial exercise in gitology for both me and Volker (and many more, I presume). I think this is understood from the context of the "Download" part. > > See this thread https://mail.openjdk.java.net/pipermail/skara-dev/2021-March/004322.html Ok, I see what you want to do. My below instructions are not appropriate to add to the pull request body (due to the complexity of the commands), but the most ergonomic way to set this up is to just add a remote and add an additional fetch command: 1. `$ git remote add upstream https://git.openjdk.java.net/skara` 2. `$ git config --add remote.upstream.fetch '+refs/pull/*/head:refs/remotes/upstream/pull/*` Then whenever you want to checkout a pull request locally you can just run $ git fetch upstream # in case you haven't fetched in a while $ git checkout pull/1053 The above will ensure that the local branch `pull/1053` tracks `refs/remotes/upstream/pull/1053` which in turn is updated from `refs/pull/1053/head` whenever you run `git fetch upstream` ?? Again, a little bit _too_ long to add this information to pull request body, so I think we just go with your changes in this PR. Could potentially be something for an FAQ or the developer's guide? ------------- PR: https://git.openjdk.java.net/skara/pull/1053 From ehelin at openjdk.java.net Tue Mar 16 09:50:59 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 09:50:59 GMT Subject: [skara] Integrated: bot: don't run watchdogTrigger test on Windows In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 08:59:11 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that disables the `BotRunnerTests.watchdogTrigger` on Windows. The bots aren't fully supported on Windows and this test has a tendency to fail intermittently in our GitHub Actions on Windows. So, lets disable the test on Windows for now until the bots one day might get proper Windows support. > > Thanks, > Erik This pull request has now been integrated. Changeset: 763af0cf Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/763af0cf Stats: 4 lines in 1 file changed: 4 ins; 0 del; 0 mod bot: don't run watchdogTrigger test on Windows Reviewed-by: rwestberg, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1059 From rwestberg at openjdk.java.net Tue Mar 16 10:01:42 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Mar 2021 10:01:42 GMT Subject: RFR: vcs: make RepositoryTests deterministic In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 09:57:44 GMT, Erik Helin wrote: > Hi all, > > please review this small patch to make the test `RepositoryTests.testCommitMetadataWithBranchesWithGit` deterministic. The problem is that different versions of `git` can traverse the commit graph differently and the resulting list from the call to `commitMetadataFor` might therefore contain commits in an unknown order. The test should therefore not assume that the commits are ordered in a particular way, but instead ensure that the list contains only the expected commits. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1061 From ehelin at openjdk.java.net Tue Mar 16 10:04:54 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 10:04:54 GMT Subject: RFR: Add support for using ssh cloning with GitLab [v2] In-Reply-To: <2NumaR56ULOjsKOs0FS7jJ4niQ17fF1oqDj1JCtv-oI=.e4d96568-a572-40e9-a00e-7ce7d1f45dd9@github.com> References: <2NumaR56ULOjsKOs0FS7jJ4niQ17fF1oqDj1JCtv-oI=.e4d96568-a572-40e9-a00e-7ce7d1f45dd9@github.com> Message-ID: On Mon, 15 Mar 2021 13:07:48 GMT, Robin Westberg wrote: >> Add support for configuring a GitLab forge to use ssh for cloning repositories using a private ssh key. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Use different configuration syntax Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1057 From ehelin at openjdk.java.net Tue Mar 16 10:07:10 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 10:07:10 GMT Subject: RFR: 785: Failed tag updates are not automatically retried In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 09:20:57 GMT, Robin Westberg wrote: > When the issue notifier encounters an error during tag processing, it flags the tag as in need of retry. However, the retry flag was not actually checked in subsequent runs. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1060 From ehelin at openjdk.java.net Tue Mar 16 10:01:42 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 10:01:42 GMT Subject: RFR: vcs: make RepositoryTests deterministic Message-ID: Hi all, please review this small patch to make the test `RepositoryTests.testCommitMetadataWithBranchesWithGit` deterministic. The problem is that different versions of `git` can traverse the commit graph differently and the resulting list from the call to `commitMetadataFor` might therefore contain commits in an unknown order. The test should therefore not assume that the commits are ordered in a particular way, but instead ensure that the list contains only the expected commits. Thanks, Erik ------------- Commit messages: - vcs: make RepositoryTests deterministic Changes: https://git.openjdk.java.net/skara/pull/1061/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1061&range=00 Stats: 7 lines in 1 file changed: 0 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/1061.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1061/head:pull/1061 PR: https://git.openjdk.java.net/skara/pull/1061 From ehelin at openjdk.java.net Tue Mar 16 10:20:12 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 10:20:12 GMT Subject: Integrated: vcs: make RepositoryTests deterministic In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 09:57:44 GMT, Erik Helin wrote: > Hi all, > > please review this small patch to make the test `RepositoryTests.testCommitMetadataWithBranchesWithGit` deterministic. The problem is that different versions of `git` can traverse the commit graph differently and the resulting list from the call to `commitMetadataFor` might therefore contain commits in an unknown order. The test should therefore not assume that the commits are ordered in a particular way, but instead ensure that the list contains only the expected commits. > > Thanks, > Erik This pull request has now been integrated. Changeset: 79e20565 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/79e20565 Stats: 7 lines in 1 file changed: 0 ins; 0 del; 7 mod vcs: make RepositoryTests deterministic Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1061 From rwestberg at openjdk.java.net Tue Mar 16 10:24:57 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Mar 2021 10:24:57 GMT Subject: Integrated: Add support for using ssh cloning with GitLab In-Reply-To: References: Message-ID: <2kjYDendGvjYzsNCjClaom3xSrmcrY6ZOTYMRH08DZg=.ae17cbae-13e8-4c41-b7b0-45c9f97fa684@github.com> On Mon, 15 Mar 2021 10:39:44 GMT, Robin Westberg wrote: > Add support for configuring a GitLab forge to use ssh for cloning repositories using a private ssh key. This pull request has now been integrated. Changeset: 2ca0412d Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/2ca0412d Stats: 78 lines in 4 files changed: 56 ins; 4 del; 18 mod Add support for using ssh cloning with GitLab Reviewed-by: ihse, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1057 From ehelin at openjdk.java.net Tue Mar 16 10:29:23 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 10:29:23 GMT Subject: RFR: pr: use bare repo for CommitCommentsWorkItem Message-ID: <2_AWoSFAzXj4RTJwSOFou7tovPL_CM3rGbY_N_6ugfw=.6c083d83-7385-46d2-a2c9-af0507661e36@github.com> Hi all, please review this patch that makes `CommitCommentsWorkItem` use a bare repository and also always update the repository returned by `HostedRepositoryPool.materialize`. This will ensure that the repository is materialized a bit faster the first time and also that it is always up to date. Thanks, Erik ------------- Commit messages: - pr: use bare repo for CommitCommentsWorkItem Changes: https://git.openjdk.java.net/skara/pull/1062/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1062&range=00 Stats: 8 lines in 1 file changed: 1 ins; 4 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1062.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1062/head:pull/1062 PR: https://git.openjdk.java.net/skara/pull/1062 From rwestberg at openjdk.java.net Tue Mar 16 10:29:23 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Mar 2021 10:29:23 GMT Subject: RFR: pr: use bare repo for CommitCommentsWorkItem In-Reply-To: <2_AWoSFAzXj4RTJwSOFou7tovPL_CM3rGbY_N_6ugfw=.6c083d83-7385-46d2-a2c9-af0507661e36@github.com> References: <2_AWoSFAzXj4RTJwSOFou7tovPL_CM3rGbY_N_6ugfw=.6c083d83-7385-46d2-a2c9-af0507661e36@github.com> Message-ID: On Tue, 16 Mar 2021 10:25:17 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `CommitCommentsWorkItem` use a bare repository and also always update the repository returned by `HostedRepositoryPool.materialize`. This will ensure that the repository is materialized a bit faster the first time and also that it is always up to date. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1062 From ehelin at openjdk.java.net Tue Mar 16 10:36:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 10:36:27 GMT Subject: Integrated: pr: use bare repo for CommitCommentsWorkItem In-Reply-To: <2_AWoSFAzXj4RTJwSOFou7tovPL_CM3rGbY_N_6ugfw=.6c083d83-7385-46d2-a2c9-af0507661e36@github.com> References: <2_AWoSFAzXj4RTJwSOFou7tovPL_CM3rGbY_N_6ugfw=.6c083d83-7385-46d2-a2c9-af0507661e36@github.com> Message-ID: <2lx_garcQnb6VuB5D9WX496qS7l8lTTpm-HV8IfO8n0=.949d2ffe-1a9a-4ace-9861-238bedc43db3@github.com> On Tue, 16 Mar 2021 10:25:17 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `CommitCommentsWorkItem` use a bare repository and also always update the repository returned by `HostedRepositoryPool.materialize`. This will ensure that the repository is materialized a bit faster the first time and also that it is always up to date. > > Thanks, > Erik This pull request has now been integrated. Changeset: dc052db8 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/dc052db8 Stats: 8 lines in 1 file changed: 1 ins; 4 del; 3 mod pr: use bare repo for CommitCommentsWorkItem Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1062 From ihse at openjdk.java.net Tue Mar 16 12:25:17 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 16 Mar 2021 12:25:17 GMT Subject: RFR: 890: jdk.json mapping modules and some files to the wrong area Message-ID: Update jdk.json mailing list rules. ------------- Commit messages: - 890: jdk.json mapping modules and some files to the wrong area Changes: https://git.openjdk.java.net/skara/pull/1063/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1063&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-890 Stats: 89 lines in 1 file changed: 2 ins; 82 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/1063.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1063/head:pull/1063 PR: https://git.openjdk.java.net/skara/pull/1063 From ehelin at openjdk.java.net Tue Mar 16 12:25:17 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 12:25:17 GMT Subject: RFR: 890: jdk.json mapping modules and some files to the wrong area In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 12:20:47 GMT, Magnus Ihse Bursie wrote: > Update jdk.json mailing list rules. @AlanBateman would you mind having a look at the changes? Thanks! ?? ------------- PR: https://git.openjdk.java.net/skara/pull/1063 From ehelin at openjdk.java.net Tue Mar 16 12:33:32 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 12:33:32 GMT Subject: [skara] RFR: pr: align help text for commit commands Message-ID: <3N_PRHC02yPeqHcigUrN395IdcgcVS6rIDDWTE3-xDQ=.423cbdf6-bd03-47e3-9683-84658f760b4f@github.com> Hi all, please review this small patch that aligns the casing and content of the help text for commit commands. Thanks, Erik ------------- Commit messages: - pr: align help text for commit commands Changes: https://git.openjdk.java.net/skara/pull/1064/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1064&range=00 Stats: 2 lines in 2 files changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1064.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1064/head:pull/1064 PR: https://git.openjdk.java.net/skara/pull/1064 From alanb at openjdk.java.net Tue Mar 16 12:36:01 2021 From: alanb at openjdk.java.net (Alan Bateman) Date: Tue, 16 Mar 2021 12:36:01 GMT Subject: [skara] RFR: 890: jdk.json mapping modules and some files to the wrong area In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 12:20:47 GMT, Magnus Ihse Bursie wrote: > Update jdk.json mailing list rules. config/mailinglist/rules/jdk.json line 143: > 141: "make/modules/java.base/", > 142: "make/modules/java.prefs", > 143: "src/java.base/", This looks like core-libs-dev will be mailed for all changes in src/java.base, I don't think we want that as there it a lot of code in java.base that is maintained on other mailing lists. ------------- PR: https://git.openjdk.java.net/skara/pull/1063 From ihse at openjdk.java.net Tue Mar 16 12:37:07 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 16 Mar 2021 12:37:07 GMT Subject: Integrated: Improve the Download message in PR description In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 15:02:04 GMT, Magnus Ihse Bursie wrote: > Both @simonis and I have struggled of finding the proper way to update a checked-out PR. Let's update the help text with Volker's findings of the best way to do this! This pull request has now been integrated. Changeset: a6a7efaa Author: Magnus Ihse Bursie URL: https://git.openjdk.java.net/skara/commit/a6a7efaa Stats: 11 lines in 1 file changed: 9 ins; 0 del; 2 mod Improve the Download message in PR description Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1053 From ihse at openjdk.java.net Tue Mar 16 12:39:22 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 16 Mar 2021 12:39:22 GMT Subject: RFR: 890: jdk.json mapping modules and some files to the wrong area In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 12:33:51 GMT, Alan Bateman wrote: >> Update jdk.json mailing list rules. > > config/mailinglist/rules/jdk.json line 143: > >> 141: "make/modules/java.base/", >> 142: "make/modules/java.prefs", >> 143: "src/java.base/", > > This looks like core-libs-dev will be mailed for all changes in src/java.base, I don't think we want that as there it a lot of code in java.base that is maintained on other mailing lists. You are correct. I misread the statement in the bug report saying: `core-libs-dev cares about everything in src/java.base/*/native/libjava, no need to list specific files` as `core-libs-dev cares about everything in src/java.base/*, no need to list specific files`. My bad; will fix. ------------- PR: https://git.openjdk.java.net/skara/pull/1063 From ihse at openjdk.java.net Tue Mar 16 12:43:28 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 16 Mar 2021 12:43:28 GMT Subject: RFR: 890: jdk.json mapping modules and some files to the wrong area [v2] In-Reply-To: References: Message-ID: > Update jdk.json mailing list rules. Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: Restore detailed src/java.base list, only clean up libjava files. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1063/files - new: https://git.openjdk.java.net/skara/pull/1063/files/9d9673a3..3c25aec8 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1063&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1063&range=00-01 Stats: 52 lines in 1 file changed: 51 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1063.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1063/head:pull/1063 PR: https://git.openjdk.java.net/skara/pull/1063 From rwestberg at openjdk.java.net Tue Mar 16 12:50:04 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Mar 2021 12:50:04 GMT Subject: RFR: pr: align help text for commit commands In-Reply-To: <3N_PRHC02yPeqHcigUrN395IdcgcVS6rIDDWTE3-xDQ=.423cbdf6-bd03-47e3-9683-84658f760b4f@github.com> References: <3N_PRHC02yPeqHcigUrN395IdcgcVS6rIDDWTE3-xDQ=.423cbdf6-bd03-47e3-9683-84658f760b4f@github.com> Message-ID: On Tue, 16 Mar 2021 12:30:46 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that aligns the casing and content of the help text for commit commands. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1064 From ehelin at openjdk.java.net Tue Mar 16 12:57:48 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 12:57:48 GMT Subject: Integrated: pr: align help text for commit commands In-Reply-To: <3N_PRHC02yPeqHcigUrN395IdcgcVS6rIDDWTE3-xDQ=.423cbdf6-bd03-47e3-9683-84658f760b4f@github.com> References: <3N_PRHC02yPeqHcigUrN395IdcgcVS6rIDDWTE3-xDQ=.423cbdf6-bd03-47e3-9683-84658f760b4f@github.com> Message-ID: On Tue, 16 Mar 2021 12:30:46 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that aligns the casing and content of the help text for commit commands. > > Thanks, > Erik This pull request has now been integrated. Changeset: 6f95f730 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/6f95f730 Stats: 2 lines in 2 files changed: 0 ins; 0 del; 2 mod pr: align help text for commit commands Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1064 From rwestberg at openjdk.java.net Tue Mar 16 13:15:27 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Mar 2021 13:15:27 GMT Subject: RFR: Ensure the ssh configuration folder exists Message-ID: The ssh configuration folder needs to exist before a new configuration file can be created there. ------------- Commit messages: - Ensure the ssh configuration folder exists Changes: https://git.openjdk.java.net/skara/pull/1065/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1065&range=00 Stats: 7 lines in 1 file changed: 7 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1065.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1065/head:pull/1065 PR: https://git.openjdk.java.net/skara/pull/1065 From ehelin at openjdk.java.net Tue Mar 16 13:19:25 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 13:19:25 GMT Subject: RFR: Ensure the ssh configuration folder exists In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 13:12:41 GMT, Robin Westberg wrote: > The ssh configuration folder needs to exist before a new configuration file can be created there. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1065 From alanb at openjdk.java.net Tue Mar 16 13:22:21 2021 From: alanb at openjdk.java.net (Alan Bateman) Date: Tue, 16 Mar 2021 13:22:21 GMT Subject: RFR: 890: jdk.json mapping modules and some files to the wrong area [v2] In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 12:43:28 GMT, Magnus Ihse Bursie wrote: >> Update jdk.json mailing list rules. > > Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: > > Restore detailed src/java.base list, only clean up libjava files. Thanks, I think this looks right. ------------- Marked as reviewed by alanb (no project role). PR: https://git.openjdk.java.net/skara/pull/1063 From rwestberg at openjdk.java.net Tue Mar 16 14:11:27 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 16 Mar 2021 14:11:27 GMT Subject: [skara] Integrated: Ensure the ssh configuration folder exists In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 13:12:41 GMT, Robin Westberg wrote: > The ssh configuration folder needs to exist before a new configuration file can be created there. This pull request has now been integrated. Changeset: 2e05c535 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/2e05c535 Stats: 7 lines in 1 file changed: 7 ins; 0 del; 0 mod Ensure the ssh configuration folder exists Reviewed-by: ehelin, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/1065 From ihse at openjdk.java.net Tue Mar 16 14:11:32 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 16 Mar 2021 14:11:32 GMT Subject: RFR: Really fix so tests ignore .gitconfig Message-ID: It turned out that [SKARA-913](https://bugs.openjdk.java.net/browse/SKARA-913) which fixed unwanted side effects of [SKARA-868](https://bugs.openjdk.java.net/browse/SKARA-868), in fact broke Skara testing completely the way SKARA-868 was supposed to fix. In SKARA-913 only a few of the Skara tests were properly configured to really ignore the local configuration; something I discovered lately when running all tests on a machine with a .gitconfig that foils several git tests from running. Since there is no really single point of entry to say to the Repository logic "I am now running a test", I have created a wrapper TestableRepository.init(), which calls Repository.init() and makes sure ignoreConfiguration is on. At least this solves the problem for me. There might be other tests hiding where other strange configurations provoke a failure; I know of no systematic way to find all these, so I'll guess we have to fix that when it is discovered. ------------- Commit messages: - Replace Repository with TestableRepository in tests. Changes: https://git.openjdk.java.net/skara/pull/1066/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1066&range=00 Stats: 285 lines in 22 files changed: 53 ins; 3 del; 229 mod Patch: https://git.openjdk.java.net/skara/pull/1066.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1066/head:pull/1066 PR: https://git.openjdk.java.net/skara/pull/1066 From ihse at openjdk.java.net Tue Mar 16 14:11:27 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 16 Mar 2021 14:11:27 GMT Subject: [skara] RFR: Ensure the ssh configuration folder exists In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 13:12:41 GMT, Robin Westberg wrote: > The ssh configuration folder needs to exist before a new configuration file can be created there. Marked as reviewed by ihse (Committer). ------------- PR: https://git.openjdk.java.net/skara/pull/1065 From ehelin at openjdk.java.net Tue Mar 16 15:13:53 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 15:13:53 GMT Subject: RFR: 890: jdk.json mapping modules and some files to the wrong area [v2] In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 12:43:28 GMT, Magnus Ihse Bursie wrote: >> Update jdk.json mailing list rules. > > Magnus Ihse Bursie has updated the pull request incrementally with one additional commit since the last revision: > > Restore detailed src/java.base list, only clean up libjava files. Looks good ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1063 From ehelin at openjdk.java.net Tue Mar 16 15:13:54 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 16 Mar 2021 15:13:54 GMT Subject: RFR: 890: jdk.json mapping modules and some files to the wrong area [v2] In-Reply-To: References: Message-ID: <_-oFcnBerFM7WuAjiNgWZxCNDfnXcKp3yTeqzDE53G4=.12e8cf0b-28cc-46e1-b594-29e485c60ce2@github.com> On Tue, 16 Mar 2021 13:20:11 GMT, Alan Bateman wrote: > Thanks, I think this looks right. Thanks Alan for taking the time to review this! ------------- PR: https://git.openjdk.java.net/skara/pull/1063 From ihse at openjdk.java.net Tue Mar 16 15:57:41 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Tue, 16 Mar 2021 15:57:41 GMT Subject: Integrated: 890: jdk.json mapping modules and some files to the wrong area In-Reply-To: References: Message-ID: <0WBB_Wz4KMGpGy-Vdf12X2zyYPxn2H9xkmB8RbsW9UE=.74517b86-cae8-4622-9305-e404f76d4129@github.com> On Tue, 16 Mar 2021 12:20:47 GMT, Magnus Ihse Bursie wrote: > Update jdk.json mailing list rules. This pull request has now been integrated. Changeset: 7e3e460c Author: Magnus Ihse Bursie URL: https://git.openjdk.java.net/skara/commit/7e3e460c Stats: 39 lines in 1 file changed: 2 ins; 31 del; 6 mod 890: jdk.json mapping modules and some files to the wrong area Reviewed-by: alanb, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1063 From simonis at openjdk.java.net Tue Mar 16 16:58:38 2021 From: simonis at openjdk.java.net (Volker Simonis) Date: Tue, 16 Mar 2021 16:58:38 GMT Subject: [skara] RFR: Improve the Download message in PR description In-Reply-To: References: Message-ID: On Fri, 12 Mar 2021 15:02:04 GMT, Magnus Ihse Bursie wrote: > Both @simonis and I have struggled of finding the proper way to update a checked-out PR. Let's update the help text with Volker's findings of the best way to do this! Thanks @magicus for updating the download message and thanks @edvbld for shedding some light on how to properly define an upstream for pull requests :) If I understand you correct, with that setup a `git fetch upstream` will fetch *all* pull requests from upstream. Is that correct? ------------- PR: https://git.openjdk.java.net/skara/pull/1053 From manc at google.com Wed Mar 17 06:21:00 2021 From: manc at google.com (Man Cao) Date: Tue, 16 Mar 2021 23:21:00 -0700 Subject: Using PR /test instead of jdk-submit: "You need to get approval" Message-ID: Hi Skara developers, I tried to use the /test PR command in https://github.com/openjdk/jdk/pull/2986, and got the same "you need to get approval" message. Is the "/test" command supposed to work now? Also, I highly appreciate updating the wiki page to elaborate the procedure to use the /test command. Who can use it with or without the approval step? How does the approval process go? I also found presubmit tests using GitHub actions , which I can launch and it is currently queued. Do the presubmit tests provide similar coverage as the "/test" command? Is it preferred over the "/test" command? Thanks, -Man On 9/9/20 9:49 AM, Aleksey Shipilev wrote: > >* Hi, > *> >* Now I have questions for jdk-submit-like functionality :) > *> >* Look at this PR: > *>* https://github.com/openjdk/jdk/pull/92 > *> >* When both "/test tier1" and "/test builds" is requested, the bot replies: > *>* "@shipilev you need to get approval to run the tests in tier1 for > *>* commits up to ..." > *> >* I am confused about what that means. Does it mean I have to have some > *>* additional privileges to use /test? Does it mean the PR should be > *>* Reviewed first? Either way, I think the message should be a bit more clear. > * > The bot powering the /test command is feeling so-so at the moment, see > my reply to Yasumasa on jdk-dev [0]. I'm hoping to find some cycles to > fix this today, but there are few other bugs with high prio to handle at > the moment too :/ > I should have this fixed by end of this week, sorry for any > inconveniences this may have caused. > Thanks, > Erik > [0]: > https://mail.openjdk.java.net/pipermail/jdk-dev/2020-September/004702.html From rwestberg at openjdk.java.net Wed Mar 17 08:22:00 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Mar 2021 08:22:00 GMT Subject: RFR: 627: Review comments are in different order in different e-mails Message-ID: Sort review comments by filename and line to make the resulting emails more consistent. ------------- Commit messages: - Sort review comments by file and line Changes: https://git.openjdk.java.net/skara/pull/1067/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1067&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-627 Stats: 20 lines in 2 files changed: 12 ins; 0 del; 8 mod Patch: https://git.openjdk.java.net/skara/pull/1067.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1067/head:pull/1067 PR: https://git.openjdk.java.net/skara/pull/1067 From ehelin at openjdk.java.net Wed Mar 17 08:25:20 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 08:25:20 GMT Subject: RFR: 627: Review comments are in different order in different e-mails In-Reply-To: References: Message-ID: On Wed, 17 Mar 2021 08:18:57 GMT, Robin Westberg wrote: > Sort review comments by filename and line to make the resulting emails more consistent. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1067 From rwestberg at openjdk.java.net Wed Mar 17 08:34:22 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Mar 2021 08:34:22 GMT Subject: [skara] RFR: Construct a proper SSH URI Message-ID: When using SSH with GitLab, create a proper SSH URI to avoid unnecessary string manipulation later. ------------- Commit messages: - Construct a proper ssh uri Changes: https://git.openjdk.java.net/skara/pull/1068/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1068&range=00 Stats: 15 lines in 2 files changed: 0 ins; 8 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/1068.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1068/head:pull/1068 PR: https://git.openjdk.java.net/skara/pull/1068 From ehelin at openjdk.java.net Wed Mar 17 08:39:25 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 08:39:25 GMT Subject: RFR: Construct a proper SSH URI In-Reply-To: References: Message-ID: On Wed, 17 Mar 2021 08:31:27 GMT, Robin Westberg wrote: > When using SSH with GitLab, create a proper SSH URI to avoid unnecessary string manipulation later. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1068 From rwestberg at openjdk.java.net Wed Mar 17 08:42:37 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Mar 2021 08:42:37 GMT Subject: [skara] Integrated: 627: Review comments are in different order in different e-mails In-Reply-To: References: Message-ID: <9ZwsZA0B4ctur-CQLyAfctywNzXGyJGtdsi47fGYPlM=.e80f1b8d-abab-4d49-9134-355ec5d1401c@github.com> On Wed, 17 Mar 2021 08:18:57 GMT, Robin Westberg wrote: > Sort review comments by filename and line to make the resulting emails more consistent. This pull request has now been integrated. Changeset: 41e5dff9 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/41e5dff9 Stats: 20 lines in 2 files changed: 12 ins; 0 del; 8 mod 627: Review comments are in different order in different e-mails Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1067 From rwestberg at openjdk.java.net Wed Mar 17 08:51:56 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Mar 2021 08:51:56 GMT Subject: [skara] Integrated: Construct a proper SSH URI In-Reply-To: References: Message-ID: On Wed, 17 Mar 2021 08:31:27 GMT, Robin Westberg wrote: > When using SSH with GitLab, create a proper SSH URI to avoid unnecessary string manipulation later. This pull request has now been integrated. Changeset: 16ca4cbc Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/16ca4cbc Stats: 15 lines in 2 files changed: 0 ins; 8 del; 7 mod Construct a proper SSH URI Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1068 From ehelin at openjdk.java.net Wed Mar 17 09:20:41 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 09:20:41 GMT Subject: RFR: Really fix so tests ignore .gitconfig In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 14:08:02 GMT, Magnus Ihse Bursie wrote: > It turned out that [SKARA-913](https://bugs.openjdk.java.net/browse/SKARA-913) which fixed unwanted side effects of [SKARA-868](https://bugs.openjdk.java.net/browse/SKARA-868), in fact broke Skara testing completely the way SKARA-868 was supposed to fix. In SKARA-913 only a few of the Skara tests were properly configured to really ignore the local configuration; something I discovered lately when running all tests on a machine with a .gitconfig that foils several git tests from running. > > Since there is no really single point of entry to say to the Repository logic "I am now running a test", I have created a wrapper TestableRepository.init(), which calls Repository.init() and makes sure ignoreConfiguration is on. > > At least this solves the problem for me. There might be other tests hiding where other strange configurations provoke a failure; I know of no systematic way to find all these, so I'll guess we have to fix that when it is discovered. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1066 From ehelin at openjdk.java.net Wed Mar 17 10:34:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 10:34:27 GMT Subject: RFR: Improve the Download message in PR description In-Reply-To: References: Message-ID: <61YZfgg393gFf2VnutcQ1pWEXIGfPwZqmIpKBc7ozbQ=.9b4987d7-0b23-411d-9ee0-1c585e5699a2@github.com> On Tue, 16 Mar 2021 16:56:21 GMT, Volker Simonis wrote: >> Both @simonis and I have struggled of finding the proper way to update a checked-out PR. Let's update the help text with Volker's findings of the best way to do this! > > Thanks @magicus for updating the download message and thanks @edvbld for shedding some light on how to properly define an upstream for pull requests :) If I understand you correct, with that setup a `git fetch upstream` will fetch *all* pull requests from upstream. Is that correct? @simonis yep, that is correct. As usual when you fetch refs from a remote they will only becomes refs under `refs/remote//`, so you won't see all the refs when running e.g. `git branch` (you would have to run `git branch -a`). ------------- PR: https://git.openjdk.java.net/skara/pull/1053 From rwestberg at openjdk.java.net Wed Mar 17 10:44:36 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Mar 2021 10:44:36 GMT Subject: [skara] RFR: pr: add CommitCommandWorkItem.toString In-Reply-To: References: Message-ID: On Wed, 17 Mar 2021 10:41:12 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that overrides `toString` for `CommitCommandWorkItem`. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1069 From ehelin at openjdk.java.net Wed Mar 17 10:44:36 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 10:44:36 GMT Subject: [skara] RFR: pr: add CommitCommandWorkItem.toString Message-ID: Hi all, please review this small patch that overrides `toString` for `CommitCommandWorkItem`. Thanks, Erik ------------- Commit messages: - pr: add CommitCommandWorkItem.toString Changes: https://git.openjdk.java.net/skara/pull/1069/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1069&range=00 Stats: 5 lines in 1 file changed: 5 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1069.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1069/head:pull/1069 PR: https://git.openjdk.java.net/skara/pull/1069 From ehelin at openjdk.java.net Wed Mar 17 10:48:32 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 10:48:32 GMT Subject: RFR: pr: do not run commit commands when .jcheck/conf is missing Message-ID: <3mE6srcRol4_RTxwaQ3WBS2LR-EHC772QWeVhf1FZFI=.6e2806a9-84d3-4062-8ba4-d69d6a97d8cb@github.com> Hi all, please review this patch that ensures that we do _not_ run commit commands if there is no `.jcheck/conf` present in the tree for the commit. Thanks, Erik ------------- Commit messages: - pr: make CensusInstance.create return Optional Changes: https://git.openjdk.java.net/skara/pull/1070/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1070&range=00 Stats: 36 lines in 4 files changed: 18 ins; 8 del; 10 mod Patch: https://git.openjdk.java.net/skara/pull/1070.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1070/head:pull/1070 PR: https://git.openjdk.java.net/skara/pull/1070 From ehelin at openjdk.java.net Wed Mar 17 10:48:47 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 10:48:47 GMT Subject: [skara] Integrated: pr: add CommitCommandWorkItem.toString In-Reply-To: References: Message-ID: On Wed, 17 Mar 2021 10:41:12 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that overrides `toString` for `CommitCommandWorkItem`. > > Thanks, > Erik This pull request has now been integrated. Changeset: 89334c61 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/89334c61 Stats: 5 lines in 1 file changed: 5 ins; 0 del; 0 mod pr: add CommitCommandWorkItem.toString Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1069 From rwestberg at openjdk.java.net Wed Mar 17 10:52:21 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Mar 2021 10:52:21 GMT Subject: RFR: pr: do not run commit commands when .jcheck/conf is missing In-Reply-To: <3mE6srcRol4_RTxwaQ3WBS2LR-EHC772QWeVhf1FZFI=.6e2806a9-84d3-4062-8ba4-d69d6a97d8cb@github.com> References: <3mE6srcRol4_RTxwaQ3WBS2LR-EHC772QWeVhf1FZFI=.6e2806a9-84d3-4062-8ba4-d69d6a97d8cb@github.com> Message-ID: On Wed, 17 Mar 2021 10:45:42 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that we do _not_ run commit commands if there is no `.jcheck/conf` present in the tree for the commit. > > Thanks, > Erik Looks good, but might be nice with a test as well! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1070 From ehelin at openjdk.java.net Wed Mar 17 11:06:20 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 11:06:20 GMT Subject: RFR: pr: do not run commit commands when .jcheck/conf is missing [v2] In-Reply-To: <3mE6srcRol4_RTxwaQ3WBS2LR-EHC772QWeVhf1FZFI=.6e2806a9-84d3-4062-8ba4-d69d6a97d8cb@github.com> References: <3mE6srcRol4_RTxwaQ3WBS2LR-EHC772QWeVhf1FZFI=.6e2806a9-84d3-4062-8ba4-d69d6a97d8cb@github.com> Message-ID: <215y_GdVXP8yNxiwXPdhHbvbz-tOrRDWBEkx0btGXys=.44b13623-e433-4293-bfe9-cf3db4a400cb@github.com> > Hi all, > > please review this patch that ensures that we do _not_ run commit commands if there is no `.jcheck/conf` present in the tree for the commit. > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Add tests ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1070/files - new: https://git.openjdk.java.net/skara/pull/1070/files/3b462e33..e5e2b3be Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1070&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1070&range=00-01 Stats: 46 lines in 2 files changed: 39 ins; 1 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/1070.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1070/head:pull/1070 PR: https://git.openjdk.java.net/skara/pull/1070 From ehelin at openjdk.java.net Wed Mar 17 11:06:20 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 11:06:20 GMT Subject: Integrated: pr: do not run commit commands when .jcheck/conf is missing In-Reply-To: <3mE6srcRol4_RTxwaQ3WBS2LR-EHC772QWeVhf1FZFI=.6e2806a9-84d3-4062-8ba4-d69d6a97d8cb@github.com> References: <3mE6srcRol4_RTxwaQ3WBS2LR-EHC772QWeVhf1FZFI=.6e2806a9-84d3-4062-8ba4-d69d6a97d8cb@github.com> Message-ID: On Wed, 17 Mar 2021 10:45:42 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that we do _not_ run commit commands if there is no `.jcheck/conf` present in the tree for the commit. > > Thanks, > Erik This pull request has now been integrated. Changeset: 0a431284 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/0a431284 Stats: 75 lines in 5 files changed: 56 ins; 8 del; 11 mod pr: do not run commit commands when .jcheck/conf is missing Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1070 From ehelin at openjdk.java.net Wed Mar 17 13:34:44 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 13:34:44 GMT Subject: [skara] RFR: pr: add /integrate auto Message-ID: Hi all, please review this patch that adds the `auto` and `manual` arguments to the `/integrate` pull request command. If a contributor issues `/integrate auto` then the pull request will be automatically integrated when the pull request is ready (i.e. when jcheck passes). To aid reviewers that this is the case the label "auto" will be added to such pull requests. A contributor can always go back to "manual" mode by issuing the `/integrate auto`. This functionality is useful for smaller patches where you are certain that they are correct, for example fixing a typo in a comment. It it also useful for clean backports since most projects consider clean backports ready to be integrated without a review. This allows a backporter to add `/integrate auto` to the bottom of the PR body for a clean backport and then it will automatically be integrated if it is considered clean. I also added a bunch of unit tests. Thanks, Erik ------------- Commit messages: - pr: add /integrate auto Changes: https://git.openjdk.java.net/skara/pull/1071/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1071&range=00 Stats: 403 lines in 6 files changed: 389 ins; 6 del; 8 mod Patch: https://git.openjdk.java.net/skara/pull/1071.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1071/head:pull/1071 PR: https://git.openjdk.java.net/skara/pull/1071 From rwestberg at openjdk.java.net Wed Mar 17 14:04:44 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Mar 2021 14:04:44 GMT Subject: RFR: Decrease log level for harmless warning Message-ID: <0HXrsC1tO9t920NAPAYcL7EDHkk6Lgwyc00cKL2vkV4=.1d4456c4-5e12-4614-b738-7749127df3bc@github.com> Decrease log level of a warning that can be ignored. ------------- Commit messages: - Decrease log level Changes: https://git.openjdk.java.net/skara/pull/1072/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1072&range=00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1072.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1072/head:pull/1072 PR: https://git.openjdk.java.net/skara/pull/1072 From ehelin at openjdk.java.net Wed Mar 17 14:04:44 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 14:04:44 GMT Subject: RFR: Decrease log level for harmless warning In-Reply-To: <0HXrsC1tO9t920NAPAYcL7EDHkk6Lgwyc00cKL2vkV4=.1d4456c4-5e12-4614-b738-7749127df3bc@github.com> References: <0HXrsC1tO9t920NAPAYcL7EDHkk6Lgwyc00cKL2vkV4=.1d4456c4-5e12-4614-b738-7749127df3bc@github.com> Message-ID: On Wed, 17 Mar 2021 14:00:34 GMT, Robin Westberg wrote: > Decrease log level of a warning that can be ignored. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1072 From rwestberg at openjdk.java.net Wed Mar 17 14:22:45 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Mar 2021 14:22:45 GMT Subject: RFR: pr: add /integrate auto In-Reply-To: References: Message-ID: On Wed, 17 Mar 2021 13:31:58 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `auto` and `manual` arguments to the `/integrate` pull request command. If a contributor issues `/integrate auto` then the pull request will be automatically integrated when the pull request is ready (i.e. when jcheck passes). To aid reviewers that this is the case the label "auto" will be added to such pull requests. A contributor can always go back to "manual" mode by issuing the `/integrate auto`. > > This functionality is useful for smaller patches where you are certain that they are correct, for example fixing a typo in a comment. It it also useful for clean backports since most projects consider clean backports ready to be integrated without a review. This allows a backporter to add `/integrate auto` to the bottom of the PR body for a clean backport and then it will automatically be integrated if it is considered clean. > > I also added a bunch of unit tests. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1071 From rwestberg at openjdk.java.net Wed Mar 17 15:24:26 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 17 Mar 2021 15:24:26 GMT Subject: [skara] Integrated: Decrease log level for harmless warning In-Reply-To: <0HXrsC1tO9t920NAPAYcL7EDHkk6Lgwyc00cKL2vkV4=.1d4456c4-5e12-4614-b738-7749127df3bc@github.com> References: <0HXrsC1tO9t920NAPAYcL7EDHkk6Lgwyc00cKL2vkV4=.1d4456c4-5e12-4614-b738-7749127df3bc@github.com> Message-ID: On Wed, 17 Mar 2021 14:00:34 GMT, Robin Westberg wrote: > Decrease log level of a warning that can be ignored. This pull request has now been integrated. Changeset: 0cf48346 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/0cf48346 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Decrease log level for harmless warning Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1072 From ihse at openjdk.java.net Wed Mar 17 15:58:29 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Wed, 17 Mar 2021 15:58:29 GMT Subject: Integrated: Really fix so tests ignore .gitconfig In-Reply-To: References: Message-ID: On Tue, 16 Mar 2021 14:08:02 GMT, Magnus Ihse Bursie wrote: > It turned out that [SKARA-913](https://bugs.openjdk.java.net/browse/SKARA-913) which fixed unwanted side effects of [SKARA-868](https://bugs.openjdk.java.net/browse/SKARA-868), in fact broke Skara testing completely the way SKARA-868 was supposed to fix. In SKARA-913 only a few of the Skara tests were properly configured to really ignore the local configuration; something I discovered lately when running all tests on a machine with a .gitconfig that foils several git tests from running. > > Since there is no really single point of entry to say to the Repository logic "I am now running a test", I have created a wrapper TestableRepository.init(), which calls Repository.init() and makes sure ignoreConfiguration is on. > > At least this solves the problem for me. There might be other tests hiding where other strange configurations provoke a failure; I know of no systematic way to find all these, so I'll guess we have to fix that when it is discovered. This pull request has now been integrated. Changeset: a66ee40e Author: Magnus Ihse Bursie URL: https://git.openjdk.java.net/skara/commit/a66ee40e Stats: 285 lines in 22 files changed: 53 ins; 3 del; 229 mod Really fix so tests ignore .gitconfig Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1066 From simonis at openjdk.java.net Wed Mar 17 16:31:52 2021 From: simonis at openjdk.java.net (Volker Simonis) Date: Wed, 17 Mar 2021 16:31:52 GMT Subject: RFR: Improve the Download message in PR description In-Reply-To: <61YZfgg393gFf2VnutcQ1pWEXIGfPwZqmIpKBc7ozbQ=.9b4987d7-0b23-411d-9ee0-1c585e5699a2@github.com> References: <61YZfgg393gFf2VnutcQ1pWEXIGfPwZqmIpKBc7ozbQ=.9b4987d7-0b23-411d-9ee0-1c585e5699a2@github.com> Message-ID: <17IzPrzkG1KTzeIi8c3MKSZb8_iD96d4XpZqMnSfmKM=.b5158deb-b6d4-40f5-91a5-ad82344b0b04@github.com> On Wed, 17 Mar 2021 10:31:58 GMT, Erik Helin wrote: >> Thanks @magicus for updating the download message and thanks @edvbld for shedding some light on how to properly define an upstream for pull requests :) If I understand you correct, with that setup a `git fetch upstream` will fetch *all* pull requests from upstream. Is that correct? > > @simonis yep, that is correct. As usual when you fetch refs from a remote they will only becomes refs under `refs/remote//`, so you won't see all the refs when running e.g. `git branch` (you would have to run `git branch -a`). @edvbld thanks for the confirmation. I'll definitely put that line into my `.git/config` (if only to not forget the syntax :) ------------- PR: https://git.openjdk.java.net/skara/pull/1053 From ehelin at openjdk.java.net Wed Mar 17 19:51:00 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 19:51:00 GMT Subject: RFR: 823: git fork --setup-pre-push-hook => FAIL Message-ID: <7hizXVx9f197enwz66r-MgCLnVXaSuX32zEy8fpT8b8=.63719975-2d5b-4ee1-aafa-178f4f3e27b4@github.com> Hi all, please review this small patch that makes `git fork --setup-pre-push-hook` correctly pass `--setup-pre-push-hook` as a switch to `git-jcheck`. Thanks, Erik ------------- Commit messages: - cli: --setup-pre-push-hook is a switch Changes: https://git.openjdk.java.net/skara/pull/1073/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1073&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-823 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1073.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1073/head:pull/1073 PR: https://git.openjdk.java.net/skara/pull/1073 From ehelin at openjdk.java.net Wed Mar 17 20:19:22 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 17 Mar 2021 20:19:22 GMT Subject: RFR: 757: git webrev with file list fails if any file has not changed Message-ID: <-Dapwzd1BNhpvqcnm9SueJa3RcgsCYLOBkfm55so7Rc=.fb1145b5-744c-4973-b6ae-c26d78d19a26@github.com> Hi all, please review this patch that makes `git-webrev` print a warning when it encounters a file not present in the diff (for example if the user supplied a file list as argument). Testing: - [x] Manual testing on Linux x64 Thanks, Erik ------------- Commit messages: - skara-757 Changes: https://git.openjdk.java.net/skara/pull/1074/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1074&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-757 Stats: 14 lines in 3 files changed: 12 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1074.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1074/head:pull/1074 PR: https://git.openjdk.java.net/skara/pull/1074 From ehelin at openjdk.java.net Thu Mar 18 07:43:49 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 07:43:49 GMT Subject: git: openjdk/skara: pr: add /integrate auto Message-ID: <0d63f069-6aca-44e1-9961-d4f9d90b61f0@openjdk.org> Changeset: 77cbb929 Author: Erik Helin Date: 2021-03-18 07:43:28 +0000 URL: https://git.openjdk.java.net/skara/commit/77cbb929 pr: add /integrate auto Reviewed-by: rwestberg ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java ! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestCommandWorkItem.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/IntegrateTests.java ! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SponsorTests.java ! vcs/src/main/java/org/openjdk/skara/vcs/Hash.java From ehelin at openjdk.java.net Thu Mar 18 07:45:52 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 07:45:52 GMT Subject: [skara] Integrated: pr: add /integrate auto In-Reply-To: References: Message-ID: On Wed, 17 Mar 2021 13:31:58 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `auto` and `manual` arguments to the `/integrate` pull request command. If a contributor issues `/integrate auto` then the pull request will be automatically integrated when the pull request is ready (i.e. when jcheck passes). To aid reviewers that this is the case the label "auto" will be added to such pull requests. A contributor can always go back to "manual" mode by issuing the `/integrate auto`. > > This functionality is useful for smaller patches where you are certain that they are correct, for example fixing a typo in a comment. It it also useful for clean backports since most projects consider clean backports ready to be integrated without a review. This allows a backporter to add `/integrate auto` to the bottom of the PR body for a clean backport and then it will automatically be integrated if it is considered clean. > > I also added a bunch of unit tests. > > Thanks, > Erik This pull request has now been integrated. Changeset: 77cbb929 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/77cbb929 Stats: 403 lines in 6 files changed: 389 ins; 6 del; 8 mod pr: add /integrate auto Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1071 From ehelin at openjdk.java.net Thu Mar 18 07:56:26 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 07:56:26 GMT Subject: RFR: cli: add --atomic and --manual to git-pr-integrate Message-ID: Hi all, please review this patch that adds the switches `--atomic` and `--manual` to `git-pr-integrate`. These flags will simply just append either "atomic" or "manual" to the `/integrate` pull request command that `git-pr-integrate` creates. Testing: - [x] Manual testing on Linux x64 Thanks, Erik ------------- Commit messages: - cli: add --atomic and --manual to git-pr-integrate Changes: https://git.openjdk.java.net/skara/pull/1075/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1075&range=00 Stats: 29 lines in 1 file changed: 28 ins; 1 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1075.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1075/head:pull/1075 PR: https://git.openjdk.java.net/skara/pull/1075 From ehelin at openjdk.java.net Thu Mar 18 08:36:29 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 08:36:29 GMT Subject: RFR: cli: make it possible to configure forge name Message-ID: <4jnAcE9cCbpLYqPxMq7h0CNnkD32bK0KDFqBqB_ODeQ=.c11b066c-fc5a-4c77-b4a1-7f23db0b9391@github.com> Hi all, please review this patch that makes it possible to configure the forge name for a repository using `git config forge.name`, for example `git config forge.name github`. This can be useful for speeding up the forge selection logic in `Forge.from` so that the code doesn't have to query multiple candidate forges. Testing: - [x] Manual testing on Linux x64 Thanks, Erik ------------- Commit messages: - skara-895 Changes: https://git.openjdk.java.net/skara/pull/1076/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1076&range=00 Stats: 42 lines in 7 files changed: 22 ins; 0 del; 20 mod Patch: https://git.openjdk.java.net/skara/pull/1076.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1076/head:pull/1076 PR: https://git.openjdk.java.net/skara/pull/1076 From rwestberg at openjdk.java.net Thu Mar 18 09:00:30 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 18 Mar 2021 09:00:30 GMT Subject: RFR: 823: git fork --setup-pre-push-hook => FAIL In-Reply-To: <7hizXVx9f197enwz66r-MgCLnVXaSuX32zEy8fpT8b8=.63719975-2d5b-4ee1-aafa-178f4f3e27b4@github.com> References: <7hizXVx9f197enwz66r-MgCLnVXaSuX32zEy8fpT8b8=.63719975-2d5b-4ee1-aafa-178f4f3e27b4@github.com> Message-ID: On Wed, 17 Mar 2021 19:47:59 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes `git fork --setup-pre-push-hook` correctly pass `--setup-pre-push-hook` as a switch to `git-jcheck`. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1073 From rwestberg at openjdk.java.net Thu Mar 18 09:11:22 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 18 Mar 2021 09:11:22 GMT Subject: RFR: 757: git webrev with file list fails if any file has not changed In-Reply-To: <-Dapwzd1BNhpvqcnm9SueJa3RcgsCYLOBkfm55so7Rc=.fb1145b5-744c-4973-b6ae-c26d78d19a26@github.com> References: <-Dapwzd1BNhpvqcnm9SueJa3RcgsCYLOBkfm55so7Rc=.fb1145b5-744c-4973-b6ae-c26d78d19a26@github.com> Message-ID: On Wed, 17 Mar 2021 20:16:26 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `git-webrev` print a warning when it encounters a file not present in the diff (for example if the user supplied a file list as argument). > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1074 From rwestberg at openjdk.java.net Thu Mar 18 09:12:57 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 18 Mar 2021 09:12:57 GMT Subject: RFR: cli: add --atomic and --manual to git-pr-integrate In-Reply-To: References: Message-ID: On Thu, 18 Mar 2021 07:53:29 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the switches `--atomic` and `--manual` to `git-pr-integrate`. These flags will simply just append either "atomic" or "manual" to the `/integrate` pull request command that `git-pr-integrate` creates. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1075 From ehelin at openjdk.java.net Thu Mar 18 09:13:42 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 09:13:42 GMT Subject: [skara] RFR: 744: The "Webrevs" link in the PR has confusing link to the changes for just one commit Message-ID: Hi all, please review this pull request that makes the link to the commit after the webrev be a bit more useful. Previously we relied on the forge to "do the right thing" we it noticed a full hash to a commit (link to the changes). This worked fine on GitLab but didn't work as well on GitHub. I have now introduced a proper abstraction and use that to provide the same link on GitLab but a better link on GitHub. Thanks, Erik ------------- Commit messages: - skara-744 Changes: https://git.openjdk.java.net/skara/pull/1077/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1077&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-744 Stats: 25 lines in 6 files changed: 24 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1077.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1077/head:pull/1077 PR: https://git.openjdk.java.net/skara/pull/1077 From ehelin at openjdk.java.net Thu Mar 18 09:14:44 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 09:14:44 GMT Subject: Integrated: 823: git fork --setup-pre-push-hook => FAIL In-Reply-To: <7hizXVx9f197enwz66r-MgCLnVXaSuX32zEy8fpT8b8=.63719975-2d5b-4ee1-aafa-178f4f3e27b4@github.com> References: <7hizXVx9f197enwz66r-MgCLnVXaSuX32zEy8fpT8b8=.63719975-2d5b-4ee1-aafa-178f4f3e27b4@github.com> Message-ID: On Wed, 17 Mar 2021 19:47:59 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes `git fork --setup-pre-push-hook` correctly pass `--setup-pre-push-hook` as a switch to `git-jcheck`. > > Thanks, > Erik This pull request has now been integrated. Changeset: fedf7add Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/fedf7add Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod 823: git fork --setup-pre-push-hook => FAIL Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1073 From ehelin at openjdk.java.net Thu Mar 18 09:14:55 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 09:14:55 GMT Subject: Integrated: 757: git webrev with file list fails if any file has not changed In-Reply-To: <-Dapwzd1BNhpvqcnm9SueJa3RcgsCYLOBkfm55so7Rc=.fb1145b5-744c-4973-b6ae-c26d78d19a26@github.com> References: <-Dapwzd1BNhpvqcnm9SueJa3RcgsCYLOBkfm55so7Rc=.fb1145b5-744c-4973-b6ae-c26d78d19a26@github.com> Message-ID: On Wed, 17 Mar 2021 20:16:26 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes `git-webrev` print a warning when it encounters a file not present in the diff (for example if the user supplied a file list as argument). > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: e6502c8f Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/e6502c8f Stats: 14 lines in 3 files changed: 12 ins; 0 del; 2 mod 757: git webrev with file list fails if any file has not changed Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1074 From ehelin at openjdk.java.net Thu Mar 18 09:15:10 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 09:15:10 GMT Subject: [skara] Integrated: cli: add --atomic and --manual to git-pr-integrate In-Reply-To: References: Message-ID: On Thu, 18 Mar 2021 07:53:29 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the switches `--atomic` and `--manual` to `git-pr-integrate`. These flags will simply just append either "atomic" or "manual" to the `/integrate` pull request command that `git-pr-integrate` creates. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 60eb3a6e Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/60eb3a6e Stats: 29 lines in 1 file changed: 28 ins; 1 del; 0 mod cli: add --atomic and --manual to git-pr-integrate Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1075 From rwestberg at openjdk.java.net Thu Mar 18 09:18:21 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 18 Mar 2021 09:18:21 GMT Subject: RFR: cli: make it possible to configure forge name In-Reply-To: <4jnAcE9cCbpLYqPxMq7h0CNnkD32bK0KDFqBqB_ODeQ=.c11b066c-fc5a-4c77-b4a1-7f23db0b9391@github.com> References: <4jnAcE9cCbpLYqPxMq7h0CNnkD32bK0KDFqBqB_ODeQ=.c11b066c-fc5a-4c77-b4a1-7f23db0b9391@github.com> Message-ID: On Thu, 18 Mar 2021 08:33:34 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes it possible to configure the forge name for a repository using `git config forge.name`, for example `git config forge.name github`. This can be useful for speeding up the forge selection logic in `Forge.from` so that the code doesn't have to query multiple candidate forges. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik Looks good in general, but how about also storing this configuration automatically as well when auto-detection completes successfully (if it's not configured yet)? That way everyone could benefit from it on subsequent runs without having to configure it manually. ------------- PR: https://git.openjdk.java.net/skara/pull/1076 From rwestberg at openjdk.java.net Thu Mar 18 09:20:34 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 18 Mar 2021 09:20:34 GMT Subject: RFR: 744: The "Webrevs" link in the PR has confusing link to the changes for just one commit In-Reply-To: References: Message-ID: On Thu, 18 Mar 2021 09:10:31 GMT, Erik Helin wrote: > Hi all, > > please review this pull request that makes the link to the commit after the webrev be a bit more useful. Previously we relied on the forge to "do the right thing" we it noticed a full hash to a commit (link to the changes). This worked fine on GitLab but didn't work as well on GitHub. I have now introduced a proper abstraction and use that to provide the same link on GitLab but a better link on GitHub. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1077 From ehelin at openjdk.java.net Thu Mar 18 10:27:38 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 10:27:38 GMT Subject: Integrated: 744: The "Webrevs" link in the PR has confusing link to the changes for just one commit In-Reply-To: References: Message-ID: On Thu, 18 Mar 2021 09:10:31 GMT, Erik Helin wrote: > Hi all, > > please review this pull request that makes the link to the commit after the webrev be a bit more useful. Previously we relied on the forge to "do the right thing" we it noticed a full hash to a commit (link to the changes). This worked fine on GitLab but didn't work as well on GitHub. I have now introduced a proper abstraction and use that to provide the same link on GitLab but a better link on GitHub. > > Thanks, > Erik This pull request has now been integrated. Changeset: f16663b7 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/f16663b7 Stats: 25 lines in 6 files changed: 24 ins; 0 del; 1 mod 744: The "Webrevs" link in the PR has confusing link to the changes for just one commit Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1077 From ehelin at openjdk.java.net Thu Mar 18 10:37:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 10:37:40 GMT Subject: [skara] RFR: cli: make it possible to configure forge name [v2] In-Reply-To: <4jnAcE9cCbpLYqPxMq7h0CNnkD32bK0KDFqBqB_ODeQ=.c11b066c-fc5a-4c77-b4a1-7f23db0b9391@github.com> References: <4jnAcE9cCbpLYqPxMq7h0CNnkD32bK0KDFqBqB_ODeQ=.c11b066c-fc5a-4c77-b4a1-7f23db0b9391@github.com> Message-ID: > Hi all, > > please review this patch that makes it possible to configure the forge name for a repository using `git config forge.name`, for example `git config forge.name github`. This can be useful for speeding up the forge selection logic in `Forge.from` so that the code doesn't have to query multiple candidate forges. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Store forge name ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1076/files - new: https://git.openjdk.java.net/skara/pull/1076/files/113a7e11..bf5d450a Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1076&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1076&range=00-01 Stats: 18 lines in 1 file changed: 17 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1076.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1076/head:pull/1076 PR: https://git.openjdk.java.net/skara/pull/1076 From rwestberg at openjdk.java.net Thu Mar 18 10:37:40 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 18 Mar 2021 10:37:40 GMT Subject: [skara] RFR: cli: make it possible to configure forge name [v2] In-Reply-To: References: <4jnAcE9cCbpLYqPxMq7h0CNnkD32bK0KDFqBqB_ODeQ=.c11b066c-fc5a-4c77-b4a1-7f23db0b9391@github.com> Message-ID: On Thu, 18 Mar 2021 10:35:24 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that makes it possible to configure the forge name for a repository using `git config forge.name`, for example `git config forge.name github`. This can be useful for speeding up the forge selection logic in `Forge.from` so that the code doesn't have to query multiple candidate forges. >> >> Testing: >> - [x] Manual testing on Linux x64 >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > Store forge name Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1076 From ehelin at openjdk.java.net Thu Mar 18 10:37:41 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 10:37:41 GMT Subject: [skara] RFR: cli: make it possible to configure forge name In-Reply-To: References: <4jnAcE9cCbpLYqPxMq7h0CNnkD32bK0KDFqBqB_ODeQ=.c11b066c-fc5a-4c77-b4a1-7f23db0b9391@github.com> Message-ID: On Thu, 18 Mar 2021 09:16:09 GMT, Robin Westberg wrote: > Looks good in general, but how about also storing this configuration automatically as well when auto-detection completes successfully (if it's not configured yet)? Good idea! See the latest commit for an implementation ?? ------------- PR: https://git.openjdk.java.net/skara/pull/1076 From ehelin at openjdk.java.net Thu Mar 18 10:45:39 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 10:45:39 GMT Subject: RFR: 323: ArgumentParser should support --version Message-ID: <-sPyj86XQrGbYrkSimS6RpEQ02l1TGNdh24IqturWH4=.82463fd7-aed0-4c50-9cc2-d2eebad86e24@github.com> Hi all, please review this patch that makes the CLI tools **not** show an error when required flags and inputs are missing _and_ the flag `--version` is specified. If a user runs `git --version` then they shouldn't have to add required flags or input, they just want to see the version. Testing: - [x] Manual testing on Linux x64 Thanks, Erik ------------- Commit messages: - cli: skip required flags for --version Changes: https://git.openjdk.java.net/skara/pull/1078/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1078&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-323 Stats: 3 lines in 1 file changed: 2 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1078.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1078/head:pull/1078 PR: https://git.openjdk.java.net/skara/pull/1078 From rwestberg at openjdk.java.net Thu Mar 18 10:53:42 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 18 Mar 2021 10:53:42 GMT Subject: RFR: 323: ArgumentParser should support --version In-Reply-To: <-sPyj86XQrGbYrkSimS6RpEQ02l1TGNdh24IqturWH4=.82463fd7-aed0-4c50-9cc2-d2eebad86e24@github.com> References: <-sPyj86XQrGbYrkSimS6RpEQ02l1TGNdh24IqturWH4=.82463fd7-aed0-4c50-9cc2-d2eebad86e24@github.com> Message-ID: On Thu, 18 Mar 2021 10:42:50 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the CLI tools **not** show an error when required flags and inputs are missing _and_ the flag `--version` is specified. If a user runs `git --version` then they shouldn't have to add required flags or input, they just want to see the version. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1078 From ehelin at openjdk.java.net Thu Mar 18 10:53:41 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 10:53:41 GMT Subject: Integrated: cli: make it possible to configure forge name In-Reply-To: <4jnAcE9cCbpLYqPxMq7h0CNnkD32bK0KDFqBqB_ODeQ=.c11b066c-fc5a-4c77-b4a1-7f23db0b9391@github.com> References: <4jnAcE9cCbpLYqPxMq7h0CNnkD32bK0KDFqBqB_ODeQ=.c11b066c-fc5a-4c77-b4a1-7f23db0b9391@github.com> Message-ID: On Thu, 18 Mar 2021 08:33:34 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes it possible to configure the forge name for a repository using `git config forge.name`, for example `git config forge.name github`. This can be useful for speeding up the forge selection logic in `Forge.from` so that the code doesn't have to query multiple candidate forges. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: cd840285 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/cd840285 Stats: 59 lines in 7 files changed: 39 ins; 0 del; 20 mod cli: make it possible to configure forge name Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1076 From ehelin at openjdk.java.net Thu Mar 18 10:59:19 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 10:59:19 GMT Subject: Integrated: 323: ArgumentParser should support --version In-Reply-To: <-sPyj86XQrGbYrkSimS6RpEQ02l1TGNdh24IqturWH4=.82463fd7-aed0-4c50-9cc2-d2eebad86e24@github.com> References: <-sPyj86XQrGbYrkSimS6RpEQ02l1TGNdh24IqturWH4=.82463fd7-aed0-4c50-9cc2-d2eebad86e24@github.com> Message-ID: On Thu, 18 Mar 2021 10:42:50 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the CLI tools **not** show an error when required flags and inputs are missing _and_ the flag `--version` is specified. If a user runs `git --version` then they shouldn't have to add required flags or input, they just want to see the version. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: d4d23aa7 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/d4d23aa7 Stats: 3 lines in 1 file changed: 2 ins; 0 del; 1 mod 323: ArgumentParser should support --version Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1078 From rwestberg at openjdk.java.net Thu Mar 18 12:10:58 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 18 Mar 2021 12:10:58 GMT Subject: Integrated: 785: Failed tag updates are not automatically retried In-Reply-To: References: Message-ID: <_THiNn-aKTVB9m9qaSNXTA_bISF_AlZMkRT9eoEeYGM=.62abf161-01e4-436f-876e-edaa689d0077@github.com> On Tue, 16 Mar 2021 09:20:57 GMT, Robin Westberg wrote: > When the issue notifier encounters an error during tag processing, it flags the tag as in need of retry. However, the retry flag was not actually checked in subsequent runs. This pull request has now been integrated. Changeset: ffeba1a4 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/ffeba1a4 Stats: 101 lines in 2 files changed: 97 ins; 0 del; 4 mod 785: Failed tag updates are not automatically retried Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1060 From ehelin at openjdk.java.net Thu Mar 18 14:36:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 14:36:56 GMT Subject: RFR: cli: use credentials for --from in git-sync Message-ID: Hi all, please review this patch that makes sure that `git-sync` uses a username and password when fetching from the "from" repository in for case when `GIT_TOKEN` is set in the environment. Testing: - [x] Manual testing on Linux x64 Thanks, Erik ------------- Commit messages: - skara-798 Changes: https://git.openjdk.java.net/skara/pull/1079/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1079&range=00 Stats: 13 lines in 1 file changed: 13 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1079.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1079/head:pull/1079 PR: https://git.openjdk.java.net/skara/pull/1079 From rwestberg at openjdk.java.net Thu Mar 18 14:36:57 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 18 Mar 2021 14:36:57 GMT Subject: RFR: cli: use credentials for --from in git-sync In-Reply-To: References: Message-ID: On Thu, 18 Mar 2021 14:31:08 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes sure that `git-sync` uses a username and password when fetching from the "from" repository in for case when `GIT_TOKEN` is set in the environment. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1079 From ehelin at openjdk.java.net Thu Mar 18 20:49:51 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 18 Mar 2021 20:49:51 GMT Subject: Integrated: cli: use credentials for --from in git-sync In-Reply-To: References: Message-ID: On Thu, 18 Mar 2021 14:31:08 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes sure that `git-sync` uses a username and password when fetching from the "from" repository in for case when `GIT_TOKEN` is set in the environment. > > Testing: > - [x] Manual testing on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: c3df880a Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/c3df880a Stats: 13 lines in 1 file changed: 13 ins; 0 del; 0 mod cli: use credentials for --from in git-sync Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1079 From rwestberg at openjdk.java.net Fri Mar 19 08:22:36 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 19 Mar 2021 08:22:36 GMT Subject: RFR: Turn an exception into a log message to allow further issues to be processed Message-ID: It is possible for an issue to no longer be properly resolved by the time tagging occurs - in this case we can just skip it to allow the rest of the issues in the corresponding tag to get updated properly. ------------- Commit messages: - Turn an exception into a log message to allow further issues to be processed Changes: https://git.openjdk.java.net/skara/pull/1080/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1080&range=00 Stats: 2 lines in 1 file changed: 1 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1080.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1080/head:pull/1080 PR: https://git.openjdk.java.net/skara/pull/1080 From ehelin at openjdk.java.net Fri Mar 19 08:25:08 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 19 Mar 2021 08:25:08 GMT Subject: RFR: Turn an exception into a log message to allow further issues to be processed In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 08:19:27 GMT, Robin Westberg wrote: > It is possible for an issue to no longer be properly resolved by the time tagging occurs - in this case we can just skip it to allow the rest of the issues in the corresponding tag to get updated properly. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1080 From ehelin at openjdk.java.net Fri Mar 19 08:35:15 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 19 Mar 2021 08:35:15 GMT Subject: RFR: pr: use LinkedHashSet for CommitCommentsWorkItem Message-ID: Hi all, please review this patch that uses a `LinkedHashSet` instead of a regular `HashSet` for storing the hashes associated with a certain commit message title for the `CommitCommandsWorkItem`. This will increase the likelihood for `GitLabRepository.commitWithComment` finding the commit quicker, since `GitRepository.commitMetadataFor` will return metadata with the most recent commit first and the `LinkedHashSet` will return elements in insertion order when iterating over it. The effect is that `GitLabRepository.commitWithComment` will consider the candidates in chronological order with the most recent candidate first. This maps well to how contributors are likely to use commit commands - it will most likely be rare that someone makes a commit command on a very old commit. Thanks, Erik ------------- Commit messages: - pr: use LinkedHashSet for CommitCommentsWorkItem Changes: https://git.openjdk.java.net/skara/pull/1081/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1081&range=00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1081.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1081/head:pull/1081 PR: https://git.openjdk.java.net/skara/pull/1081 From rwestberg at openjdk.java.net Fri Mar 19 09:44:40 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 19 Mar 2021 09:44:40 GMT Subject: RFR: pr: use LinkedHashSet for CommitCommentsWorkItem In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 08:32:32 GMT, Erik Helin wrote: > Hi all, > > please review this patch that uses a `LinkedHashSet` instead of a regular `HashSet` for storing the hashes associated with a certain commit message title for the `CommitCommandsWorkItem`. This will increase the likelihood for `GitLabRepository.commitWithComment` finding the commit quicker, since `GitRepository.commitMetadataFor` will return metadata with the most recent commit first and the `LinkedHashSet` will return elements in insertion order when iterating over it. The effect is that `GitLabRepository.commitWithComment` will consider the candidates in chronological order with the most recent candidate first. This maps well to how contributors are likely to use commit commands - it will most likely be rare that someone makes a commit command on a very old commit. > > Thanks, > Erik Looks good! ------------- PR: https://git.openjdk.java.net/skara/pull/1081 From rwestberg at openjdk.java.net Fri Mar 19 09:48:35 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 19 Mar 2021 09:48:35 GMT Subject: Integrated: Turn an exception into a log message to allow further issues to be processed In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 08:19:27 GMT, Robin Westberg wrote: > It is possible for an issue to no longer be properly resolved by the time tagging occurs - in this case we can just skip it to allow the rest of the issues in the corresponding tag to get updated properly. This pull request has now been integrated. Changeset: affbc38a Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/affbc38a Stats: 2 lines in 1 file changed: 1 ins; 0 del; 1 mod Turn an exception into a log message to allow further issues to be processed Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1080 From rwestberg at openjdk.java.net Fri Mar 19 10:04:41 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 19 Mar 2021 10:04:41 GMT Subject: RFR: pr: use LinkedHashSet for CommitCommentsWorkItem In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 08:32:32 GMT, Erik Helin wrote: > Hi all, > > please review this patch that uses a `LinkedHashSet` instead of a regular `HashSet` for storing the hashes associated with a certain commit message title for the `CommitCommandsWorkItem`. This will increase the likelihood for `GitLabRepository.commitWithComment` finding the commit quicker, since `GitRepository.commitMetadataFor` will return metadata with the most recent commit first and the `LinkedHashSet` will return elements in insertion order when iterating over it. The effect is that `GitLabRepository.commitWithComment` will consider the candidates in chronological order with the most recent candidate first. This maps well to how contributors are likely to use commit commands - it will most likely be rare that someone makes a commit command on a very old commit. > > Thanks, > Erik Marked as reviewed by rwestberg (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1081 From ehelin at openjdk.java.net Fri Mar 19 10:04:41 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 19 Mar 2021 10:04:41 GMT Subject: Integrated: pr: use LinkedHashSet for CommitCommentsWorkItem In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 08:32:32 GMT, Erik Helin wrote: > Hi all, > > please review this patch that uses a `LinkedHashSet` instead of a regular `HashSet` for storing the hashes associated with a certain commit message title for the `CommitCommandsWorkItem`. This will increase the likelihood for `GitLabRepository.commitWithComment` finding the commit quicker, since `GitRepository.commitMetadataFor` will return metadata with the most recent commit first and the `LinkedHashSet` will return elements in insertion order when iterating over it. The effect is that `GitLabRepository.commitWithComment` will consider the candidates in chronological order with the most recent candidate first. This maps well to how contributors are likely to use commit commands - it will most likely be rare that someone makes a commit command on a very old commit. > > Thanks, > Erik This pull request has now been integrated. Changeset: 77107ba1 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/77107ba1 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod pr: use LinkedHashSet for CommitCommentsWorkItem Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1081 From rwestberg at openjdk.java.net Fri Mar 19 11:39:08 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 19 Mar 2021 11:39:08 GMT Subject: RFR: Avoid trying to update build number for tags that don't have one Message-ID: The issue notifier can be configured to update the build number of issues when a corresponding tag is created. However, certain tags don't contain build number information, so don't attempt this for those. ------------- Commit messages: - Avoid trying to update build number for tags that don't have one Changes: https://git.openjdk.java.net/skara/pull/1082/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1082&range=00 Stats: 31 lines in 5 files changed: 6 ins; 0 del; 25 mod Patch: https://git.openjdk.java.net/skara/pull/1082.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1082/head:pull/1082 PR: https://git.openjdk.java.net/skara/pull/1082 From ihse at openjdk.java.net Fri Mar 19 12:52:38 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 19 Mar 2021 12:52:38 GMT Subject: RFR: Add -t/--tool to pr show to use git difftool Message-ID: This will leverage the already existing `git pr show` to use your favorite diff viewer. ------------- Commit messages: - Add -t/--tool to pr show to use git difftool Changes: https://git.openjdk.java.net/skara/pull/1083/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1083&range=00 Stats: 13 lines in 2 files changed: 6 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/1083.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1083/head:pull/1083 PR: https://git.openjdk.java.net/skara/pull/1083 From ihse at openjdk.java.net Fri Mar 19 12:52:38 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 19 Mar 2021 12:52:38 GMT Subject: RFR: Add -t/--tool to pr show to use git difftool In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 12:49:01 GMT, Magnus Ihse Bursie wrote: > This will leverage the already existing `git pr show` to use your favorite diff viewer. There are no tests for the CLI; I have done adhoc testing on my computer to verify that it works. ------------- PR: https://git.openjdk.java.net/skara/pull/1083 From ehelin at openjdk.java.net Fri Mar 19 15:08:46 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 19 Mar 2021 15:08:46 GMT Subject: RFR: pr: enable exclusion of commit comments authors Message-ID: Hi all, please review this patch that makes it possible to configure whose commits comments should be ignored. This mechanism will be used to exclude commit comments from the bots (who make the vast majority of commit comments). This will speed up `GitLabRepository.recentCommitComments` quite a bit. Thanks, Erik ------------- Commit messages: - pr: exclude commit comments from bots Changes: https://git.openjdk.java.net/skara/pull/1084/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1084&range=00 Stats: 34 lines in 9 files changed: 23 ins; 0 del; 11 mod Patch: https://git.openjdk.java.net/skara/pull/1084.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1084/head:pull/1084 PR: https://git.openjdk.java.net/skara/pull/1084 From ehelin at openjdk.java.net Fri Mar 19 15:09:02 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 19 Mar 2021 15:09:02 GMT Subject: [skara] RFR: Add -t/--tool to pr show to use git difftool In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 12:49:01 GMT, Magnus Ihse Bursie wrote: > This will leverage the already existing `git pr show` to use your favorite diff viewer. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1083 From ihse at openjdk.java.net Fri Mar 19 15:27:41 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 19 Mar 2021 15:27:41 GMT Subject: RFR: Remove java.lang.invoke from hotspot-compiler Message-ID: As per request from Claes. ------------- Commit messages: - Remove java.lang.invoke from hotspot-compiler Changes: https://git.openjdk.java.net/skara/pull/1085/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1085&range=00 Stats: 1 line in 1 file changed: 0 ins; 1 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1085.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1085/head:pull/1085 PR: https://git.openjdk.java.net/skara/pull/1085 From ihse at openjdk.java.net Fri Mar 19 15:27:45 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 19 Mar 2021 15:27:45 GMT Subject: [skara] Integrated: Add -t/--tool to pr show to use git difftool In-Reply-To: References: Message-ID: <2jB5cTuuFH6vW_95KT9vAzH3ikBm7nYOPA_E4U_wLiY=.86d6b587-97ce-48d3-95e0-a68ca21b38cf@github.com> On Fri, 19 Mar 2021 12:49:01 GMT, Magnus Ihse Bursie wrote: > This will leverage the already existing `git pr show` to use your favorite diff viewer. This pull request has now been integrated. Changeset: 1c2c6f37 Author: Magnus Ihse Bursie URL: https://git.openjdk.java.net/skara/commit/1c2c6f37 Stats: 13 lines in 2 files changed: 6 ins; 0 del; 7 mod Add -t/--tool to pr show to use git difftool Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1083 From rwestberg at openjdk.java.net Fri Mar 19 15:52:35 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 19 Mar 2021 15:52:35 GMT Subject: RFR: pr: enable exclusion of commit comments authors In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 15:05:55 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes it possible to configure whose commits comments should be ignored. This mechanism will be used to exclude commit comments from the bots (who make the vast majority of commit comments). This will speed up `GitLabRepository.recentCommitComments` quite a bit. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1084 From rwestberg at openjdk.java.net Fri Mar 19 15:53:45 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 19 Mar 2021 15:53:45 GMT Subject: RFR: Remove java.lang.invoke from hotspot-compiler In-Reply-To: References: Message-ID: <13ZpLbBEaQ2LKLsDkjwT7DnAUcrQWhvRoQsyMF9fzM8=.13291bcd-9296-4211-9666-4af7c892ea1b@github.com> On Fri, 19 Mar 2021 15:24:52 GMT, Magnus Ihse Bursie wrote: > As per request from Claes. Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1085 From ihse at openjdk.java.net Fri Mar 19 16:04:26 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 19 Mar 2021 16:04:26 GMT Subject: Integrated: Remove java.lang.invoke from hotspot-compiler In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 15:24:52 GMT, Magnus Ihse Bursie wrote: > As per request from Claes. This pull request has now been integrated. Changeset: 758928b9 Author: Magnus Ihse Bursie URL: https://git.openjdk.java.net/skara/commit/758928b9 Stats: 1 line in 1 file changed: 0 ins; 1 del; 0 mod Remove java.lang.invoke from hotspot-compiler Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1085 From ehelin at openjdk.java.net Mon Mar 22 09:47:33 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Mar 2021 09:47:33 GMT Subject: [skara] RFR: Avoid trying to update build number for tags that don't have one In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 11:36:21 GMT, Robin Westberg wrote: > The issue notifier can be configured to update the build number of issues when a corresponding tag is created. However, certain tags don't contain build number information, so don't attempt this for those. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1082 From ehelin at openjdk.java.net Mon Mar 22 09:49:38 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Mar 2021 09:49:38 GMT Subject: [skara] Integrated: pr: enable exclusion of commit comments authors In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 15:05:55 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes it possible to configure whose commits comments should be ignored. This mechanism will be used to exclude commit comments from the bots (who make the vast majority of commit comments). This will speed up `GitLabRepository.recentCommitComments` quite a bit. > > Thanks, > Erik This pull request has now been integrated. Changeset: 18435660 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/18435660 Stats: 34 lines in 9 files changed: 23 ins; 0 del; 11 mod pr: enable exclusion of commit comments authors Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1084 From ehelin at openjdk.java.net Mon Mar 22 09:52:28 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Mar 2021 09:52:28 GMT Subject: RFR: build: update to Gradle 6.8.3 Message-ID: Hi all, please review this small patch that updates Gradle to version `6.8.3`. Thanks, Erik ------------- Commit messages: - build: update to Gradle 6.8.3 Changes: https://git.openjdk.java.net/skara/pull/1086/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1086&range=00 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1086.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1086/head:pull/1086 PR: https://git.openjdk.java.net/skara/pull/1086 From rwestberg at openjdk.java.net Mon Mar 22 09:52:29 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 22 Mar 2021 09:52:29 GMT Subject: RFR: build: update to Gradle 6.8.3 In-Reply-To: References: Message-ID: <_ynkFSH4zRhK4SLC2xCu3wKB0knNbu8pphl-L5vBme8=.8ebf159e-065c-40d7-b0e9-9f3bec439abe@github.com> On Mon, 22 Mar 2021 09:47:40 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that updates Gradle to version `6.8.3`. > > Thanks, > Erik Looks good, but perhaps updated gradle/wrapper/gradle-wrapper.properties as well? ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1086 From ehelin at openjdk.java.net Mon Mar 22 09:53:08 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 22 Mar 2021 09:53:08 GMT Subject: RFR: build: update to JUnit 5.7.1 Message-ID: Hi all, please review this patch that updates JUnit to version `5.7.1` (and JUnit Platform to `1.7.1`). Thanks, Erik ------------- Depends on: https://git.openjdk.java.net/skara/pull/1086 Commit messages: - build: update to JUnit 5.7.1 Changes: https://git.openjdk.java.net/skara/pull/1087/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1087&range=00 Stats: 4 lines in 1 file changed: 0 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1087.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1087/head:pull/1087 PR: https://git.openjdk.java.net/skara/pull/1087 From rwestberg at openjdk.java.net Mon Mar 22 09:53:09 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 22 Mar 2021 09:53:09 GMT Subject: RFR: build: update to JUnit 5.7.1 In-Reply-To: References: Message-ID: On Mon, 22 Mar 2021 09:49:02 GMT, Erik Helin wrote: > Hi all, > > please review this patch that updates JUnit to version `5.7.1` (and JUnit Platform to `1.7.1`). > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1087 From rwestberg at openjdk.java.net Mon Mar 22 09:53:18 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 22 Mar 2021 09:53:18 GMT Subject: Integrated: Avoid trying to update build number for tags that don't have one In-Reply-To: References: Message-ID: On Fri, 19 Mar 2021 11:36:21 GMT, Robin Westberg wrote: > The issue notifier can be configured to update the build number of issues when a corresponding tag is created. However, certain tags don't contain build number information, so don't attempt this for those. This pull request has now been integrated. Changeset: 3fb77c90 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/3fb77c90 Stats: 31 lines in 5 files changed: 6 ins; 0 del; 25 mod Avoid trying to update build number for tags that don't have one Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1082 From erik.helin at oracle.com Tue Mar 23 07:41:09 2021 From: erik.helin at oracle.com (Erik Helin) Date: Tue, 23 Mar 2021 08:41:09 +0100 Subject: New Skara feature: dependent pull requests Message-ID: <34c2711b-e1b3-6537-8044-2cc6fed2f7ec@oracle.com> Hi all, me and Robin are looking to deploy a new feature for the jdk [0] repository this week: dependent pull requests. Dependent pull requests are used when you have a change that depends on work in a pull request that is not yet integrated. For an example, lets say that you are fixing a bug and realize that you first need to refactor a piece of code in order to make the bugfix cleaner. To aid reviewers you do *not* want to create a pull request containing both the refactoring and the bugfix - they are distinct changes and should be reviewed independently. You create a pull request for the first change, the refactoring, but then what? You cannot create a pull request for the bugfix only since the refactoring is not yet integrated. The review of the refactoring might take a while and during this time you cannot receive reviews for the bugfix. Dependent pull requests will help in the above scenario. When a pull request is created then the Skara bots will automatically create a branch in the upstream repository named `pr/` where `` is the id of the pull request (e.g. `17`). This `pr/` branch can then be used as the target branch when creating a pull request. A pull request with a dependency is automatically targeted to the dependency's target branch when the dependency is integrated. For example, if the first pull request (with id `17`) targets the `master` branch and the second pull request targets the `pr/17` branch, then the second pull request will be automatically re-targeted to the `master` branch when the first pull request (with id `17`) is integrated. It is not possible to integrate a pull request with a dependency on an open pull request (i.e. the dependency must be integrated first). The branches named `pr/` are automatically removed when the corresponding pull request is closed. Dependent pull requests have been enabled for a long time for the skara repository [1] and an example of a pull request with a dependency can be seen here [2]. For those of you using the Skara CLI tools [3] then `git-sync` will by default *not* sync branches named `pr/` to the personal fork. If it did then you would have to delete all `pr/` branches in your personal fork yourself. This default behavior can be overridden by passing `--branches` to `git-sync`. Let us know on the skara-dev [4] mailing list if you have any questions! Thanks, Erik and Robin [0]: https://github.com/openjdk/jdk [1]: https://github.com/openjdk/skara [2]: https://github.com/openjdk/skara/pull/1087 [3]: https://wiki.openjdk.java.net/display/SKARA/CLI+Tools [4]: https://mail.openjdk.java.net/mailman/listinfo/skara-dev From rwestberg at openjdk.java.net Tue Mar 23 09:45:09 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 23 Mar 2021 09:45:09 GMT Subject: [skara] RFR: Allow tags to be found in multiple branches Message-ID: Repositories that configure different fixVersions for different branches should allow a tag to be found in more than one of them, just like it would work if they were different repositories. ------------- Commit messages: - Allow tags to be found in multiple branches, as they will end up updating different issues Changes: https://git.openjdk.java.net/skara/pull/1088/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1088&range=00 Stats: 170 lines in 2 files changed: 117 ins; 25 del; 28 mod Patch: https://git.openjdk.java.net/skara/pull/1088.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1088/head:pull/1088 PR: https://git.openjdk.java.net/skara/pull/1088 From ehelin at openjdk.java.net Tue Mar 23 09:53:17 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Mar 2021 09:53:17 GMT Subject: RFR: Allow tags to be found in multiple branches In-Reply-To: References: Message-ID: <_yOA_WZSERXm4Uaf6o_38gkUbJ36Z6FNxj38yXI0DaU=.1c6b69f7-fac0-4a71-b5d5-deba1bdbaefb@github.com> On Tue, 23 Mar 2021 09:42:02 GMT, Robin Westberg wrote: > Repositories that configure different fixVersions for different branches should allow a tag to be found in more than one of them, just like it would work if they were different repositories. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1088 From rwestberg at openjdk.java.net Tue Mar 23 10:18:25 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 23 Mar 2021 10:18:25 GMT Subject: [skara] Integrated: Allow tags to be found in multiple branches In-Reply-To: References: Message-ID: On Tue, 23 Mar 2021 09:42:02 GMT, Robin Westberg wrote: > Repositories that configure different fixVersions for different branches should allow a tag to be found in more than one of them, just like it would work if they were different repositories. This pull request has now been integrated. Changeset: 34e22b70 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/34e22b70 Stats: 170 lines in 2 files changed: 117 ins; 25 del; 28 mod Allow tags to be found in multiple branches Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1088 From ehelin at openjdk.java.net Tue Mar 23 13:40:59 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Mar 2021 13:40:59 GMT Subject: [skara] RFR: issuetracker: add Label class Message-ID: Hi all, please review this patch that introduces the `Label` class in the `issuetracker` package. The `Label` class provides access to an eventual description of the label, previously we only returned the label names. The majority of the patch is a simple refactoring of changing existing calls to `Issue.labels` to `Issue.labelNames`. Thanks, Erik ------------- Commit messages: - issuetracker: add Label class - wip Changes: https://git.openjdk.java.net/skara/pull/1089/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1089&range=00 Stats: 383 lines in 48 files changed: 106 ins; 0 del; 277 mod Patch: https://git.openjdk.java.net/skara/pull/1089.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1089/head:pull/1089 PR: https://git.openjdk.java.net/skara/pull/1089 From rwestberg at openjdk.java.net Tue Mar 23 13:45:39 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 23 Mar 2021 13:45:39 GMT Subject: RFR: issuetracker: add Label class In-Reply-To: References: Message-ID: On Tue, 23 Mar 2021 13:38:16 GMT, Erik Helin wrote: > Hi all, > > please review this patch that introduces the `Label` class in the `issuetracker` package. The `Label` class provides access to an eventual description of the label, previously we only returned the label names. The majority of the patch is a simple refactoring of changing existing calls to `Issue.labels` to `Issue.labelNames`. > > Thanks, > Erik Looks great! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1089 From ehelin at openjdk.java.net Tue Mar 23 14:07:51 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Mar 2021 14:07:51 GMT Subject: RFR: issuetracker: add Label class [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that introduces the `Label` class in the `issuetracker` package. The `Label` class provides access to an eventual description of the label, previously we only returned the label names. The majority of the patch is a simple refactoring of changing existing calls to `Issue.labels` to `Issue.labelNames`. > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: HostedRepository.labels ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1089/files - new: https://git.openjdk.java.net/skara/pull/1089/files/0d2b4bbd..1b444b29 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1089&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1089&range=00-01 Stats: 26 lines in 5 files changed: 25 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1089.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1089/head:pull/1089 PR: https://git.openjdk.java.net/skara/pull/1089 From ehelin at openjdk.java.net Tue Mar 23 14:20:02 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Mar 2021 14:20:02 GMT Subject: [skara] Integrated: issuetracker: add Label class In-Reply-To: References: Message-ID: On Tue, 23 Mar 2021 13:38:16 GMT, Erik Helin wrote: > Hi all, > > please review this patch that introduces the `Label` class in the `issuetracker` package. The `Label` class provides access to an eventual description of the label, previously we only returned the label names. The majority of the patch is a simple refactoring of changing existing calls to `Issue.labels` to `Issue.labelNames`. > > Thanks, > Erik This pull request has now been integrated. Changeset: 4a5aa95c Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/4a5aa95c Stats: 408 lines in 52 files changed: 131 ins; 0 del; 277 mod issuetracker: add Label class Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1089 From rwestberg at openjdk.java.net Tue Mar 23 14:20:57 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 23 Mar 2021 14:20:57 GMT Subject: RFR: 734: ML->PR: full names containing non-ascii chars are displayed incorrectly. Message-ID: Ensure that the MIME 'Q' text decoder properly handles multibyte values. ------------- Commit messages: - Properly support multi-byte encoding Changes: https://git.openjdk.java.net/skara/pull/1090/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1090&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-734 Stats: 13 lines in 2 files changed: 6 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/1090.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1090/head:pull/1090 PR: https://git.openjdk.java.net/skara/pull/1090 From ehelin at openjdk.java.net Tue Mar 23 14:20:57 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Mar 2021 14:20:57 GMT Subject: RFR: 734: ML->PR: full names containing non-ascii chars are displayed incorrectly. In-Reply-To: References: Message-ID: On Tue, 23 Mar 2021 14:15:42 GMT, Robin Westberg wrote: > Ensure that the MIME 'Q' text decoder properly handles multibyte values. Looks good, nice fix! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1090 From ehelin at openjdk.java.net Tue Mar 23 14:22:59 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 23 Mar 2021 14:22:59 GMT Subject: RFR: cli: use label description for e-mail in git-pr-create Message-ID: Hi all, please review this small patch that uses the label description in `git pr create` to map the label to a mailing list. Thanks, Erik ------------- Commit messages: - cli: use label description for e-mail in git-pr-create Changes: https://git.openjdk.java.net/skara/pull/1091/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1091&range=00 Stats: 7 lines in 1 file changed: 3 ins; 3 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1091.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1091/head:pull/1091 PR: https://git.openjdk.java.net/skara/pull/1091 From rwestberg at openjdk.java.net Tue Mar 23 16:02:17 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 23 Mar 2021 16:02:17 GMT Subject: [skara] Integrated: 734: ML->PR: full names containing non-ascii chars are displayed incorrectly. In-Reply-To: References: Message-ID: <0uyLYKWCLw-dvpOoqQVU1Vdh59q2GQ6PF2xl_eHv6dY=.e6c960ff-f187-470a-b210-07c7c28d7869@github.com> On Tue, 23 Mar 2021 14:15:42 GMT, Robin Westberg wrote: > Ensure that the MIME 'Q' text decoder properly handles multibyte values. This pull request has now been integrated. Changeset: e9fefdfa Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/e9fefdfa Stats: 13 lines in 2 files changed: 6 ins; 0 del; 7 mod 734: ML->PR: full names containing non-ascii chars are displayed incorrectly. Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1090 From rwestberg at openjdk.java.net Wed Mar 24 05:24:04 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 24 Mar 2021 05:24:04 GMT Subject: RFR: cli: use label description for e-mail in git-pr-create In-Reply-To: References: Message-ID: On Tue, 23 Mar 2021 14:20:17 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that uses the label description in `git pr create` to map the label to a mailing list. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1091 From ehelin at openjdk.java.net Wed Mar 24 08:54:59 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 24 Mar 2021 08:54:59 GMT Subject: RFR: cli: use label description for e-mail in git-pr-create [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this small patch that uses the label description in `git pr create` to map the label to a mailing list. > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Cleaned up code slightly ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1091/files - new: https://git.openjdk.java.net/skara/pull/1091/files/1dcd1344..42c092b9 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1091&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1091&range=00-01 Stats: 11 lines in 1 file changed: 6 ins; 2 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1091.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1091/head:pull/1091 PR: https://git.openjdk.java.net/skara/pull/1091 From ehelin at openjdk.java.net Wed Mar 24 08:55:00 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 24 Mar 2021 08:55:00 GMT Subject: Integrated: cli: use label description for e-mail in git-pr-create In-Reply-To: References: Message-ID: On Tue, 23 Mar 2021 14:20:17 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that uses the label description in `git pr create` to map the label to a mailing list. > > Thanks, > Erik This pull request has now been integrated. Changeset: d238973f Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/d238973f Stats: 14 lines in 1 file changed: 6 ins; 2 del; 6 mod cli: use label description for e-mail in git-pr-create Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1091 From rwestberg at openjdk.java.net Wed Mar 24 13:37:07 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 24 Mar 2021 13:37:07 GMT Subject: [skara] RFR: 659: Multi-line commands aren't filtered properly Message-ID: <5xHTNA7BWkeoMWanqhnimbyd95N95TP_BT8Dsun3lfs=.6394fa25-f8f4-4508-8083-c8acb7b1ab79@github.com> After a command has been found, filter out the rest of the body. ------------- Commit messages: - Filter out lines following commands Changes: https://git.openjdk.java.net/skara/pull/1092/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1092&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-659 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1092.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1092/head:pull/1092 PR: https://git.openjdk.java.net/skara/pull/1092 From rwestberg at openjdk.java.net Wed Mar 24 14:53:14 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 24 Mar 2021 14:53:14 GMT Subject: RFR: 659: Multi-line commands aren't filtered properly [v2] In-Reply-To: <5xHTNA7BWkeoMWanqhnimbyd95N95TP_BT8Dsun3lfs=.6394fa25-f8f4-4508-8083-c8acb7b1ab79@github.com> References: <5xHTNA7BWkeoMWanqhnimbyd95N95TP_BT8Dsun3lfs=.6394fa25-f8f4-4508-8083-c8acb7b1ab79@github.com> Message-ID: > After a command has been found, filter out the rest of the body. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Forgot to commit the test ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1092/files - new: https://git.openjdk.java.net/skara/pull/1092/files/d2783149..036687e0 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1092&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1092&range=00-01 Stats: 3 lines in 1 file changed: 3 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1092.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1092/head:pull/1092 PR: https://git.openjdk.java.net/skara/pull/1092 From ihse at openjdk.java.net Wed Mar 24 15:32:16 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Wed, 24 Mar 2021 15:32:16 GMT Subject: RFR: Make "git debug mlrules" tolerate missing files, and clarify help Message-ID: The "mlrules" debug command crashed if given non-existing files. Also clarify the difference between files to test for, and path to the config file. ------------- Commit messages: - Make "git debug mlrules" tolerate missing files, and clarify help Changes: https://git.openjdk.java.net/skara/pull/1093/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1093&range=00 Stats: 12 lines in 1 file changed: 6 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/1093.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1093/head:pull/1093 PR: https://git.openjdk.java.net/skara/pull/1093 From ihse at openjdk.java.net Thu Mar 25 01:02:09 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 25 Mar 2021 01:02:09 GMT Subject: [skara] RFR: Improve the help for reviewers Message-ID: Rename "Download" to "Reviewing". Add information on how to get the PR using Skara tools and diff files. Collapse all information by default to make it more compact. An example on how this will look can be found here: https://github.com/magicus/openjdk-sandbox/issues/1 ------------- Commit messages: - Improve the help for reviewers Changes: https://git.openjdk.java.net/skara/pull/1094/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1094&range=00 Stats: 29 lines in 1 file changed: 24 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/1094.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1094/head:pull/1094 PR: https://git.openjdk.java.net/skara/pull/1094 From rwestberg at openjdk.java.net Thu Mar 25 08:37:29 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 25 Mar 2021 08:37:29 GMT Subject: [skara] RFR: Make "git debug mlrules" tolerate missing files, and clarify help In-Reply-To: References: Message-ID: On Wed, 24 Mar 2021 15:29:15 GMT, Magnus Ihse Bursie wrote: > The "mlrules" debug command crashed if given non-existing files. > > Also clarify the difference between files to test for, and path to the config file. Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1093 From ihse at openjdk.java.net Thu Mar 25 15:53:46 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Thu, 25 Mar 2021 15:53:46 GMT Subject: Integrated: Make "git debug mlrules" tolerate missing files, and clarify help In-Reply-To: References: Message-ID: On Wed, 24 Mar 2021 15:29:15 GMT, Magnus Ihse Bursie wrote: > The "mlrules" debug command crashed if given non-existing files. > > Also clarify the difference between files to test for, and path to the config file. This pull request has now been integrated. Changeset: e7099c9c Author: Magnus Ihse Bursie URL: https://git.openjdk.java.net/skara/commit/e7099c9c Stats: 12 lines in 1 file changed: 6 ins; 0 del; 6 mod Make "git debug mlrules" tolerate missing files, and clarify help Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1093 From erikj at openjdk.java.net Thu Mar 25 17:04:49 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 25 Mar 2021 17:04:49 GMT Subject: RFR: Improve the help for reviewers In-Reply-To: References: Message-ID: <1x5yrRh2I1xtqdLKOgm59418dwxYLejlNh7m0IuCXL8=.a17df06b-9744-47bb-89f4-aed24d2dce82@github.com> On Thu, 25 Mar 2021 00:58:54 GMT, Magnus Ihse Bursie wrote: > Rename "Download" to "Reviewing". Add information on how to get the PR using Skara tools and diff files. Collapse all information by default to make it more compact. > > An example on how this will look can be found here: https://github.com/magicus/openjdk-sandbox/issues/1 Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1094 From erikj at openjdk.java.net Thu Mar 25 17:14:03 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 25 Mar 2021 17:14:03 GMT Subject: RFR: 659: Multi-line commands aren't filtered properly [v2] In-Reply-To: References: <5xHTNA7BWkeoMWanqhnimbyd95N95TP_BT8Dsun3lfs=.6394fa25-f8f4-4508-8083-c8acb7b1ab79@github.com> Message-ID: On Wed, 24 Mar 2021 14:53:14 GMT, Robin Westberg wrote: >> After a command has been found, filter out the rest of the body. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Forgot to commit the test Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1092 From christoph.langer at sap.com Fri Mar 26 08:22:42 2021 From: christoph.langer at sap.com (Langer, Christoph) Date: Fri, 26 Mar 2021 08:22:42 +0000 Subject: [11u] Announcement: Switch to Git/Github for 11.0.13 release cycle Message-ID: Hi, I'd like to hereby officially announce the transition of OpenJDK 11 Updates to Git/Github/Skara with the 11.0.13 update release cycle. After having a call between the 11u maintainers and Skara folks, we agreed to execute upon the initial proposal [0]. So the switch of the jdk11u-dev repository should happen on or around June 2nd and jdk11u will be switched on or around August 3rd, as per the 11.0.13 schedule [1]. The Skara tooling for backport releases seems to be in good shape already and we think that by the time we start using it in 11u it will be mature enough for our purposes. In the call Erik and Robin showed the tooling for backport releases and they could positively answer the questions that we found to be still open from maintainers perspective. The JBS item for the 11u transition is https://bugs.openjdk.java.net/browse/SKARA-935. Best regards Christoph [0] https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2021-February/004934.html [1] https://wiki.openjdk.java.net/display/JDKUpdates/JDK11u From ihse at openjdk.java.net Fri Mar 26 12:25:23 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 26 Mar 2021 12:25:23 GMT Subject: Integrated: Improve the help for reviewers In-Reply-To: References: Message-ID: On Thu, 25 Mar 2021 00:58:54 GMT, Magnus Ihse Bursie wrote: > Rename "Download" to "Reviewing". Add information on how to get the PR using Skara tools and diff files. Collapse all information by default to make it more compact. > > An example on how this will look can be found here: https://github.com/magicus/openjdk-sandbox/issues/1 This pull request has now been integrated. Changeset: f7748c09 Author: Magnus Ihse Bursie URL: https://git.openjdk.java.net/skara/commit/f7748c09 Stats: 29 lines in 1 file changed: 24 ins; 0 del; 5 mod Improve the help for reviewers Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1094 From erik.helin at oracle.com Fri Mar 26 12:47:52 2021 From: erik.helin at oracle.com (Erik Helin) Date: Fri, 26 Mar 2021 13:47:52 +0100 Subject: New Skara feature: dependent pull requests In-Reply-To: <34c2711b-e1b3-6537-8044-2cc6fed2f7ec@oracle.com> References: <34c2711b-e1b3-6537-8044-2cc6fed2f7ec@oracle.com> Message-ID: On 3/23/21 8:41 AM, Erik Helin wrote: > Hi all, > > me and Robin are looking to deploy a new feature for the jdk [0] > repository this week: dependent pull requests. Dependent pull requests > are used when you have a change that depends on work in a pull request > that is not yet integrated. We have now deployed the dependent pull requests feature for the jdk [0] repository. Feel free to try it out and let us know if you have any feedback! Hope you all have a great weekend, Erik & Robin [0]: https://github.com/openjdk/jdk From rwestberg at openjdk.java.net Fri Mar 26 12:49:30 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 26 Mar 2021 12:49:30 GMT Subject: RFR: 568: RFR mails from the list are not copied to github Message-ID: The mbox parser could fail to pick up replies that were out of order, as well as replies with additional text in the In-Reply-To header. ------------- Commit messages: - Improve mbox parsing Changes: https://git.openjdk.java.net/skara/pull/1095/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1095&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-568 Stats: 120 lines in 2 files changed: 95 ins; 2 del; 23 mod Patch: https://git.openjdk.java.net/skara/pull/1095.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1095/head:pull/1095 PR: https://git.openjdk.java.net/skara/pull/1095 From ihse at openjdk.java.net Fri Mar 26 13:30:50 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 26 Mar 2021 13:30:50 GMT Subject: RFR: Reviewing help markdown does not work on gitlab Message-ID: It turned out the markdown code for the review helper worked fine on github, but not on gitlab... So much for markdown "standard" :-( ------------- Commit messages: - Reviewing help markdown does not work on gitlab Changes: https://git.openjdk.java.net/skara/pull/1096/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1096&range=00 Stats: 7 lines in 1 file changed: 0 ins; 0 del; 7 mod Patch: https://git.openjdk.java.net/skara/pull/1096.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1096/head:pull/1096 PR: https://git.openjdk.java.net/skara/pull/1096 From ihse at openjdk.java.net Fri Mar 26 13:30:51 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Fri, 26 Mar 2021 13:30:51 GMT Subject: RFR: Reviewing help markdown does not work on gitlab In-Reply-To: References: Message-ID: <1rFUU8agLpUSuJXaEAZOhXm3yeaxx2VoepvbB8O2gj8=.765f5f34-562a-4907-8a78-01160c6a3a13@github.com> On Fri, 26 Mar 2021 13:26:46 GMT, Magnus Ihse Bursie wrote: > It turned out the markdown code for the review helper worked fine on github, but not on gitlab... > > So much for markdown "standard" :-( FWIW, the old markdown code was incorrect on gitlab as well, so technically this is not really a regression, but the new format made it more apparent. ------------- PR: https://git.openjdk.java.net/skara/pull/1096 From christoph.langer at sap.com Fri Mar 26 17:03:24 2021 From: christoph.langer at sap.com (Langer, Christoph) Date: Fri, 26 Mar 2021 17:03:24 +0000 Subject: [11u] Announcement: Switch to Git/Github for 11.0.13 release cycle In-Reply-To: References: Message-ID: Hi, there's this: https://wiki.openjdk.java.net/display/SKARA/Backports. Maybe it is not quite "final" yet. For anybody interested in trying out the Skara backport process, you could do backports in 16u, 13u and as of today, I guess 15u, too. I'm sure the Skara team is welcoming any feedback ?? Best regards Christoph > -----Original Message----- > From: Hohensee, Paul > Sent: Freitag, 26. M?rz 2021 17:32 > To: Langer, Christoph ; jdk-updates- > dev at openjdk.java.net > Cc: skara-dev at openjdk.java.net; erik.helin ; > robin.westberg ; aph ; > sgehwolf ; Lindenmaier, Goetz > > Subject: RE: [11u] Announcement: Switch to Git/Github for 11.0.13 release > cycle > > Is there a wiki (or other source) on the github backport process using Skara > tooling? > > Thanks, > Paul > > ?-----Original Message----- > From: jdk-updates-dev on > behalf of "Langer, Christoph" > Date: Friday, March 26, 2021 at 1:23 AM > To: "jdk-updates-dev at openjdk.java.net" dev at openjdk.java.net> > Cc: "skara-dev at openjdk.java.net" , Erik > Helin , Robin Westberg > , Andrew Haley , Severin > Gehwolf , "Lindenmaier, Goetz" > > Subject: [11u] Announcement: Switch to Git/Github for 11.0.13 release cycle > > Hi, > > I'd like to hereby officially announce the transition of OpenJDK 11 Updates to > Git/Github/Skara with the 11.0.13 update release cycle. > > After having a call between the 11u maintainers and Skara folks, we agreed > to execute upon the initial proposal [0]. So the switch of the jdk11u-dev > repository should happen on or around June 2nd and jdk11u will be switched > on or around August 3rd, as per the 11.0.13 schedule [1]. > > The Skara tooling for backport releases seems to be in good shape already > and we think that by the time we start using it in 11u it will be mature enough > for our purposes. In the call Erik and Robin showed the tooling for backport > releases and they could positively answer the questions that we found to be > still open from maintainers perspective. > > The JBS item for the 11u transition is > https://bugs.openjdk.java.net/browse/SKARA-935. > > Best regards > Christoph > > [0] https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2021- > February/004934.html > [1] https://wiki.openjdk.java.net/display/JDKUpdates/JDK11u > From christoph.langer at sap.com Fri Mar 26 21:45:55 2021 From: christoph.langer at sap.com (Langer, Christoph) Date: Fri, 26 Mar 2021 21:45:55 +0000 Subject: [11u] Announcement: Switch to Git/Github for 11.0.13 release cycle In-Reply-To: References: Message-ID: Hi, I just tried it myself: https://github.com/openjdk/jdk16u/pull/94 It was actually my first git backport where something had to be resolved. And this is what I did: 1. Went to my personal fork of jdk16u 2. git checkout -b 8259662 3. git backport --from=openjdk/jdk 63f8fc87cdf3edb828474bb4954b76721ba8f9e5 -> the backport attempted the cherry-pick and since there were conflicts it stopped in error. 4. I resolved the conflicts 5. I wondered what to do now. git cherry-pick --continue wasn't possible. git commit came up with the exact original commit message. In the Wiki instructions I however read that it should usually go like git commit -m 'Backport '... 6. After some thinking I decided for git commit -m "Backport 63f8fc87cdf3edb828474bb4954b76721ba8f9e5" 6. I created the pr with git pr create --publish So, @erik.helin and @robin.westberg, I have some feedback: I think git backport should provide some git backport --continue. And that should finish the cherry-pick and set the correct commit message in the form of "Backport ..." to be recognized by the bots. Is that possible? Otherwise there should at least be a hint like "After resolving, finish with git commit -m 'Backport '". What do you think? Paul, you can try it yourself once again, if you want. I would close my PR then. Or you can just review it, either way is fine for me ?? Best regards Christoph > -----Original Message----- > From: Hohensee, Paul > Sent: Freitag, 26. M?rz 2021 22:08 > To: Langer, Christoph ; jdk-updates- > dev at openjdk.java.net > Cc: skara-dev at openjdk.java.net; erik.helin ; > robin.westberg ; aph ; > sgehwolf ; Lindenmaier, Goetz > > Subject: Re: [11u] Announcement: Switch to Git/Github for 11.0.13 release > cycle > > I just tried to follow the directions on the wiki. > > Against what repo should the backport be done, jdk16u or a personal fork of > jdk16u? Based on how jdk commits work, I'd say the latter, but it's difficult > for me to tell. > > The commit command for use after resolving conflicts seems like it should > use "Backport-of" rather than "Backport". > > Thanks, > Paul > > ?-----Original Message----- > From: "Langer, Christoph" > Date: Friday, March 26, 2021 at 10:04 AM > To: "Hohensee, Paul" , "jdk-updates- > dev at openjdk.java.net" > Cc: "skara-dev at openjdk.java.net" , > "erik.helin" , "robin.westberg" > , Andrew Haley , > sgehwolf , "Lindenmaier, Goetz" > > Subject: RE: [11u] Announcement: Switch to Git/Github for 11.0.13 release > cycle > > Hi, > > there's this: https://wiki.openjdk.java.net/display/SKARA/Backports. Maybe > it is not quite "final" yet. > > For anybody interested in trying out the Skara backport process, you could > do backports in 16u, 13u and as of today, I guess 15u, too. > > I'm sure the Skara team is welcoming any feedback ?? > > Best regards > Christoph > > > -----Original Message----- > > From: Hohensee, Paul > > Sent: Freitag, 26. M?rz 2021 17:32 > > To: Langer, Christoph ; jdk-updates- > > dev at openjdk.java.net > > Cc: skara-dev at openjdk.java.net; erik.helin ; > > robin.westberg ; aph ; > > sgehwolf ; Lindenmaier, Goetz > > > > Subject: RE: [11u] Announcement: Switch to Git/Github for 11.0.13 release > > cycle > > > > Is there a wiki (or other source) on the github backport process using Skara > > tooling? > > > > Thanks, > > Paul > > > > -----Original Message----- > > From: jdk-updates-dev on > > behalf of "Langer, Christoph" > > Date: Friday, March 26, 2021 at 1:23 AM > > To: "jdk-updates-dev at openjdk.java.net" > dev at openjdk.java.net> > > Cc: "skara-dev at openjdk.java.net" , Erik > > Helin , Robin Westberg > > , Andrew Haley , > Severin > > Gehwolf , "Lindenmaier, Goetz" > > > > Subject: [11u] Announcement: Switch to Git/Github for 11.0.13 release > cycle > > > > Hi, > > > > I'd like to hereby officially announce the transition of OpenJDK 11 Updates > to > > Git/Github/Skara with the 11.0.13 update release cycle. > > > > After having a call between the 11u maintainers and Skara folks, we agreed > > to execute upon the initial proposal [0]. So the switch of the jdk11u-dev > > repository should happen on or around June 2nd and jdk11u will be > switched > > on or around August 3rd, as per the 11.0.13 schedule [1]. > > > > The Skara tooling for backport releases seems to be in good shape already > > and we think that by the time we start using it in 11u it will be mature > enough > > for our purposes. In the call Erik and Robin showed the tooling for backport > > releases and they could positively answer the questions that we found to > be > > still open from maintainers perspective. > > > > The JBS item for the 11u transition is > > https://bugs.openjdk.java.net/browse/SKARA-935. > > > > Best regards > > Christoph > > > > [0] https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2021- > > February/004934.html > > [1] https://wiki.openjdk.java.net/display/JDKUpdates/JDK11u > > > From erikj at openjdk.java.net Fri Mar 26 22:26:53 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 26 Mar 2021 22:26:53 GMT Subject: RFR: 568: RFR mails from the list are not copied to github In-Reply-To: References: Message-ID: On Fri, 26 Mar 2021 12:46:20 GMT, Robin Westberg wrote: > The mbox parser could fail to pick up replies that were out of order, as well as replies with additional text in the In-Reply-To header. Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1095 From erikj at openjdk.java.net Fri Mar 26 22:27:48 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 26 Mar 2021 22:27:48 GMT Subject: RFR: Reviewing help markdown does not work on gitlab In-Reply-To: References: Message-ID: On Fri, 26 Mar 2021 13:26:46 GMT, Magnus Ihse Bursie wrote: > It turned out the markdown code for the review helper worked fine on github, but not on gitlab... > > So much for markdown "standard" :-( Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1096 From fw at deneb.enyo.de Sun Mar 28 15:15:35 2021 From: fw at deneb.enyo.de (Florian Weimer) Date: Sun, 28 Mar 2021 17:15:35 +0200 Subject: New Skara feature: dependent pull requests In-Reply-To: <34c2711b-e1b3-6537-8044-2cc6fed2f7ec@oracle.com> (Erik Helin's message of "Tue, 23 Mar 2021 08:41:09 +0100") References: <34c2711b-e1b3-6537-8044-2cc6fed2f7ec@oracle.com> Message-ID: <87blb348dk.fsf@mid.deneb.enyo.de> * Erik Helin: > The branches named `pr/` are automatically removed when the > corresponding pull request is closed. For the local clones, you need to run ?git remote prune origin? periodically. Alternatively, the repository could be configured in such a way that the /pr/ branches are excluded from the default fetch set, if Github supports that. From ihse at openjdk.java.net Mon Mar 29 10:00:29 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 29 Mar 2021 10:00:29 GMT Subject: [skara] Integrated: Reviewing help markdown does not work on gitlab In-Reply-To: References: Message-ID: On Fri, 26 Mar 2021 13:26:46 GMT, Magnus Ihse Bursie wrote: > It turned out the markdown code for the review helper worked fine on github, but not on gitlab... > > So much for markdown "standard" :-( This pull request has now been integrated. Changeset: fb56e235 Author: Magnus Ihse Bursie URL: https://git.openjdk.java.net/skara/commit/fb56e235 Stats: 7 lines in 1 file changed: 0 ins; 0 del; 7 mod Reviewing help markdown does not work on gitlab Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1096 From ehelin at openjdk.java.net Mon Mar 29 12:41:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 29 Mar 2021 12:41:40 GMT Subject: [skara] RFR: pr: fix configuration of forks Message-ID: Hi all, please review this small patch that fixes how forks are configured for the `/backport` commit command. Thanks, Erik ------------- Commit messages: - pr: fix configuration of forks Changes: https://git.openjdk.java.net/skara/pull/1097/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1097&range=00 Stats: 2 lines in 1 file changed: 1 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1097.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1097/head:pull/1097 PR: https://git.openjdk.java.net/skara/pull/1097 From rwestberg at openjdk.java.net Mon Mar 29 12:49:46 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 29 Mar 2021 12:49:46 GMT Subject: [skara] RFR: pr: fix configuration of forks In-Reply-To: References: Message-ID: On Mon, 29 Mar 2021 12:38:30 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that fixes how forks are configured for the `/backport` commit command. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1097 From vkempik at azul.com Mon Mar 29 13:08:46 2021 From: vkempik at azul.com (Vladimir Kempik) Date: Mon, 29 Mar 2021 13:08:46 +0000 Subject: How to use the /backport bot command Message-ID: <6665D40B-407F-4BAD-A12D-B9A40B477CD4@azul.com> Hello I?d like to understand how to properly use /backport bot command. I was reading https://wiki.openjdk.java.net/display/SKARA/Backports and can?t get it to work lets say I want to backport 8261397 to jdk13u-dev. It applies cleanly to 13u-dev. Docs say I need to write /backport jdk13u-dev command to the comments of upstream (jdk17) commit. Doing so results in nothing ( https://github.com/openjdk/jdk/commit/0257caad ) I?ve also tried to use /backport command on the original PR for 8261397, obviously bot answered me - unknown command. Looking for some help on how to do clean backports without going to CLI. Thanks in advance, Vladimir. From ehelin at openjdk.java.net Mon Mar 29 13:45:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 29 Mar 2021 13:45:27 GMT Subject: Integrated: pr: fix configuration of forks In-Reply-To: References: Message-ID: <_8I-N9gLz7C6_dvR2xuy9QBAvMaMRVj-JFPyItrMg9I=.765c2cd7-1d4e-43c5-9dac-e053fa209d14@github.com> On Mon, 29 Mar 2021 12:38:30 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that fixes how forks are configured for the `/backport` commit command. > > Thanks, > Erik This pull request has now been integrated. Changeset: 51c36593 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/51c36593 Stats: 2 lines in 1 file changed: 1 ins; 0 del; 1 mod pr: fix configuration of forks Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1097 From ehelin at openjdk.java.net Mon Mar 29 14:07:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 29 Mar 2021 14:07:45 GMT Subject: RFR: mlbridge: use nicer link for webrev commits Message-ID: <5FlXHXbWYMc12XNNKmLJMmdYF-GleN87B3H8txPEINE=.d45fbe94-1c7f-4222-bcbf-2a2264c7120f@github.com> Hi all, please review this patch that formats the link to the commit after a webrev version a bit nicer. After my change in f16663b766fa02ced204bb1ca8d334a4ca776092 we are showing the full link, which is a bit verbose. This patch restores the old behavior where we just show an abbreviated hash. Thanks, Erik ------------- Commit messages: - mlbridge: use nicer link for webrev commits Changes: https://git.openjdk.java.net/skara/pull/1098/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1098&range=00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1098.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1098/head:pull/1098 PR: https://git.openjdk.java.net/skara/pull/1098 From rwestberg at openjdk.java.net Mon Mar 29 14:54:41 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 29 Mar 2021 14:54:41 GMT Subject: [skara] RFR: mlbridge: use nicer link for webrev commits In-Reply-To: <5FlXHXbWYMc12XNNKmLJMmdYF-GleN87B3H8txPEINE=.d45fbe94-1c7f-4222-bcbf-2a2264c7120f@github.com> References: <5FlXHXbWYMc12XNNKmLJMmdYF-GleN87B3H8txPEINE=.d45fbe94-1c7f-4222-bcbf-2a2264c7120f@github.com> Message-ID: On Mon, 29 Mar 2021 14:04:40 GMT, Erik Helin wrote: > Hi all, > > please review this patch that formats the link to the commit after a webrev version a bit nicer. After my change in f16663b766fa02ced204bb1ca8d334a4ca776092 we are showing the full link, which is a bit verbose. This patch restores the old behavior where we just show an abbreviated hash. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1098 From erikj at openjdk.java.net Mon Mar 29 16:47:19 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 29 Mar 2021 16:47:19 GMT Subject: [skara] RFR: mlbridge: use nicer link for webrev commits In-Reply-To: <5FlXHXbWYMc12XNNKmLJMmdYF-GleN87B3H8txPEINE=.d45fbe94-1c7f-4222-bcbf-2a2264c7120f@github.com> References: <5FlXHXbWYMc12XNNKmLJMmdYF-GleN87B3H8txPEINE=.d45fbe94-1c7f-4222-bcbf-2a2264c7120f@github.com> Message-ID: On Mon, 29 Mar 2021 14:04:40 GMT, Erik Helin wrote: > Hi all, > > please review this patch that formats the link to the commit after a webrev version a bit nicer. After my change in f16663b766fa02ced204bb1ca8d334a4ca776092 we are showing the full link, which is a bit verbose. This patch restores the old behavior where we just show an abbreviated hash. > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1098 From weijun.wang at oracle.com Fri Mar 26 13:42:42 2021 From: weijun.wang at oracle.com (Wei-Jun Wang) Date: Fri, 26 Mar 2021 13:42:42 +0000 Subject: New Skara feature: dependent pull requests In-Reply-To: References: <34c2711b-e1b3-6537-8044-2cc6fed2f7ec@oracle.com> Message-ID: Hi Erik and/or Robi, Very great feature. Thanks a lot! How do I create such a PR? Do I just create a new branch from the local branch where the 1st PR was created and then `git publish`? If yes, what happens if I create a sub-branch now on an existing PR created some time ago which has no pr/nnnn in upstream. Will that remote branch be automatically created when I publish the 2nd branch? Thanks again, Max p.s. Looks like we don?t use https://github.com/openjdk/playground anymore. I thought this is the place we can try out new features. > On Mar 26, 2021, at 8:47 AM, Erik Helin wrote: > > On 3/23/21 8:41 AM, Erik Helin wrote: >> Hi all, >> me and Robin are looking to deploy a new feature for the jdk [0] repository this week: dependent pull requests. Dependent pull requests are used when you have a change that depends on work in a pull request that is not yet integrated. > > We have now deployed the dependent pull requests feature for the jdk [0] repository. Feel free to try it out and let us know if you have any feedback! > > Hope you all have a great weekend, > Erik & Robin > > [0]: https://github.com/openjdk/jdk From hohensee at amazon.com Fri Mar 26 16:32:02 2021 From: hohensee at amazon.com (Hohensee, Paul) Date: Fri, 26 Mar 2021 16:32:02 +0000 Subject: [11u] Announcement: Switch to Git/Github for 11.0.13 release cycle Message-ID: Is there a wiki (or other source) on the github backport process using Skara tooling? Thanks, Paul ?-----Original Message----- From: jdk-updates-dev on behalf of "Langer, Christoph" Date: Friday, March 26, 2021 at 1:23 AM To: "jdk-updates-dev at openjdk.java.net" Cc: "skara-dev at openjdk.java.net" , Erik Helin , Robin Westberg , Andrew Haley , Severin Gehwolf , "Lindenmaier, Goetz" Subject: [11u] Announcement: Switch to Git/Github for 11.0.13 release cycle Hi, I'd like to hereby officially announce the transition of OpenJDK 11 Updates to Git/Github/Skara with the 11.0.13 update release cycle. After having a call between the 11u maintainers and Skara folks, we agreed to execute upon the initial proposal [0]. So the switch of the jdk11u-dev repository should happen on or around June 2nd and jdk11u will be switched on or around August 3rd, as per the 11.0.13 schedule [1]. The Skara tooling for backport releases seems to be in good shape already and we think that by the time we start using it in 11u it will be mature enough for our purposes. In the call Erik and Robin showed the tooling for backport releases and they could positively answer the questions that we found to be still open from maintainers perspective. The JBS item for the 11u transition is https://bugs.openjdk.java.net/browse/SKARA-935. Best regards Christoph [0] https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2021-February/004934.html [1] https://wiki.openjdk.java.net/display/JDKUpdates/JDK11u From hohensee at amazon.com Fri Mar 26 21:08:02 2021 From: hohensee at amazon.com (Hohensee, Paul) Date: Fri, 26 Mar 2021 21:08:02 +0000 Subject: [11u] Announcement: Switch to Git/Github for 11.0.13 release cycle Message-ID: I just tried to follow the directions on the wiki. Against what repo should the backport be done, jdk16u or a personal fork of jdk16u? Based on how jdk commits work, I'd say the latter, but it's difficult for me to tell. The commit command for use after resolving conflicts seems like it should use "Backport-of" rather than "Backport". Thanks, Paul ?-----Original Message----- From: "Langer, Christoph" Date: Friday, March 26, 2021 at 10:04 AM To: "Hohensee, Paul" , "jdk-updates-dev at openjdk.java.net" Cc: "skara-dev at openjdk.java.net" , "erik.helin" , "robin.westberg" , Andrew Haley , sgehwolf , "Lindenmaier, Goetz" Subject: RE: [11u] Announcement: Switch to Git/Github for 11.0.13 release cycle Hi, there's this: https://wiki.openjdk.java.net/display/SKARA/Backports. Maybe it is not quite "final" yet. For anybody interested in trying out the Skara backport process, you could do backports in 16u, 13u and as of today, I guess 15u, too. I'm sure the Skara team is welcoming any feedback ?? Best regards Christoph > -----Original Message----- > From: Hohensee, Paul > Sent: Freitag, 26. M?rz 2021 17:32 > To: Langer, Christoph ; jdk-updates- > dev at openjdk.java.net > Cc: skara-dev at openjdk.java.net; erik.helin ; > robin.westberg ; aph ; > sgehwolf ; Lindenmaier, Goetz > > Subject: RE: [11u] Announcement: Switch to Git/Github for 11.0.13 release > cycle > > Is there a wiki (or other source) on the github backport process using Skara > tooling? > > Thanks, > Paul > > -----Original Message----- > From: jdk-updates-dev on > behalf of "Langer, Christoph" > Date: Friday, March 26, 2021 at 1:23 AM > To: "jdk-updates-dev at openjdk.java.net" dev at openjdk.java.net> > Cc: "skara-dev at openjdk.java.net" , Erik > Helin , Robin Westberg > , Andrew Haley , Severin > Gehwolf , "Lindenmaier, Goetz" > > Subject: [11u] Announcement: Switch to Git/Github for 11.0.13 release cycle > > Hi, > > I'd like to hereby officially announce the transition of OpenJDK 11 Updates to > Git/Github/Skara with the 11.0.13 update release cycle. > > After having a call between the 11u maintainers and Skara folks, we agreed > to execute upon the initial proposal [0]. So the switch of the jdk11u-dev > repository should happen on or around June 2nd and jdk11u will be switched > on or around August 3rd, as per the 11.0.13 schedule [1]. > > The Skara tooling for backport releases seems to be in good shape already > and we think that by the time we start using it in 11u it will be mature enough > for our purposes. In the call Erik and Robin showed the tooling for backport > releases and they could positively answer the questions that we found to be > still open from maintainers perspective. > > The JBS item for the 11u transition is > https://bugs.openjdk.java.net/browse/SKARA-935. > > Best regards > Christoph > > [0] https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2021- > February/004934.html > [1] https://wiki.openjdk.java.net/display/JDKUpdates/JDK11u > From mark.reinhold at oracle.com Mon Mar 29 19:03:18 2021 From: mark.reinhold at oracle.com (mark.reinhold at oracle.com) Date: Mon, 29 Mar 2021 12:03:18 -0700 Subject: New Skara feature: dependent pull requests In-Reply-To: <87blb348dk.fsf@mid.deneb.enyo.de> References: <34c2711b-e1b3-6537-8044-2cc6fed2f7ec@oracle.com> <87blb348dk.fsf@mid.deneb.enyo.de> Message-ID: <20210329120318.596395888@eggemoggin.niobe.net> 2021/3/28 8:15:35 -0700, fw at deneb.enyo.de: > * Erik Helin: > >> The branches named `pr/` are automatically removed when the >> corresponding pull request is closed. > > For the local clones, you need to run ?git remote prune origin? > periodically. > > Alternatively, the repository could be configured in such a way that > the /pr/ branches are excluded from the default fetch set, if Github > supports that. That would certainly be convenient, if it?s possible. - Mark From david.holmes at oracle.com Mon Mar 29 23:15:27 2021 From: david.holmes at oracle.com (David Holmes) Date: Tue, 30 Mar 2021 09:15:27 +1000 Subject: New Skara feature: dependent pull requests In-Reply-To: <34c2711b-e1b3-6537-8044-2cc6fed2f7ec@oracle.com> References: <34c2711b-e1b3-6537-8044-2cc6fed2f7ec@oracle.com> Message-ID: <8297fa7a-861e-96aa-d85f-2583c5d45517@oracle.com> Hi Erik, This sounds good but is there a tutorial description of how this works in terms of your local branches? I can't quite see how to construct this from the point where I'm in my local branch for which the PR has just been created and I have the realization "shoot I need to refactor xyz first". How do I proceed from there? Thanks, David On 23/03/2021 5:41 pm, Erik Helin wrote: > Hi all, > > me and Robin are looking to deploy a new feature for the jdk [0] > repository this week: dependent pull requests. Dependent pull requests > are used when you have a change that depends on work in a pull request > that is not yet integrated. > > For an example, lets say that you are fixing a bug and realize that you > first need to refactor a piece of code in order to make the bugfix > cleaner. To aid reviewers you do *not* want to create a pull request > containing both the refactoring and the bugfix - they are distinct > changes and should be reviewed independently. You create a pull request > for the first change, the refactoring, but then what? You cannot create > a pull request for the bugfix only since the refactoring is not yet > integrated. The review of the refactoring might take a while and during > this time you cannot receive reviews for the bugfix. > > Dependent pull requests will help in the above scenario. When a pull > request is created then the Skara bots will automatically create a > branch in the upstream repository named `pr/` where `` is the id > of the pull request (e.g. `17`). This `pr/` branch can then be used > as the target branch when creating a pull request. A pull request with a > dependency is automatically targeted to the dependency's target branch > when the dependency is integrated. For example, if the first pull > request (with id `17`) targets the `master` branch and the second pull > request targets the `pr/17` branch, then the second pull request will be > automatically re-targeted to the `master` branch when the first pull > request (with id `17`) is integrated. It is not possible to integrate a > pull request with a dependency on an open pull request (i.e. the > dependency must be integrated first). The branches named `pr/` are > automatically removed when the corresponding pull request is closed. > > Dependent pull requests have been enabled for a long time for the skara > repository [1] and an example of a pull request with a dependency can be > seen here [2]. > > For those of you using the Skara CLI tools [3] then `git-sync` will by > default *not* sync branches named `pr/` to the personal fork. If it > did then you would have to delete all `pr/` branches in your > personal fork yourself. This default behavior can be overridden by > passing `--branches` to `git-sync`. > > Let us know on the skara-dev [4] mailing list if you have any questions! > > Thanks, > Erik and Robin > > [0]: https://github.com/openjdk/jdk > [1]: https://github.com/openjdk/skara > [2]: https://github.com/openjdk/skara/pull/1087 > [3]: https://wiki.openjdk.java.net/display/SKARA/CLI+Tools > [4]: https://mail.openjdk.java.net/mailman/listinfo/skara-dev From ehelin at openjdk.java.net Tue Mar 30 08:12:07 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 30 Mar 2021 08:12:07 GMT Subject: [skara] Integrated: mlbridge: use nicer link for webrev commits In-Reply-To: <5FlXHXbWYMc12XNNKmLJMmdYF-GleN87B3H8txPEINE=.d45fbe94-1c7f-4222-bcbf-2a2264c7120f@github.com> References: <5FlXHXbWYMc12XNNKmLJMmdYF-GleN87B3H8txPEINE=.d45fbe94-1c7f-4222-bcbf-2a2264c7120f@github.com> Message-ID: On Mon, 29 Mar 2021 14:04:40 GMT, Erik Helin wrote: > Hi all, > > please review this patch that formats the link to the commit after a webrev version a bit nicer. After my change in f16663b766fa02ced204bb1ca8d334a4ca776092 we are showing the full link, which is a bit verbose. This patch restores the old behavior where we just show an abbreviated hash. > > Thanks, > Erik This pull request has now been integrated. Changeset: 3a408049 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/3a408049 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod mlbridge: use nicer link for webrev commits Reviewed-by: rwestberg, erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1098 From rwestberg at openjdk.java.net Tue Mar 30 08:48:10 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 30 Mar 2021 08:48:10 GMT Subject: RFR: 939: Improve robustness and error reporting on invalid fixVersion Message-ID: If a fixVersion isn't found, ensure that we refresh the cache and log a proper error message if it still isn't found. ------------- Commit messages: - Improve robustness and error reporting on invalid fixVersion Changes: https://git.openjdk.java.net/skara/pull/1099/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1099&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-939 Stats: 17 lines in 2 files changed: 15 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1099.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1099/head:pull/1099 PR: https://git.openjdk.java.net/skara/pull/1099 From ehelin at openjdk.java.net Tue Mar 30 08:48:10 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 30 Mar 2021 08:48:10 GMT Subject: RFR: 939: Improve robustness and error reporting on invalid fixVersion In-Reply-To: References: Message-ID: On Tue, 30 Mar 2021 08:43:36 GMT, Robin Westberg wrote: > If a fixVersion isn't found, ensure that we refresh the cache and log a proper error message if it still isn't found. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1099 From rwestberg at openjdk.java.net Tue Mar 30 09:03:12 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 30 Mar 2021 09:03:12 GMT Subject: [skara] Integrated: 939: Improve robustness and error reporting on invalid fixVersion In-Reply-To: References: Message-ID: On Tue, 30 Mar 2021 08:43:36 GMT, Robin Westberg wrote: > If a fixVersion isn't found, ensure that we refresh the cache and log a proper error message if it still isn't found. This pull request has now been integrated. Changeset: 2234a03a Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/2234a03a Stats: 17 lines in 2 files changed: 15 ins; 0 del; 2 mod 939: Improve robustness and error reporting on invalid fixVersion Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1099 From rwestberg at openjdk.java.net Tue Mar 30 09:16:02 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 30 Mar 2021 09:16:02 GMT Subject: RFR: Move the PR retarget responsibility to the prbranch notifier Message-ID: Retarget any dependent pull requests before closing the target branch in the notifier, to avoid potential races. ------------- Commit messages: - Move the PR retarget responsibility to the prbranch notifier Changes: https://git.openjdk.java.net/skara/pull/1100/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1100&range=00 Stats: 56 lines in 4 files changed: 51 ins; 5 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1100.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1100/head:pull/1100 PR: https://git.openjdk.java.net/skara/pull/1100 From ehelin at openjdk.java.net Tue Mar 30 09:22:21 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 30 Mar 2021 09:22:21 GMT Subject: [skara] RFR: pr: update error message for backports Message-ID: <1vS0XtEQDasEzL7K0hF7h926p7VCVG62lIcOgeSciXI=.2eb92acb-29c2-4415-9a70-e4e0d6cb42dd@github.com> Hi all, please review this patch that fixes the Markdown for the error message when a commit cannot be automatically backported. Thanks, Erik ------------- Commit messages: - pr: update error message for backports Changes: https://git.openjdk.java.net/skara/pull/1101/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1101&range=00 Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1101.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1101/head:pull/1101 PR: https://git.openjdk.java.net/skara/pull/1101 From ehelin at openjdk.java.net Tue Mar 30 09:22:46 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 30 Mar 2021 09:22:46 GMT Subject: RFR: Move the PR retarget responsibility to the prbranch notifier In-Reply-To: References: Message-ID: <2diBhFKKJaE1yHRtL0zq3tbM1V5X-N0cuwromqflUvE=.e0298152-f317-4bd9-88ca-767d8d0c83f5@github.com> On Tue, 30 Mar 2021 09:13:11 GMT, Robin Westberg wrote: > Retarget any dependent pull requests before closing the target branch in the notifier, to avoid potential races. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1100 From rwestberg at openjdk.java.net Tue Mar 30 09:55:58 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 30 Mar 2021 09:55:58 GMT Subject: RFR: pr: update error message for backports In-Reply-To: <1vS0XtEQDasEzL7K0hF7h926p7VCVG62lIcOgeSciXI=.2eb92acb-29c2-4415-9a70-e4e0d6cb42dd@github.com> References: <1vS0XtEQDasEzL7K0hF7h926p7VCVG62lIcOgeSciXI=.2eb92acb-29c2-4415-9a70-e4e0d6cb42dd@github.com> Message-ID: On Tue, 30 Mar 2021 09:19:30 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes the Markdown for the error message when a commit cannot be automatically backported. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1101 From rwestberg at openjdk.java.net Tue Mar 30 09:57:06 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 30 Mar 2021 09:57:06 GMT Subject: [skara] Integrated: 940: Exception during item execution: has integrated label but no integration comment In-Reply-To: References: Message-ID: On Tue, 30 Mar 2021 09:13:11 GMT, Robin Westberg wrote: > Retarget any dependent pull requests before closing the target branch in the notifier, to avoid potential races. This pull request has now been integrated. Changeset: c33a832d Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/c33a832d Stats: 56 lines in 4 files changed: 51 ins; 5 del; 0 mod 940: Exception during item execution: has integrated label but no integration comment Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1100 From rwestberg at openjdk.java.net Tue Mar 30 10:00:31 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 30 Mar 2021 10:00:31 GMT Subject: Integrated: 659: Multi-line commands aren't filtered properly In-Reply-To: <5xHTNA7BWkeoMWanqhnimbyd95N95TP_BT8Dsun3lfs=.6394fa25-f8f4-4508-8083-c8acb7b1ab79@github.com> References: <5xHTNA7BWkeoMWanqhnimbyd95N95TP_BT8Dsun3lfs=.6394fa25-f8f4-4508-8083-c8acb7b1ab79@github.com> Message-ID: On Wed, 24 Mar 2021 13:33:50 GMT, Robin Westberg wrote: > After a command has been found, filter out the rest of the body. This pull request has now been integrated. Changeset: 99e01ccd Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/99e01ccd Stats: 4 lines in 2 files changed: 3 ins; 0 del; 1 mod 659: Multi-line commands aren't filtered properly Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1092 From ehelin at openjdk.java.net Tue Mar 30 10:04:04 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 30 Mar 2021 10:04:04 GMT Subject: [skara] Integrated: pr: update error message for backports In-Reply-To: <1vS0XtEQDasEzL7K0hF7h926p7VCVG62lIcOgeSciXI=.2eb92acb-29c2-4415-9a70-e4e0d6cb42dd@github.com> References: <1vS0XtEQDasEzL7K0hF7h926p7VCVG62lIcOgeSciXI=.2eb92acb-29c2-4415-9a70-e4e0d6cb42dd@github.com> Message-ID: On Tue, 30 Mar 2021 09:19:30 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes the Markdown for the error message when a commit cannot be automatically backported. > > Thanks, > Erik This pull request has now been integrated. Changeset: 9e66034f Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/9e66034f Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod pr: update error message for backports Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1101 From ehelin at openjdk.java.net Tue Mar 30 11:56:47 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 30 Mar 2021 11:56:47 GMT Subject: [skara] RFR: tester: use job id instead of submission id Message-ID: Hi all, please review this small patch that makes the tester bot use the returned job id instead of the calculated submission id when displaying started jobs. Thanks, Erik ------------- Commit messages: - tester: use job id instead of submission id Changes: https://git.openjdk.java.net/skara/pull/1102/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1102&range=00 Stats: 38 lines in 2 files changed: 12 ins; 0 del; 26 mod Patch: https://git.openjdk.java.net/skara/pull/1102.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1102/head:pull/1102 PR: https://git.openjdk.java.net/skara/pull/1102 From rwestberg at openjdk.java.net Tue Mar 30 11:56:47 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 30 Mar 2021 11:56:47 GMT Subject: [skara] RFR: tester: use job id instead of submission id In-Reply-To: References: Message-ID: On Tue, 30 Mar 2021 11:53:14 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes the tester bot use the returned job id instead of the calculated submission id when displaying started jobs. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1102 From ehelin at openjdk.java.net Tue Mar 30 12:02:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 30 Mar 2021 12:02:27 GMT Subject: Integrated: tester: use job id instead of submission id In-Reply-To: References: Message-ID: On Tue, 30 Mar 2021 11:53:14 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that makes the tester bot use the returned job id instead of the calculated submission id when displaying started jobs. > > Thanks, > Erik This pull request has now been integrated. Changeset: 025a0f06 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/025a0f06 Stats: 38 lines in 2 files changed: 12 ins; 0 del; 26 mod tester: use job id instead of submission id Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1102 From shade at redhat.com Tue Mar 30 18:15:57 2021 From: shade at redhat.com (Aleksey Shipilev) Date: Tue, 30 Mar 2021 20:15:57 +0200 Subject: JMH/JOL/JCStress "Used By" points to inconvenient artifacts Message-ID: <2a4ca24f-dbe8-e6b9-2062-966cba2d7e72@redhat.com> Hi, If you look at "Used By" here: https://github.com/openjdk/jol/ -- then you would see that it is only used by two projects. That is actually a misconfiguration, as GitHub defaults to first module when tracking the dependents, which is "jol-benchmarks". It should instead track "jol-core". I remember asking Erik about this privately before, and it would seem that GitHub had implemented the missing bit for it: https://docs.github.com/en/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository#changing-the-used-by-package. Could anyone with admin access to OpenJDK GitHub repos see if that setting is available now? If available, could you please make the following changes? https://github.com/openjdk/jmh/: point to "jmh-core" https://github.com/openjdk/jcstress/: point to "jcstress-core" https://github.com/openjdk/jol/: point to "jol-core" -- Thanks, -Aleksey From stanislav.smirnov at oracle.com Tue Mar 30 19:17:08 2021 From: stanislav.smirnov at oracle.com (Stanislav Smirnov) Date: Tue, 30 Mar 2021 19:17:08 +0000 Subject: JMH/JOL/JCStress "Used By" points to inconvenient artifacts In-Reply-To: <2a4ca24f-dbe8-e6b9-2062-966cba2d7e72@redhat.com> References: <2a4ca24f-dbe8-e6b9-2062-966cba2d7e72@redhat.com> Message-ID: Hi Aleksey, Let me take a look at this -- Best regards, Stas Smirnov From: skara-dev on behalf of Aleksey Shipilev Date: Tuesday, March 30, 2021 at 2:16 PM To: skara-dev at openjdk.java.net Subject: JMH/JOL/JCStress "Used By" points to inconvenient artifacts Hi, If you look at "Used By" here: https://github.com/openjdk/jol/ -- then you would see that it is only used by two projects. That is actually a misconfiguration, as GitHub defaults to first module when tracking the dependents, which is "jol-benchmarks". It should instead track "jol-core". I remember asking Erik about this privately before, and it would seem that GitHub had implemented the missing bit for it: https://docs.github.com/en/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository#changing-the-used-by-package. Could anyone with admin access to OpenJDK GitHub repos see if that setting is available now? If available, could you please make the following changes? https://github.com/openjdk/jmh/: point to "jmh-core" https://github.com/openjdk/jcstress/: point to "jcstress-core" https://github.com/openjdk/jol/: point to "jol-core" -- Thanks, -Aleksey From stanislav.smirnov at oracle.com Tue Mar 30 19:20:59 2021 From: stanislav.smirnov at oracle.com (Stanislav Smirnov) Date: Tue, 30 Mar 2021 19:20:59 +0000 Subject: JMH/JOL/JCStress "Used By" points to inconvenient artifacts In-Reply-To: References: <2a4ca24f-dbe8-e6b9-2062-966cba2d7e72@redhat.com>, Message-ID: I fixed the used-by setting for the jmh and jol repositories. The jcstress repository setting looks correct. Please take a look and let me know if something is still missing. -- Best regards, Stas Smirnov From: skara-dev on behalf of Stanislav Smirnov Date: Tuesday, March 30, 2021 at 3:17 PM To: Aleksey Shipilev , skara-dev at openjdk.java.net Subject: Re: JMH/JOL/JCStress "Used By" points to inconvenient artifacts Hi Aleksey, Let me take a look at this -- Best regards, Stas Smirnov From: skara-dev on behalf of Aleksey Shipilev Date: Tuesday, March 30, 2021 at 2:16 PM To: skara-dev at openjdk.java.net Subject: JMH/JOL/JCStress "Used By" points to inconvenient artifacts Hi, If you look at "Used By" here: https://github.com/openjdk/jol/ -- then you would see that it is only used by two projects. That is actually a misconfiguration, as GitHub defaults to first module when tracking the dependents, which is "jol-benchmarks". It should instead track "jol-core". I remember asking Erik about this privately before, and it would seem that GitHub had implemented the missing bit for it: https://docs.github.com/en/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository#changing-the-used-by-package. Could anyone with admin access to OpenJDK GitHub repos see if that setting is available now? If available, could you please make the following changes? https://github.com/openjdk/jmh/: point to "jmh-core" https://github.com/openjdk/jcstress/: point to "jcstress-core" https://github.com/openjdk/jol/: point to "jol-core" -- Thanks, -Aleksey From shade at redhat.com Wed Mar 31 05:55:18 2021 From: shade at redhat.com (Aleksey Shipilev) Date: Wed, 31 Mar 2021 07:55:18 +0200 Subject: JMH/JOL/JCStress "Used By" points to inconvenient artifacts In-Reply-To: References: <2a4ca24f-dbe8-e6b9-2062-966cba2d7e72@redhat.com> Message-ID: <2e978e76-1064-87d4-57e3-2c7a0b60e313@redhat.com> On 3/30/21 9:20 PM, Stanislav Smirnov wrote: > Please take a look and let me know if something is still missing. Thank you, everything looks nice now. -- -Aleksey From rwestberg at openjdk.java.net Wed Mar 31 06:55:04 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 31 Mar 2021 06:55:04 GMT Subject: [skara] RFR: Add support for treating a set of mboxes as a single source of conversations Message-ID: <1JXNDzv5q9w7PB-8eALaniJhz0zWQI57mCatPBBXkdY=.f56f093d-0529-4c1d-873f-c1678e9f08a4@github.com> When bridging emails from mailing lists to pull requests, it is necessary to look at lists that can contain cross-posts as a single source. Otherwise, parts of a thread may be missed as it is only found on a certain list, while other parts are on another list. This is commonly the case for the jdk repositories which has its reviews split over many lists. To facilitate this, a MailingList can now be sourced from multiple actual lists, and is setup in that way when bridging repositories that are configured to use multiple lists for reviews. Sending mails are now done through the MailingListServer instead, as the actual target of a mail has always been decided by the email headers, and not the list send() was invoked on. ------------- Depends on: https://git.openjdk.java.net/skara/pull/1095 Commit messages: - Add support for treating a set of mboxes as a single source of conversations Changes: https://git.openjdk.java.net/skara/pull/1103/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1103&range=00 Stats: 490 lines in 20 files changed: 243 ins; 101 del; 146 mod Patch: https://git.openjdk.java.net/skara/pull/1103.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1103/head:pull/1103 PR: https://git.openjdk.java.net/skara/pull/1103 From ehelin at openjdk.java.net Wed Mar 31 08:29:44 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 31 Mar 2021 08:29:44 GMT Subject: RFR: pr: do not fetch tags for backport command Message-ID: Hi all, please review this patch that makes the `/backport` commit command *not* fetch tags. The `/backport` command doesn't need the tags and different openjdk repositories can have slightly different hashes for the annotated tag object itself (not the commit the tag is referring to). I also updated the help text from the bot to instruct the user to fetch with `--no-tags`. Thanks, Erik ------------- Commit messages: - pr: do not fetch tags for backport command Changes: https://git.openjdk.java.net/skara/pull/1104/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1104&range=00 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1104.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1104/head:pull/1104 PR: https://git.openjdk.java.net/skara/pull/1104 From rwestberg at openjdk.java.net Wed Mar 31 08:29:45 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 31 Mar 2021 08:29:45 GMT Subject: RFR: pr: do not fetch tags for backport command In-Reply-To: References: Message-ID: On Wed, 31 Mar 2021 08:25:37 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the `/backport` commit command *not* fetch tags. The `/backport` command doesn't need the tags and different openjdk repositories can have slightly different hashes for the annotated tag object itself (not the commit the tag is referring to). > > I also updated the help text from the bot to instruct the user to fetch with `--no-tags`. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1104 From ehelin at openjdk.java.net Wed Mar 31 08:32:39 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 31 Mar 2021 08:32:39 GMT Subject: Integrated: pr: do not fetch tags for backport command In-Reply-To: References: Message-ID: On Wed, 31 Mar 2021 08:25:37 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the `/backport` commit command *not* fetch tags. The `/backport` command doesn't need the tags and different openjdk repositories can have slightly different hashes for the annotated tag object itself (not the commit the tag is referring to). > > I also updated the help text from the bot to instruct the user to fetch with `--no-tags`. > > Thanks, > Erik This pull request has now been integrated. Changeset: fc91e6d0 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/fc91e6d0 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod pr: do not fetch tags for backport command Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1104 From ehelin at openjdk.java.net Wed Mar 31 08:36:37 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 31 Mar 2021 08:36:37 GMT Subject: [cr] RFR: 658: Webrev frame view does not have an indication of the current file Message-ID: <1nPiyJ60au_k2MXA3Q2JHWyhgkJ4f85gPKk_zoMAQl4=.275af83d-0038-4dfc-a321-9bc947961d9a@github.com> Hi all, please review this patch that makes the fragment (the part in the URL after the `#`) include the filename, not only the view and file number. This makes it easier in particularly the "Frames" view to see the filename of the file being changed (although browsers like Safari and Chrome nowadays hide parts of the URL by default). This also makes webrev.js more similar to the old webrev.ksh which included the filename in almost all URLs. Testing: - Local testing using Firefox on Linux x64 Thanks, Erik ------------- Commit messages: - skara-658 Changes: https://git.openjdk.java.net/cr/pull/5/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=5&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-658 Stats: 18 lines in 1 file changed: 5 ins; 0 del; 13 mod Patch: https://git.openjdk.java.net/cr/pull/5.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/5/head:pull/5 PR: https://git.openjdk.java.net/cr/pull/5 From rwestberg at openjdk.java.net Wed Mar 31 08:36:39 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 31 Mar 2021 08:36:39 GMT Subject: [cr] RFR: 658: Webrev frame view does not have an indication of the current file In-Reply-To: <1nPiyJ60au_k2MXA3Q2JHWyhgkJ4f85gPKk_zoMAQl4=.275af83d-0038-4dfc-a321-9bc947961d9a@github.com> References: <1nPiyJ60au_k2MXA3Q2JHWyhgkJ4f85gPKk_zoMAQl4=.275af83d-0038-4dfc-a321-9bc947961d9a@github.com> Message-ID: <_SZc_HQ0PgJM6uuBOq9ImoErcRkwY2nMrH9BPRULIMA=.12e70caa-2754-4862-9088-eea1851cdef2@github.com> On Tue, 30 Mar 2021 13:26:38 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the fragment (the part in the URL after the `#`) include the filename, not only the view and file number. This makes it easier in particularly the "Frames" view to see the filename of the file being changed (although browsers like Safari and Chrome nowadays hide parts of the URL by default). This also makes webrev.js more similar to the old webrev.ksh which included the filename in almost all URLs. > > Testing: > - Local testing using Firefox on Linux x64 > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/cr/pull/5 From ehelin at openjdk.java.net Wed Mar 31 08:40:49 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 31 Mar 2021 08:40:49 GMT Subject: [cr] Integrated: 658: Webrev frame view does not have an indication of the current file In-Reply-To: <1nPiyJ60au_k2MXA3Q2JHWyhgkJ4f85gPKk_zoMAQl4=.275af83d-0038-4dfc-a321-9bc947961d9a@github.com> References: <1nPiyJ60au_k2MXA3Q2JHWyhgkJ4f85gPKk_zoMAQl4=.275af83d-0038-4dfc-a321-9bc947961d9a@github.com> Message-ID: On Tue, 30 Mar 2021 13:26:38 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the fragment (the part in the URL after the `#`) include the filename, not only the view and file number. This makes it easier in particularly the "Frames" view to see the filename of the file being changed (although browsers like Safari and Chrome nowadays hide parts of the URL by default). This also makes webrev.js more similar to the old webrev.ksh which included the filename in almost all URLs. > > Testing: > - Local testing using Firefox on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 2442461e Author: Erik Helin URL: https://git.openjdk.java.net/cr/commit/2442461e Stats: 18 lines in 1 file changed: 5 ins; 0 del; 13 mod 658: Webrev frame view does not have an indication of the current file Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/cr/pull/5 From rwestberg at openjdk.java.net Wed Mar 31 09:25:19 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 31 Mar 2021 09:25:19 GMT Subject: RFR: 943: remote: GitLab: You can only delete protected branches using the web interface Message-ID: <1KzQkvvayM1_9F5gw5WFGlN4pSDhEWjHeq7rQ5Z-Va4=.a7620676-5b5d-4bc3-b078-d25419100342@github.com> Use a rest api to delete branches, to allow dependent pr branches to be configured as protected. ------------- Commit messages: - Use a rest api to delete branches Changes: https://git.openjdk.java.net/skara/pull/1105/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1105&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-943 Stats: 45 lines in 7 files changed: 37 ins; 7 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1105.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1105/head:pull/1105 PR: https://git.openjdk.java.net/skara/pull/1105 From ehelin at openjdk.java.net Wed Mar 31 09:28:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 31 Mar 2021 09:28:40 GMT Subject: RFR: 943: remote: GitLab: You can only delete protected branches using the web interface In-Reply-To: <1KzQkvvayM1_9F5gw5WFGlN4pSDhEWjHeq7rQ5Z-Va4=.a7620676-5b5d-4bc3-b078-d25419100342@github.com> References: <1KzQkvvayM1_9F5gw5WFGlN4pSDhEWjHeq7rQ5Z-Va4=.a7620676-5b5d-4bc3-b078-d25419100342@github.com> Message-ID: On Wed, 31 Mar 2021 09:21:30 GMT, Robin Westberg wrote: > Use a rest api to delete branches, to allow dependent pr branches to be configured as protected. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1105 From ehelin at openjdk.java.net Wed Mar 31 09:37:22 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 31 Mar 2021 09:37:22 GMT Subject: Integrated: build: update to Gradle 6.8.3 In-Reply-To: References: Message-ID: On Mon, 22 Mar 2021 09:47:40 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that updates Gradle to version `6.8.3`. > > Thanks, > Erik This pull request has now been integrated. Changeset: 74c90692 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/74c90692 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod build: update to Gradle 6.8.3 Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1086 From ehelin at openjdk.java.net Wed Mar 31 09:38:25 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 31 Mar 2021 09:38:25 GMT Subject: RFR: build: update to JUnit 5.7.1 [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that updates JUnit to version `5.7.1` (and JUnit Platform to `1.7.1`). > > Thanks, > Erik Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1087/files - new: https://git.openjdk.java.net/skara/pull/1087/files/6d59d0e5..6d59d0e5 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1087&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1087&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1087.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1087/head:pull/1087 PR: https://git.openjdk.java.net/skara/pull/1087 From rwestberg at openjdk.java.net Wed Mar 31 09:44:37 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 31 Mar 2021 09:44:37 GMT Subject: RFR: Add support for treating a set of mboxes as a single source of conversations [v2] In-Reply-To: <1JXNDzv5q9w7PB-8eALaniJhz0zWQI57mCatPBBXkdY=.f56f093d-0529-4c1d-873f-c1678e9f08a4@github.com> References: <1JXNDzv5q9w7PB-8eALaniJhz0zWQI57mCatPBBXkdY=.f56f093d-0529-4c1d-873f-c1678e9f08a4@github.com> Message-ID: > When bridging emails from mailing lists to pull requests, it is necessary to look at lists that can contain cross-posts as a single source. Otherwise, parts of a thread may be missed as it is only found on a certain list, while other parts are on another list. This is commonly the case for the jdk repositories which has its reviews split over many lists. > > To facilitate this, a MailingList can now be sourced from multiple actual lists, and is setup in that way when bridging repositories that are configured to use multiple lists for reviews. Sending mails are now done through the MailingListServer instead, as the actual target of a mail has always been decided by the email headers, and not the list send() was invoked on. Robin Westberg has updated the pull request incrementally with two additional commits since the last revision: - Rename MailingList -> MailingListReader - Fix configuration parsing ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1103/files - new: https://git.openjdk.java.net/skara/pull/1103/files/c725c046..2977dd09 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1103&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1103&range=00-01 Stats: 73 lines in 15 files changed: 5 ins; 6 del; 62 mod Patch: https://git.openjdk.java.net/skara/pull/1103.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1103/head:pull/1103 PR: https://git.openjdk.java.net/skara/pull/1103 From rwestberg at openjdk.java.net Wed Mar 31 09:48:46 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 31 Mar 2021 09:48:46 GMT Subject: Integrated: 943: remote: GitLab: You can only delete protected branches using the web interface In-Reply-To: <1KzQkvvayM1_9F5gw5WFGlN4pSDhEWjHeq7rQ5Z-Va4=.a7620676-5b5d-4bc3-b078-d25419100342@github.com> References: <1KzQkvvayM1_9F5gw5WFGlN4pSDhEWjHeq7rQ5Z-Va4=.a7620676-5b5d-4bc3-b078-d25419100342@github.com> Message-ID: On Wed, 31 Mar 2021 09:21:30 GMT, Robin Westberg wrote: > Use a rest api to delete branches, to allow dependent pr branches to be configured as protected. This pull request has now been integrated. Changeset: 3d6d56f5 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/3d6d56f5 Stats: 45 lines in 7 files changed: 37 ins; 7 del; 1 mod 943: remote: GitLab: You can only delete protected branches using the web interface Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1105 From ehelin at openjdk.java.net Wed Mar 31 12:28:35 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 31 Mar 2021 12:28:35 GMT Subject: RFR: forge: GitLab members endpoint return 404 for non-members Message-ID: Hi all, please review this patch that fixes how `GitLabRepository.canPush` uses the `members` REST endpoint. Turns out that the `members` endpoint returns a `404` if the user is _not_ a member of the project (not documented of course ?? ). Thanks, Erik ------------- Commit messages: - forge: GitLab members endpoint return 404 for non-members Changes: https://git.openjdk.java.net/skara/pull/1106/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1106&range=00 Stats: 3 lines in 1 file changed: 3 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1106.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1106/head:pull/1106 PR: https://git.openjdk.java.net/skara/pull/1106 From rwestberg at openjdk.java.net Wed Mar 31 12:28:35 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 31 Mar 2021 12:28:35 GMT Subject: RFR: forge: GitLab members endpoint return 404 for non-members In-Reply-To: References: Message-ID: On Wed, 31 Mar 2021 12:25:14 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes how `GitLabRepository.canPush` uses the `members` REST endpoint. Turns out that the `members` endpoint returns a `404` if the user is _not_ a member of the project (not documented of course ?? ). > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1106 From rwestberg at openjdk.java.net Wed Mar 31 12:58:37 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 31 Mar 2021 12:58:37 GMT Subject: Integrated: 568: RFR mails from the list are not copied to github In-Reply-To: References: Message-ID: On Fri, 26 Mar 2021 12:46:20 GMT, Robin Westberg wrote: > The mbox parser could fail to pick up replies that were out of order, as well as replies with additional text in the In-Reply-To header. This pull request has now been integrated. Changeset: 87c55b23 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/87c55b23 Stats: 120 lines in 2 files changed: 95 ins; 2 del; 23 mod 568: RFR mails from the list are not copied to github Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1095 From ehelin at openjdk.java.net Wed Mar 31 13:26:34 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 31 Mar 2021 13:26:34 GMT Subject: Integrated: forge: GitLab members endpoint return 404 for non-members In-Reply-To: References: Message-ID: <1Wk-EoUJZry_ogJMX7TfDo_CdO2H5z4KczwEvRO1gGg=.e0ec2e1d-49bd-46bc-bb10-c6b83f356175@github.com> On Wed, 31 Mar 2021 12:25:14 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes how `GitLabRepository.canPush` uses the `members` REST endpoint. Turns out that the `members` endpoint returns a `404` if the user is _not_ a member of the project (not documented of course ?? ). > > Thanks, > Erik This pull request has now been integrated. Changeset: b404a144 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/b404a144 Stats: 3 lines in 1 file changed: 3 ins; 0 del; 0 mod forge: GitLab members endpoint return 404 for non-members Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/1106 From ehelin at openjdk.java.net Wed Mar 31 14:00:54 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 31 Mar 2021 14:00:54 GMT Subject: RFR: pr: only create backport branch once Message-ID: Hi all, please review this patch that ensures that the `/backport` commit command will only create the backport commit (and corresponding branch) once. There is no need to try to do this multiple times, the cherry picking will result in the same result every time. If a user for some reasons issues the `/backport` command twice on a commit then this will now work. Thanks, Erik ------------- Commit messages: - pr: only create backport branch once Changes: https://git.openjdk.java.net/skara/pull/1107/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1107&range=00 Stats: 129 lines in 2 files changed: 79 ins; 18 del; 32 mod Patch: https://git.openjdk.java.net/skara/pull/1107.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1107/head:pull/1107 PR: https://git.openjdk.java.net/skara/pull/1107 From rwestberg at openjdk.java.net Wed Mar 31 14:49:10 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 31 Mar 2021 14:49:10 GMT Subject: RFR: pr: only create backport branch once In-Reply-To: References: Message-ID: On Wed, 31 Mar 2021 13:57:33 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that the `/backport` commit command will only create the backport commit (and corresponding branch) once. There is no need to try to do this multiple times, the cherry picking will result in the same result every time. If a user for some reasons issues the `/backport` command twice on a commit then this will now work. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1107