Fix support for empty diffs (new, deleted, renamed, binary files). #13
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced May 9, 2016
dmitshur
changed the title
dmitshur
changed the title
|
With the latest commit bcc6326, I've finished cleaning up. This PR is ready for final review and merging (commits need to be squashed before merging). |
There are situations where a diff is empty. For example, if a blank file is added a removed. Or if a file is renamed without any changes. This change detects and handles those situations properly. That includes fixing support for modified binary files. Improve test coverage significantly. Fixes #10.
|
|
||
| diff.Hunks = nil | ||
| if got, want := diff, test.wantDiff; !reflect.DeepEqual(got, want) { | ||
| t.Errorf("%s:\n\ngot: %v\nwant: %v", test.filename, goon.Sdump(got), goon.Sdump(want)) |
There was a problem hiding this comment.
Could consider using github.com/d4l3k/messagediff here instead of printing 2 goons. It might be even more readable.
There was a problem hiding this comment.
Whatever you think is best; this is just a test dependency so adding dependencies is fine.
|
@shurcooL does this need to be code reviewed? If so, can you assign it to someone? |
|
I'm quite confident about this change, but it needs to be reviewed because it's standard practice that we use. I've assigned @slimsag since he has most context (he worked on it in #10 (comment)). |
|
LGTM |
dmitshur
added a commit
to shurcooL-legacy/Conception-go
that referenced
this pull request
May 21, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DO NOT MERGE, this is a WIP PR and there are known TODOs to resolve. Early review (comments, suggestions) is welcome.Edit: Ready for review and merge.There are situations where a diff is empty. For example, if a blank file is added a removed. Or if a file is renamed without any changes. This change detects and handles those situations properly. Edit: Or if the file modified is binary.
Improve test coverage significantly.
TODO
Fixes #10.