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

1015: Webrev can't handle changes with binary files #16

wants to merge 2 commits into from


Copy link

@erikj79 erikj79 commented May 12, 2021

Please review this fix, which fixes handling of binary files in webrev diffs. We should not even attempt to show diffs for binary files.


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


  • SKARA-1015: Webrev can't handle changes with binary files



Using git

Checkout this PR locally:
$ git fetch pull/16/head:pull/16
$ git checkout pull/16

Update a local copy of the PR:
$ git checkout pull/16
$ git pull pull/16/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16

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

Using diff file

Download this PR as a diff file:

Copy link

@bridgekeeper bridgekeeper bot commented May 12, 2021

👋 Welcome back erikj! 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 changed the title SKARA-1015 1015: Webrev can't handle changes with binary files May 12, 2021
@openjdk openjdk bot added the rfr label May 12, 2021
Copy link

@mlbridge mlbridge bot commented May 12, 2021


index.html Outdated
const line = lines[i];
if (line.startsWith("@@")) {
if (srcLines.length > 0 || dstLines.length > 0) {
if (patch != null) {
Copy link

@edvbld edvbld May 17, 2021

Choose a reason for hiding this comment

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

Maybe do an early return instead? As in

if (patch === null) {
    return hunks;

That way you don't have to re-indent the entire method 😄

edvbld approved these changes May 17, 2021
Copy link

@edvbld edvbld left a comment

Looks good!

Copy link

@openjdk openjdk bot commented May 17, 2021

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file 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:

1015: Webrev can't handle changes with binary files

Reviewed-by: ehelin

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 May 17, 2021
Copy link
Member Author

@erikj79 erikj79 commented May 17, 2021


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

@openjdk openjdk bot commented May 17, 2021

@erikj79 Pushed as commit 8f3aff2.

💡 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