Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

247: Support atomic pushes in with /integrate command #384

Closed
wants to merge 2 commits into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Jan 28, 2020

Hi all,

Please review this change that allows pushing without automatic rebasing.

Best regards,
Robin

Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

SKARA-247: Support atomic pushes in with /integrate command

Approvers

edvbld
edvbld approved these changes Jan 28, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good, just a minor nit on wording 😉

@@ -108,6 +121,9 @@ public void handle(PullRequestBot bot, PullRequest pr, CensusInstance censusInst
if (!ProjectPermissions.mayCommit(censusInstance, pr.author())) {
reply.println(ReadyForSponsorTracker.addIntegrationMarker(pr.headHash()));
reply.println("Your change (at version " + pr.headHash() + ") is now ready to be sponsored by a Committer.");
if (!args.isBlank()) {
reply.println("Note that your sponsor will make the final decision on which target hash to integrate on.");
Copy link
Member

@edvbld edvbld Jan 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
reply.println("Note that your sponsor will make the final decision on which target hash to integrate on.");
reply.println("Note that your sponsor will make the final decision on which target hash to integrate upon.");

Copy link
Member Author

@rwestberg rwestberg Jan 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about onto, as in git rebase --onto?

Copy link
Member

@edvbld edvbld Jan 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 28, 2020

👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

@openjdk
Copy link

@openjdk openjdk bot commented Jan 28, 2020

@rwestberg This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

247: Support atomic pushes in with /integrate command

Reviewed-by: ehelin
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to do this manually, please merge master into your branch first.

➡️ To integrate this PR with the above commit message, type /integrate in a new comment.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 28, 2020

Webrevs

@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Jan 29, 2020

/integrate

@openjdk openjdk bot closed this Jan 29, 2020
@openjdk openjdk bot added the integrated label Jan 29, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jan 29, 2020

@rwestberg The following commits have been pushed to master since your change was applied:

  • 1325136: 248: Only post integration messages to RFR threads once

Your commit was automatically rebased without conflicts.

Pushed as commit 77ae4d8.

@openjdk openjdk bot removed the ready label Jan 29, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 29, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: 77ae4d8
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-01-29 08:04:11 +0000
URL: https://git.openjdk.java.net/skara/commit/77ae4d83

247: Support atomic pushes in with /integrate command

Reviewed-by: ehelin

! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/SponsorCommand.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/IntegrateTests.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SponsorTests.java

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 29, 2020

Mailing list message from Jonathan Gibbons on skara-dev:

On 1/28/20 5:33 AM, Erik Helin wrote:

On Tue, 28 Jan 2020 12:56:15 GMT, Robin Westberg <rwestberg at openjdk.org> wrote:

bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java line 125:

124: if (!args.isBlank()) {
125: reply.println("Note that your sponsor will make the final decision on which target hash to integrate on.");
126: }
Suggestion:

                     reply\.println\(\"Note that your sponsor will make the final decision on which target hash to integrate upon\.\"\)\;

How about onto, as in `git rebase --onto`?
??

-------------

PR: https://git.openjdk.java.net/skara/pull/384

Some say you should not end a sentence with a preposition, and you've
certainly got a double "on".

Suggestion:

reply.println("Note that your sponsor will make the final decision onto which target hash to integrate.");

-- Jon

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 30, 2020

Mailing list message from Robin Westberg on skara-dev:

Hi Jon,

On 29 Jan 2020, at 21:05, Jonathan Gibbons <jonathan.gibbons at oracle.com> wrote:

On 1/28/20 5:33 AM, Erik Helin wrote:

On Tue, 28 Jan 2020 12:56:15 GMT, Robin Westberg <rwestberg at openjdk.org> wrote:

bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java line 125:

124: if (!args.isBlank()) {
125: reply.println("Note that your sponsor will make the final decision on which target hash to integrate on.");
126: }
Suggestion:

                    reply\.println\(\"Note that your sponsor will make the final decision on which target hash to integrate upon\.\"\)\;

How about onto, as in `git rebase --onto`?
??

-------------

PR: https://git.openjdk.java.net/skara/pull/384

Some say you should not end a sentence with a preposition, and you've certainly got a double "on".

Suggestion:

                   reply\.println\(\"Note that your sponsor will make the final decision onto which target hash to integrate\.\?\)\;

Thanks! I?ll create a follow-up PR to incorporate your suggestion.

Best regards,
Robin

-- Jon

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants