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

notify: store resulting commit in PullRequestState #641

Closed
wants to merge 2 commits into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Jun 5, 2020

Hi all,

please review this patch that the resulting (integrated) commit from a PR in the PullRequestState. This data will be used in future patches for more easier handling of notifications. Note that all data in the Storage might not have the "commit" field. If that is the case, then the code will lazily populate the "commit" field.

Testing:

  • make test on Linux x64

Thanks,
Erik


Progress

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

Reviewers

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 5, 2020

👋 Welcome back ehelin! 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 Jun 5, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good, but may need to add an extra configuration field.

var prIssues = new PullRequestState(pr, issues);
var current = storage.current();
if (current.contains(prIssues)) {
var commit = resultingCommitHashFor(pr, pr.repository().forge().currentUser());
Copy link
Member

@rwestberg rwestberg Jun 5, 2020

Choose a reason for hiding this comment

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

The notifier bot may not be running with the same credentials as the commit bot, so this is possibly the wrong user to look for. The other bots (mlbridge, pr) takes a username from the configuration to use for matching comment poster ids.

@openjdk
Copy link

@openjdk openjdk bot commented Jun 5, 2020

@edvbld 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:

notify: store resulting commit in PullRequestState

Reviewed-by: rwestberg
  • 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 /issue command.

Since the source branch of this PR was last updated there have been 2 commits pushed to the master branch:

  • c11028a: forge: add commitMetadata method to HostedRepository
  • dd94745: forge: support commit comments

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate c11028a093e0a2b0f4180d02ffc46ce18b5b1361.

➡️ 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 Jun 5, 2020
@edvbld
Copy link
Member Author

@edvbld edvbld commented Jun 8, 2020

/integrate

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

@openjdk openjdk bot commented Jun 8, 2020

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

  • c11028a: forge: add commitMetadata method to HostedRepository
  • dd94745: forge: support commit comments

Your commit was automatically rebased without conflicts.

Pushed as commit 1d06390.

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