Fix missing lines in Parallel Diff #6799
Merged
Conversation
This file contains 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
|
@randx Looks good! |
dzaporozhets
added a commit
that referenced
this pull request
May 6, 2014
Fix missing lines in Parallel Diff
|
@GeorgeDewar Thanks! |
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.
A user of Gitlab here has noticed that the Parallel Diff feature chops a bunch of lines off the end of a file. This issue predates the recent changes to this feature - it affects the current version of Gitlab and can be observed on demo.gitlab.com.
We have deduced that what is happening is that a line count that removes empty lines is being used, and so for every empty (or whitespace, I imagine) line in the file, a line off the end is not shown.
This PR seems to resolve the problem by using the loc method instead of the sloc method. It also correctly calculates the maximum length of the two files, avoiding another issue where unnecessary lines are appended to the end of the diff output if the lengths of the files differ.