diff: support --overlay flag on diff command #710
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
Polo2
reviewed
Jul 9, 2025
Member
Polo2
left a comment
There was a problem hiding this comment.
Thanks for this PR, and the clear details about both refacto and new feature.
I understand we can call bump diff command with overlays, but I'd need more context to understand how to use this new feature.
Would it be possible to mention this new feature in output of bump diff --help, maybe in readme, and add some tests?
e825e0f to
ee990f1
Compare
This commit is both a refactoring (to move the logic to apply overlays inside the `definition.extractDefinition` to DRY the code and simplify extracting an overlayed definition) and a new feature. The new feature is to allow the `--overlay` flag on the `bump diff` command to be able to apply a list of overlays to the files before creating the diff. The feature was asked by @JakeSCahill (thanks for asking it makes a lot of sense to have it for the diff command too)
ee990f1 to
60bdb1a
Compare
Member
Author
|
friendly ping @Polo2 |
Polo2
approved these changes
Jul 16, 2025
Member
Polo2
left a comment
There was a problem hiding this comment.
Many thanks for your patience, this new feature looks indeed a very good way to use overlay for diff purpose.
LGTM, thanks ✨
paulRbr
added a commit
to paulRbr/cli
that referenced
this pull request
Jul 22, 2025
This was overseen in bump-sh#710 where I applied overlays only on public diffs, and not on authenticated diffs 🤦 Sorry about that!
paulRbr
added a commit
to paulRbr/cli
that referenced
this pull request
Jul 22, 2025
This was overseen in bump-sh#710 where I applied overlays only on public diffs, and not on authenticated diffs 🤦 Sorry about that!
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 commit is both a refactoring (to move the logic to apply overlays
inside the
definition.extractDefinitionto DRY the code and simplifyextracting an overlayed definition) and a new feature.
The new feature is to allow the
--overlayflag on thebump diffcommand to be able to apply a list of overlays to the files before
creating the diff.
The feature was asked by @JakeSCahill (thanks for asking it makes a
lot of sense to have it for the diff command too)