-
Notifications
You must be signed in to change notification settings - Fork 276
adjust slurp output on update branches #5711
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.
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
Draft
mitchellwrosen
wants to merge
24
commits into
trunk
Choose a base branch
from
25-05-19-slurp
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
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
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.
Overview
Depends on #5710
This PR adjusts "slurp" output on update branches to look like this:
That is, it's a simple set of adds/deletes/updates relative to the parent branch (on which an
update
failed).There's not exactly a technical reason to have a slightly different slurp output format whilst on an update branch. However, the old slurp code is concerned with more things (reporting aliases, and tracking dependents of "partial updates" which we can't even do any longer), and so it was difficult to get this new functionality fully integrated into old slurp.
This functionality is only available when
ucm
is run with aUNISON_USE_UPDATE_V2
env var. I anticipate it might take a bit of time to work the kinks out and get an output format that everyone is happy with, so I thought this was a good way to get the bulk of the functionality merged early and allow us time to dogfood and bikeshed.