fix: Normalize whitespace when comparing patch context lines #6541
+90
−6
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.
This PR fixes an issue where patches fail to apply due to whitespace mismatches in context lines.
Related to #6140
Problem:
Solution:
Added tests:
test_patch_whitespace_mismatch
: Verifies that patches apply successfully even with whitespace mismatchestest_patch_whitespace_match
: Verifies that patches still work with matching whitespaceExample of a patch that now works:
This patch previously failed because the indentation used 4 spaces while the source file used 8 spaces. With this fix, the patch now applies successfully.
To run this PR locally, use the following command: