Fix issues on repositories with non-Unicode encodings #4150
+35
−5
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 two issues, which prevents aider from using on repositories with single-byte encodings:
--llm-history-fileoption when non-Unicode encoding is set by--encoding. Before this fix any action in aider with this options results in following error:The symbol ⋮ (\u22ee) is used by aider to mark skipped lines in repo map. So to fix this bug I have made utf-8 encoding to be always used for
.aider.llm.historylog regardless of--encodingoption.The problem was arised from using wrong encoding settings in parsing of git diff command output: it use default encoding for filenames (which is
utf-8on most systems) instead of encoding set by--encodingoption, In addtion to wrong encoding, PythonGit also have usedsurrogateescapeerror handling mode which produce wrong Unicode surrogates, that cannot be converted to UTF-8 when sending to models.