Patch patch command #3714
Open
Patch patch command #3714
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
mirpedrol
reviewed
Aug 18, 2025
| ) | ||
| ) | ||
| files = list(files) | ||
| log.info(files) |
| choices=[ | ||
| questionary.Choice("Abort diff creation", "a"), | ||
| questionary.Choice("Ignore file", "i"), | ||
| questionary.Choice("Warn in diff", "w"), |
There was a problem hiding this comment.
I don't think we need to offer the option to warn, if we can't read the file, I would say either we abort and let the user remove it, or ignore the file.
Co-authored-by: Júlia Mir Pedrol <mirp.julia@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This PR addresses the issue raised in #3708. It does this by catching the
UnicodeDecodeErrorand prompting the user for an action. This way, the user can more easily see if the undecoded file should be there or not. The user then has the option to include the warning in the diff, if the file should be ignored or if the diff creation should be aborted altogether.To not prompt several times I've added an ignore list as an attribute to the
print_diffandwrite_difffunctions. This is updated when a an erronenous file is found. If passed to the next function (seepatch.py) the ignore list is used instead of prompting the user.A better solution is likely to convert the
ComponentsDifferclass from a static to a normal class. Then the ignore list, and other things could be attributes of the class instead.I've also updated the output from the
patchcommand which showed the diff several times. Now it prints a panel with all changes instead of printing some with the logger.PR checklist
CHANGELOG.mdis updateddocsis updated