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

merge-bot: use commitMetadata when listing commits #578

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Apr 15, 2020

Hi all,

please review this patch that makes the automatic merge bot use commitMetadata
instead of commits to speed up listing of large commit ranges.

Testing:

  • make test passes 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/578/head:pull/578
$ git checkout pull/578

@bridgekeeper
Copy link

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

Copy link
Member

@rwestberg rwestberg left a comment

Looks good, just one minor comment!

@@ -463,7 +463,7 @@ public void run(Path scratchPath) {
message.add(marker);
message.add("<!-- " + fetchHead.hex() + " -->");

var commits = repo.commits(mergeBase.hex() + ".." + fetchHead.hex(), true).asList();
var commits = repo.commitMetadata(mergeBase.hex() + ".." + fetchHead.hex(), true);
Copy link
Member

@rwestberg rwestberg Apr 15, 2020

Choose a reason for hiding this comment

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

Use the overloaded range syntax instead of manual ".."?

@openjdk
Copy link

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

merge-bot: use commitMetadata when listing commits

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 /solves command.

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

@edvbld edvbld commented Apr 15, 2020

/integrate

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

@openjdk openjdk bot commented Apr 15, 2020

@edvbld
Pushed as commit 0a71dcf.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 15, 2020

Webrevs

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