mirror of
https://github.com/abhinav/git-spice.git
synced 2026-08-31 07:47:47 +02:00
Abhinav Gupta
ea0104ec08
CI / Lint (push) Has been cancelled
CI / Generate test matrix (push) Has been cancelled
CI / Test / ${{ matrix.name }} (push) Has been cancelled
CI / OK (push) Has been cancelled
GitHub Pages / deploy (push) Has been cancelled
GitHub Pages / build (push) Has been cancelled
autofix.ci / autofix (push) Has been cancelled
Add `spice.merge.readyCommand` so merge commands can delegate the ready-to-merge decision to a user command instead of relying only on forge readiness. The command runs before the merge request step, receives the same common and forge-specific environment as `spice.merge.command`, and reports ready, waiting, blocked, or command failure by exit status. Add `--fail-fast` to merge commands so users can stop a multi-branch merge queue on the first branch failure. Remove `--no-branch-check` from downstack and stack merge so stale-base validation always protects those merge flows. Refresh merge command help and guide documentation around branch selection, merge readiness, command environment, and failure behavior so the released merge feature describes the final command surface.
77 lines
1.9 KiB
Go
77 lines
1.9 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"slices"
|
|
|
|
"go.abhg.dev/gs/internal/cli"
|
|
"go.abhg.dev/gs/internal/git"
|
|
"go.abhg.dev/gs/internal/handler/merge"
|
|
"go.abhg.dev/gs/internal/spice/state"
|
|
"go.abhg.dev/gs/internal/text"
|
|
)
|
|
|
|
type stackMergeCmd struct {
|
|
merge.Options
|
|
|
|
Branches []string `name:"branch" placeholder:"NAME" help:"Branches whose stacks to merge. May be repeated." predictor:"trackedBranches"`
|
|
}
|
|
|
|
func (*stackMergeCmd) Help() string {
|
|
return text.Dedent(fmt.Sprintf(`
|
|
Merges CRs for the current branch's full stack into trunk.
|
|
Use --branch to merge a different branch's stack.
|
|
Use --branch multiple times to merge independent stacks.
|
|
A stack includes the selected branch,
|
|
its downstack branches down to trunk,
|
|
and every upstack branch.
|
|
|
|
For example, for the following stack:
|
|
|
|
┌── E
|
|
┌─┴ D
|
|
│ ┌── C
|
|
├─┴ B
|
|
┌─┴ A
|
|
trunk
|
|
|
|
The following commands have the following effects:
|
|
|
|
%[1]s stack merge --branch A # merge A, B, C, D, E
|
|
%[1]s stack merge --branch B # merge A, B, C
|
|
%[1]s stack merge --branch D # merge A, D, E
|
|
`, cli.Name())) + _mergeHelpCommon
|
|
}
|
|
|
|
func (cmd *stackMergeCmd) AfterApply(
|
|
ctx context.Context,
|
|
wt *git.Worktree,
|
|
) error {
|
|
if len(cmd.Branches) > 0 {
|
|
return nil
|
|
}
|
|
branch, err := wt.CurrentBranch(ctx)
|
|
if err != nil {
|
|
return fmt.Errorf("get current branch: %w", err)
|
|
}
|
|
cmd.Branches = []string{branch}
|
|
return nil
|
|
}
|
|
|
|
func (cmd *stackMergeCmd) Run(
|
|
ctx context.Context,
|
|
store *state.Store,
|
|
mergeHandler MergeHandler,
|
|
) error {
|
|
if slices.Contains(cmd.Branches, store.Trunk()) {
|
|
return errors.New("cannot merge trunk")
|
|
}
|
|
|
|
return mergeHandler.MergeStack(ctx, &merge.StackMergeRequest{
|
|
Branches: cmd.Branches,
|
|
Options: &cmd.Options,
|
|
})
|
|
}
|