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

382: List commits that have been pushed in integration message #602

Closed
wants to merge 2 commits into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Apr 27, 2020

Hi all,

Please review this change that lists the commits that have been pushed since the PR was created (up to 10).

Best regards,
Robin


Progress

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

Issue

  • SKARA-382: List commits that have been pushed in integration message

Reviewers

  • Erik Helin (ehelin - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/skara pull/602/head:pull/602
$ git checkout pull/602

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 27, 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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 27, 2020

Webrevs

edvbld
edvbld approved these changes Apr 27, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good in general, just one minor question and one minor comment 👍

.limit(10)
.forEach(c -> message.append(" * ").append(c.hash().hex()).append(": ").append(c.message().get(0)).append("\n"));
if (divergingCommits.size() > 10) {
message.append(" * ... full list: ").append(pr.repository().webUrl(baseHash.hex(), pr.targetRef())).append("\n");
Copy link
Member

@edvbld edvbld Apr 27, 2020

Choose a reason for hiding this comment

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

Can we say something like * ... and 5 more: ?

Copy link
Member Author

@rwestberg rwestberg Apr 27, 2020

Choose a reason for hiding this comment

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

Sure, but the link itself should show a full list, right?

Copy link
Member

@edvbld edvbld Apr 27, 2020

Choose a reason for hiding this comment

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

Yeah, I think that is the best

@openjdk
Copy link

@openjdk openjdk bot commented Apr 27, 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:

382: List commits that have been pushed in integration message

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.

There are currently no new commits on the master branch since the last update of the source branch of this PR. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you would like to avoid potential automatic rebasing, specify the current head hash when integrating, like this: /integrate 75f257ef143e9c3ba82f2e45c2589a15ddbe34d0.

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

@openjdk openjdk bot added the ready label Apr 27, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 27, 2020

Thanks for reviewing!

edvbld
edvbld approved these changes Apr 27, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks solid now 💯 !

@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 27, 2020

/integrate

@openjdk openjdk bot closed this Apr 27, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 27, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Apr 27, 2020

@rwestberg
Pushed as commit 9bf3f5c.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 27, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: 9bf3f5c
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-04-27 09:52:32 +0000
URL: https://git.openjdk.java.net/skara/commit/9bf3f5cb

382: List commits that have been pushed in integration message

Reviewed-by: ehelin

! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java
! bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryHostedRepository.java
! forge/src/main/java/org/openjdk/skara/forge/HostedRepository.java
! forge/src/main/java/org/openjdk/skara/forge/github/GitHubRepository.java
! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java
! test/src/main/java/org/openjdk/skara/test/TestHostedRepository.java

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