cmd-diff: support lightweight ostree import for RPM diff #4030
+80
−24
Conversation
This file contains 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
Since python has propoer boolean types we should be using that here.
Being able to diff two builds is now a very lightweight: ``` cosa buildfetch --build=A cosa buildfetch --build=B cosa diff --rpms --from=A --to=B ``` Previously this was hundreds of MiB and now it's in the KiB range.
dustymabe
force-pushed
the
dusty-cmd-diff
branch
from
a9af6c8 to
6b0a237
Compare
``` DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC). ```
I think it's of limited use that we arbitrarily hit some threshold and then are urged to write more tests by a percentage metric here. Let's just drop it.
dustymabe
force-pushed
the
dusty-cmd-diff
branch
from
6b0a237 to
1af3949
Compare
|
If you want to see these commands in action you can check out the few comments starting at containers/podman#25121 (comment) |
Useful for trying to determine the changes that occured for two builds that were outside of RPM changes. Example: ``` $ cosa diff --source-control --from=42.20240919.91.0 --to=42.20240920.91.0 https://github.com/coreos/fedora-coreos-config: 80f646d..051fb67 --> coreos/fedora-coreos-config@80f646d...051fb67 https://github.com/coreos/coreos-assembler.git: d3302e0..d3302e0 --> coreos/coreos-assembler@d3302e0...d3302e0 ```
dustymabe
force-pushed
the
dusty-cmd-diff
branch
from
1af3949 to
fe5fba7
Compare
jlebon
reviewed
Feb 27, 2025
| @@ -31,7 +31,7 @@ class DiffBuildTarget: | |||
| class Differ: | |||
| name: str | |||
| description: str | |||
| needs_ostree: bool | |||
| needs_ostree: str | |||
There was a problem hiding this comment.
This would be cleaner as an enum.
Comment on lines
+79
to
+88
| ostree_import = '' | ||
| for differ in active_differs: | ||
| if differ.needs_ostree == 'yes': | ||
| ostree_import = 'full' | ||
| # If we need a full import for one then we don't | ||
| # need to check the others. | ||
| break | ||
| elif differ.needs_ostree == 'partial': | ||
| ostree_import = 'partial' | ||
| if ostree_import != '': |
There was a problem hiding this comment.
If we change it to an enum as suggested in the previous comment, then this could be e.g.
ostree_import = max([d.needs_ostree for d in active_differs])
if ostree_import > OstreeImport.NONE:
...
..., partial_import=(ostree_import == OstreeImport.PARTIAL))
| if not config_shared_history: | ||
| # If they weren't from the same repo/branch, etc then | ||
| # there's not really any way to compare them easily | ||
| # so just output the details gorry details and move on. |
There was a problem hiding this comment.
details twice
also s/gorry/gory/
| @@ -114,6 +114,30 @@ def parse_args(): | |||
| return parser.parse_args() | |||
|
|
|||
|
|
|||
| def diff_source_control(diff_from, diff_to): | |||
There was a problem hiding this comment.
This is fine and clearly useful as is, but assuming that it's on GitHub seems like a leap for the developer case, no? It seems like it'd be cleaner to just do the git diff ourselves given that we have src/config.
I guess for the cosa case, the GitHub link is the best we can do.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Being able to diff two builds is now a very lightweight:
Previously this was hundreds of MiB and now it's in the KiB range.
EDIT: Added another commit:
cmd-diff: support showing source-control diffs for two builds
Useful for trying to determine the changes that occured for two builds
that were outside of RPM changes. Example: