Write patches as UTF-8 with LF line endings - #125
Merged
Conversation
Patch files were written with Path.write_text() without an explicit encoding or newline. On Windows this used the locale encoding (cp1252), raising UnicodeEncodeError on non-cp1252 content, and translated LF to CRLF. CRLF corrupts the base85 payloads emitted by --binary diffs and can break 'git apply' on the re-saved trash copies of discarded patches. Pin encoding='utf-8' and newline='\n' at the three patch write sites (export, partial-lines export, and trash backup).
Owner
|
Nice, Windows compat is still very unofficial/WIP so I never caught this. This should tide us over until Python 3.15 / PEP 686 😄 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Problem
Patch files are written with
Path.write_text(...)without an explicitencodingornewline:cp1252on Windows), so exporting any patch containing non-cp1252 characters raisesUnicodeEncodeErrorinside the worker thread and the export fails.\n→\r\non Windows.GitDriver.buildDiffCommandalways passes--binary, and CRLF corrupts the base85 binary payloads; it can also breakgit applyon the re-saved trash copies of discarded patches.Fix
Pin
encoding="utf-8", newline="\n"at the three patch write sites:tasks/exporttasks.py(savePatch)diffview/diffview.py(exportPatch— partial-line export)trash.py(backupPatch— trash backup of discarded patches)Prepared with Claude Fable 5 (Low effort mode).