Add support for git diff --indent-heuristic option #1652
Merged
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 test is based on example from: https://github.com/git/git/blob/433860f3d0beb0c6f205290bd16cda413148f098/t/t4061-diff-indent.sh#L17
When this flag is set, enable the GIT_DIFF_INDENT_HEURISTIC option.
When compared files don't contain spaces, the --indent-heuristic option won't make a difference.
Therzok
reviewed
Dec 19, 2018
| ContentChanges changes0 = repo.Diff.Compare(oldBlob, newBlob, noIndentHeuristicOption); | ||
| ContentChanges changes1 = repo.Diff.Compare(oldBlob, newBlob, indentHeuristicOption); | ||
|
|
||
| Assert.NotEqual(changes0.Patch, changes1.Patch); |
There was a problem hiding this comment.
Can we validate that changes0 is a superset of changes1?
There was a problem hiding this comment.
Or validate the results of the patch strings?
There was a problem hiding this comment.
I was wondering about what exactly to validate in this case. The main thing I wanted to validate was that the flag was making its way to indent heuristic code. By checking when we expect the flag to make a difference and when we don't expect it to make a difference, I hope that is pretty much covered.
I've added a sanity check in 2f583cb to make sure that the same lines are being added or removed. I'm trusting the algorithm to add or remove them in the correct order. 🙂
The --indent-heuristic option should create patches that add or remove the same lines, but potentially in a different order.
3 tasks
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.
What this PR does
IndentHeuristicoption toCompareOptions(it's abool)--indent-heuristicmakes a difference--indent-heuristicwon't make a difference