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

pr: update all local branches for commit comments #1041

Closed
wants to merge 2 commits into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Feb 28, 2021

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:

  • 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/1041/head:pull/1041
$ git checkout pull/1041

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 28, 2021

👋 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. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Feb 28, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 28, 2021

Webrevs

@@ -67,12 +67,14 @@ private boolean isAncestor(ReadOnlyRepository repo, Hash ancestor, Hash descenda
var hostedRepositoryPool = new HostedRepositoryPool(seedPath);
var localRepoPath = scratchPath.resolve("pr").resolve("commit-comments").resolve(bot.repo().name());
var localRepo = hostedRepositoryPool.materialize(bot.repo(), localRepoPath);
localRepo.fetchAllRemotes(false);
Copy link
Member

@rwestberg rwestberg Mar 1, 2021

Choose a reason for hiding this comment

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

Not sure this is needed? The materialize call should have done a fetchAll as well..

Copy link
Member Author

@edvbld edvbld Mar 10, 2021

Choose a reason for hiding this comment

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

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 👍

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Mar 10, 2021

@edvbld This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

After integration, the commit message for the final commit will be:

pr: update all local branches for commit comments

Reviewed-by: rwestberg, ihse

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ 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 Mar 10, 2021
Copy link
Member

@magicus magicus left a comment

LGTM

@edvbld
Copy link
Member Author

@edvbld edvbld commented Mar 10, 2021

/integrate

@openjdk openjdk bot closed this Mar 10, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 10, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 10, 2021

@edvbld Since your change was applied there have been 3 commits pushed to the master branch:

  • 591fb2c: 666: Integrated message delivered to wrong thread
  • 10ee68e: 708: Email version of UI file comment used the wrong version of the file
  • 421b1b6: 636: Quote @-characters in bridged emails

Your commit was automatically rebased without conflicts.

Pushed as commit 589227f.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

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