Issue 1553: Include terminal newlines in diffs #1634
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
|
Note: the linting will fail because we added @RedBeardCode to Changelog links in another PR. |
|
@tomviner could you please fix the conflicts? 😁 |
| @@ -225,9 +225,11 @@ def _diff_text(left, right, verbose=False): | |||
| 'characters in diff, use -v to show') % i] | |||
| left = left[:-i] | |||
| right = right[:-i] | |||
| # We set splitlines' keepends=True, which can only be passed as a | |||
| # positional argument | |||
There was a problem hiding this comment.
In this cases I usually just write:
splitlines = True
...
left.splitlines(splitlines)But really is just a matter of style, no need to change it. 😁
There was a problem hiding this comment.
Thanks @nicoddemus Nice suggestion, applied.
|
@tomviner could you please rebase/resolve conflicts on this branch? Thanks! |
tomviner
force-pushed
the
issue1553/diff-final-newline
branch
from
b13a046
to
608d393
Compare
tomviner
force-pushed
the
issue1553/diff-final-newline
branch
from
608d393
to
98adf20
Compare
|
@nicoddemus rebased :-) |
|
@tomviner this failed on Windows... if you like, you can sit near me and we can debug it from my laptop. |
|
@nicoddemus yes please. It maybe Windows line ending related. |
|
Actually it didn't even run because of some error in AppVeyor. Going to run it locally and see what happens. |
|
Done, 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.
Fix for #1553
By default Python's splitlines method splits so "a terminal line break does not result in an extra line". This means that comparing strings that differ only in whether they contain a terminal newline, results in a bad diff.
This PR sets splitlines'
keepends=True, which keeps all newlines when splitting.