Skip to content

cmd-diff: a few misc enhancements #4253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Sep 26, 2025
Merged

cmd-diff: a few misc enhancements #4253

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c51cd19
cmd-diff: refactor diff_cmd_output into a loop
dustymabe Aug 12, 2025
539ed6a
cmd-diff: rename vars in diff_cmd_outputs
dustymabe Aug 12, 2025
0119659
cmd-diff: support `cd` strategy for diff_cmd_outputs
dustymabe Aug 12, 2025
0a2cf58
cmd-diff: support `git difftool` so we can utilize vimdiff
dustymabe Aug 12, 2025
e81f65d
cmd-diff: refactor metal mounting code into helper
dustymabe Aug 12, 2025
80cb283
cmd-diff: support --metal-du and --metal-ls
dustymabe Aug 12, 2025
3042eb1
cmd-diff: fix superfluous .stdout call
dustymabe Aug 12, 2025
b8687f9
cmd-diff: default --from to N-1 build
dustymabe Sep 18, 2025
d2fddd4
cmd-diff: support --rpms-json for outputting JSON
dustymabe Sep 18, 2025
86d8d31
cosalib/builds: add get_build_commitmeta()
dustymabe Sep 25, 2025
a8441e6
cmd-diff: make rpm diff function names more specific
dustymabe Sep 25, 2025
0adf9fe
cmd-diff: Add new ability to generate rpm diffs from commitmeta.json
dustymabe Sep 25, 2025
5ba9aac
cmd-diff: promote commitmeta.json version of rpm diff
dustymabe Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cmd-diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def main():
args.diff_from = builds.get_previous()
args.diff_to = latest_build
elif args.diff_from is None:
args.diff_from = latest_build
args.diff_from = builds.get_previous()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, what were you trying to do that surprised you and motivated this?

E.g. if I do cosa diff --to=$build I expect the from to be the latest build. This matches git diff semantics. Having it actually diff against the previous build is confusing.

Copy link
Member Author

@dustymabe dustymabe Sep 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the last commit in #4327

Basically I wanted to be able to not have to specify the previous build in cmd-build-with-buildah and have cosa diff detect that for me.

It also enables things like being able to run cosa diff --rpms without having to specify a --to and a --from at all, like rpm-ostree db diff does if you don't provide commits to it.

Maybe the behavior should be "if to is latest_build then from will default to previous_build, otherwise default to latest_build".

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It also enables things like being able to run cosa diff --rpms without having to specify a --to and a --from at all, like rpm-ostree db diff does if you don't provide commits to it.

Hmm, that's already the case today, no?

ISTM like in the last commit of #4327, we can just not pass in --to or --from at all in the default case. If there's a parent build, just passing --from should do the right thing.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, that's already the case today, no?

You are right. My mistake. I didn't see the opportunity to not pass in the --to there.

Reverted in #4327

elif args.diff_to is None:
args.diff_to = latest_build

Expand Down