restack: Add Options parameter to high-level restack entry points#1307
Open
ed-irl wants to merge 1 commit into
Open
restack: Add Options parameter to high-level restack entry points#1307ed-irl wants to merge 1 commit into
ed-irl wants to merge 1 commit into
Conversation
Introduces restack.Options{AutoResolve} and threads an opts *Options
parameter through the high-level restack entry points (RestackBranch,
RestackStack, RestackDownstack) and the merge/sync RestackHandler
interfaces, with all current callers passing nil.
This is foundational plumbing for the restack auto-resolve feature.
Landing it on a branch below the consuming stacks lets every branch
inherit the 3-arg signature, rather than the signature change living
on a branch parallel to its callers.
Collaborator
Author
|
This change is part of the following stack: Change managed by git-spice. |
This was referenced Jun 24, 2026
Draft
Draft
Open
Open
Open
Draft
This was referenced Jun 24, 2026
Owner
|
extracted just the options plumbing into #1332, moving Options into Request structs. the pattern we've been using with handler options is that they define CLI flags and configs, and the outer request object defines the general runtime parameters. |
abhinav
added a commit
that referenced
this pull request
Jul 2, 2026
Extracted from #1307 Restack handler entry points now receive operation request structs instead of loose branch and options parameters. The request structs carry optional Options fields, matching the handler request pattern used by the surrounding handler packages. UpstackOptions embeds the shared Options type while keeping SkipStart as the only active option. AutoResolve is intentionally not part of this commit.
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
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.
RestackBranch,RestackStack, andRestackDownstacknow take an*restack.Optionsargument, exposing a per-invocationAutoResolve *booloverride that is threaded through toRequest.AutoResolve. A nilOptions(or nilAutoResolve) preserves the existing default behavior.All callers in the merge, sync, and CLI restack commands pass nil for now; the
RestackHandlerinterfaces and generated mocks are updated to match the new signatures.