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

667: Webrev contents broken for rebased push #10

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Apr 15, 2021

Hi all,

please review this patch that makes webrev.js calculate the "base"/"old" content from the "head"/"new" content and the reversed patch. This make webrev.js handle webrevs for force pushes. I also took the opportunity to reduce the number of network requests (by half) and also parallelized the initial three network requests.

Testing:

  • Manual testing on a large number of webrevs

Thanks,
Erik


Progress

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

Issue

  • SKARA-667: Webrev contents broken for rebased push

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/cr pull/10/head:pull/10
$ git checkout pull/10

Update a local copy of the PR:
$ git checkout pull/10
$ git pull https://git.openjdk.java.net/cr pull/10/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10

View PR using the GUI difftool:
$ git pr show -t 10

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/cr/pull/10.diff

@bridgekeeper
Copy link

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

@edvbld edvbld changed the title Create base content from head content skara-667 Apr 15, 2021
@openjdk openjdk bot changed the title skara-667 667: Webrev contents broken for rebased push Apr 15, 2021
@openjdk openjdk bot added the rfr label Apr 15, 2021
@mlbridge
Copy link

mlbridge bot commented Apr 15, 2021

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Choose a reason for hiding this comment

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

Looks good!

@openjdk
Copy link

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

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

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

667: Webrev contents broken for rebased push

Reviewed-by: rwestberg

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 1 new commit pushed to the master branch:

  • 7b82818: index.html: move license comment after head tag

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 Apr 15, 2021
@edvbld
Copy link
Member Author

edvbld commented Apr 16, 2021

/integrate

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

openjdk bot commented Apr 16, 2021

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

  • 9ce4cde: index.html: remove indentation
  • 7b82818: index.html: move license comment after head tag

Your commit was automatically rebased without conflicts.

Pushed as commit 47665ae.

💡 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
2 participants