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

vcs: handle clean renames in combined diff parser #549

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Mar 30, 2020

Hi all,

please review this patch that makes the combined diff parser handle "clean"
renames with regards to both parents. A clean rename is when the file is just
renamed, no lines in the files have changed. The problem is that git does not
output a diff --combined line, nor any hunks, for a clean rename. The combined
diff parser has been updated to detect this situation and then return empty hunk
lists.

I also added a bunch of state checks to the combined diff parser to help
diagnose future issues faster.

Testing:

  • make test passes on Linux x64
  • Manual testing with large merge commits

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 30, 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.

@openjdk openjdk bot added the rfr label Mar 30, 2020
Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 30, 2020

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Mar 30, 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:

vcs: handle clean renames in combined diff parser

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.

Since the source branch of this PR was last updated there have been 2 commits pushed to the master branch. Since 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 5ed11337d5d51b914e5093c73129d7e88ad0e955.

➡️ To integrate this PR with the above commit message, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Mar 30, 2020
@edvbld
Copy link
Member Author

@edvbld edvbld commented Mar 30, 2020

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Mar 30, 2020

@edvbld Unknown command integreate - for a list of valid commands use /help.

@edvbld
Copy link
Member Author

@edvbld edvbld commented Mar 30, 2020

/integrate

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

@openjdk openjdk bot commented Mar 30, 2020

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

  • 5ed1133: jcheck: add asString when parsing INI values
  • eef8fff: merge-bot: minor improvements to message

Your commit was automatically rebased without conflicts.

Pushed as commit 73e43b7.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 30, 2020

Mailing list message from Erik Helin on skara-dev:

Changeset: 73e43b7
Author: Erik Helin <ehelin at openjdk.org>
Date: 2020-03-30 11:50:50 +0000
URL: https://git.openjdk.java.net/skara/commit/73e43b73

vcs: handle clean renames in combined diff parser

Reviewed-by: rwestberg

! vcs/src/main/java/org/openjdk/skara/vcs/git/GitCombinedDiffParser.java

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