cmd-diff: extract files instead of using FUSE #4360
Merged
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
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the cmd-diff command to extract files from metal images using guestfs and tar instead of a FUSE mount. This is a great simplification that removes complexity and potential fragility associated with multiprocessing and FUSE. The introduction of filename normalization for hashes is also a valuable improvement for generating more meaningful diffs. The overall changes are positive, but I have a couple of suggestions to enhance the robustness of the new implementation.
Member
|
Thank you for picking that up Dusty ! I'll give it a try today but the change LGTM |
In the case of `cosa diff --gc` there will be no active differs so let's just move the gc code earlier and conditionalize on active_differs being non-empty for the rest of it.
This approach use more disk space but disk access for the diff will be faster. Files will also survive under after git diff returns in case manual inspection is desired. Co-authored-by: Jean-Baptiste Trystram <[email protected]>
The diffs contain a bunch of files with sha256 checksums in them, which are unique on every build. Let's attempt to normalize the output directories so the diffs will me less noisy and more meaningful. Also fixup some permissions on some files because they can't be diffed otherwise.
dustymabe
force-pushed
the
dusty-diff-update
branch
from
0889423 to
34a255d
Compare
Member
Author
|
Fixed the lints here. |
jbtrystram
approved these changes
Nov 7, 2025
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.
And also try to normalize the output to make the diffs more meaningful.
See individual commit messages.
This obsoletes #4333 (thanks @jbtrystram)