fix(apply-patch): preserve CRLF line endings on Windows #7515
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
… files (Fixes #4003) - Detect CRLF in original file, strip trailing \r for matching, and re-emit using original EOL style - Add test to ensure updated files retain CRLF endings and avoid mixed EOLs
…d unintended newline conversion\n\n- Count total vs CRLF pairs and treat as CRLF only if every newline is CRLF\n- Prevents converting LF-formatted files that contain embedded in literals
dylan-hurd-oai
changed the title
bolinfest
reviewed
Dec 4, 2025
| } | ||
|
|
||
| /// Detects whether the source file uses Windows CRLF line endings consistently. | ||
| /// We only consider a file CRLF-formatted if every newline is part of a |
Collaborator
There was a problem hiding this comment.
This seems strict, though admittedly, I'm not sure if there's a better way...
Collaborator
Author
There was a problem hiding this comment.
I think we could potentially relax this constraint, but for now I'd prefer to keep this strict.
This was referenced Dec 4, 2025
bolinfest
approved these changes
Dec 5, 2025
|
|
||
| // TODO(dylan-hurd-oai): I think we can migrate to just use `contents.lines()` | ||
| // across all platforms. | ||
| fn build_lines_from_contents(contents: &str) -> Vec<String> { |
Collaborator
There was a problem hiding this comment.
It's not a huge deal, but it would be nice to do the work in contents_uses_crlf() as part of this so that we do the splitting and \r\n check in one forward pass of the file.
Collaborator
Author
There was a problem hiding this comment.
Single forward pass would be ideal, agreed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Summary
This PR is heavily based on #4017, which contains the core logic for the fix. To reduce the risk, we are first introducing it only on windows. We can then expand to wsl / other environments as needed, and then tackle net new files.
Testing