|
| 1 | +package main |
| 2 | + |
| 3 | +import ( |
| 4 | + "cmp" |
| 5 | + "context" |
| 6 | + "fmt" |
| 7 | + |
| 8 | + "go.abhg.dev/gs/internal/git" |
| 9 | + "go.abhg.dev/gs/internal/silog" |
| 10 | + "go.abhg.dev/gs/internal/sliceutil" |
| 11 | + "go.abhg.dev/gs/internal/spice" |
| 12 | + "go.abhg.dev/gs/internal/spice/state" |
| 13 | + "go.abhg.dev/gs/internal/text" |
| 14 | + "go.abhg.dev/gs/internal/ui" |
| 15 | + "go.abhg.dev/gs/internal/ui/widget" |
| 16 | +) |
| 17 | + |
| 18 | +type commitPickCmd struct { |
| 19 | + Commit string `arg:"" optional:"" help:"Commit to cherry-pick"` |
| 20 | + // TODO: Support multiple commits similarly to git cherry-pick. |
| 21 | + |
| 22 | + Edit bool `default:"false" negatable:"" config:"commitPick.edit" help:"Whether to open an editor to edit the commit message."` |
| 23 | + From string `placeholder:"NAME" predictor:"trackedBranches" help:"Branch whose upstack commits will be considered."` |
| 24 | +} |
| 25 | + |
| 26 | +func (*commitPickCmd) Help() string { |
| 27 | + return text.Dedent(` |
| 28 | + Apply the changes introduced by a commit to the current branch |
| 29 | + and restack the upstack branches. |
| 30 | +
|
| 31 | + If a commit is not specified, a prompt will allow picking |
| 32 | + from commits of upstack branches of the current branch. |
| 33 | + Use the --from option to pick a commit from a different branch |
| 34 | + or its upstack. |
| 35 | +
|
| 36 | + By default, commit messages for cherry-picked commits will be used verbatim. |
| 37 | + Supply --edit to open an editor and change the commit message, |
| 38 | + or set the spice.commitPick.edit configuration option to true |
| 39 | + to always open an editor for cherry picks. |
| 40 | + `) |
| 41 | +} |
| 42 | + |
| 43 | +func (cmd *commitPickCmd) Run( |
| 44 | + ctx context.Context, |
| 45 | + log *silog.Logger, |
| 46 | + view ui.View, |
| 47 | + repo *git.Repository, |
| 48 | + wt *git.Worktree, |
| 49 | + store *state.Store, |
| 50 | + svc *spice.Service, |
| 51 | +) (err error) { |
| 52 | + var commit git.Hash |
| 53 | + if cmd.Commit == "" { |
| 54 | + if !ui.Interactive(view) { |
| 55 | + return fmt.Errorf("no commit specified: %w", errNoPrompt) |
| 56 | + } |
| 57 | + |
| 58 | + commit, err = cmd.commitPrompt(ctx, log, view, repo, wt, store, svc) |
| 59 | + if err != nil { |
| 60 | + return fmt.Errorf("prompt for commit: %w", err) |
| 61 | + } |
| 62 | + } else { |
| 63 | + commit, err = repo.PeelToCommit(ctx, cmd.Commit) |
| 64 | + if err != nil { |
| 65 | + return fmt.Errorf("peel to commit: %w", err) |
| 66 | + } |
| 67 | + } |
| 68 | + |
| 69 | + log.Debugf("Cherry-picking: %v", commit) |
| 70 | + err = repo.CherryPick(ctx, git.CherryPickRequest{ |
| 71 | + Commits: []git.Hash{commit}, |
| 72 | + Edit: cmd.Edit, |
| 73 | + // If you selected an empty commit, |
| 74 | + // you probably want to retain that. |
| 75 | + // This still won't allow for no-op cherry-picks. |
| 76 | + AllowEmpty: true, |
| 77 | + }) |
| 78 | + if err != nil { |
| 79 | + return fmt.Errorf("cherry-pick: %w", err) |
| 80 | + } |
| 81 | + |
| 82 | + // TODO: cherry-pick the commit |
| 83 | + // TODO: handle --continue/--abort |
| 84 | + // TODO: upstack restack |
| 85 | + return nil |
| 86 | +} |
| 87 | + |
| 88 | +func (cmd *commitPickCmd) commitPrompt( |
| 89 | + ctx context.Context, |
| 90 | + log *silog.Logger, |
| 91 | + view ui.View, |
| 92 | + repo *git.Repository, |
| 93 | + wt *git.Worktree, |
| 94 | + store *state.Store, |
| 95 | + svc *spice.Service, |
| 96 | +) (git.Hash, error) { |
| 97 | + currentBranch, err := wt.CurrentBranch(ctx) |
| 98 | + if err != nil { |
| 99 | + // TODO: allow for cherry-pick onto non-branch HEAD. |
| 100 | + return "", fmt.Errorf("determine current branch: %w", err) |
| 101 | + } |
| 102 | + cmd.From = cmp.Or(cmd.From, currentBranch) |
| 103 | + |
| 104 | + upstack, err := svc.ListUpstack(ctx, cmd.From) |
| 105 | + if err != nil { |
| 106 | + return "", fmt.Errorf("list upstack branches: %w", err) |
| 107 | + } |
| 108 | + |
| 109 | + var totalCommits int |
| 110 | + branches := make([]widget.CommitPickBranch, 0, len(upstack)) |
| 111 | + shortToLongHash := make(map[git.Hash]git.Hash) |
| 112 | + for _, name := range upstack { |
| 113 | + if name == store.Trunk() { |
| 114 | + continue |
| 115 | + } |
| 116 | + |
| 117 | + // TODO: build commit list for each branch concurrently |
| 118 | + b, err := svc.LookupBranch(ctx, name) |
| 119 | + if err != nil { |
| 120 | + log.Warn("Could not look up branch. Skipping.", |
| 121 | + "branch", name, "error", err) |
| 122 | + continue |
| 123 | + } |
| 124 | + |
| 125 | + // If doing a --from=$other, |
| 126 | + // where $other is downstack from current, |
| 127 | + // we don't want to list commits for current branch, |
| 128 | + // so add an empty entry for it. |
| 129 | + if name == currentBranch { |
| 130 | + // Don't list the current branch's commits. |
| 131 | + branches = append(branches, widget.CommitPickBranch{ |
| 132 | + Branch: name, |
| 133 | + Base: b.Base, |
| 134 | + }) |
| 135 | + continue |
| 136 | + } |
| 137 | + |
| 138 | + commits, err := sliceutil.CollectErr(repo.ListCommitsDetails(ctx, |
| 139 | + git.CommitRangeFrom(b.Head). |
| 140 | + ExcludeFrom(b.BaseHash). |
| 141 | + FirstParent())) |
| 142 | + if err != nil { |
| 143 | + log.Warn("Could not list commits for branch. Skipping.", |
| 144 | + "branch", name, "error", err) |
| 145 | + continue |
| 146 | + } |
| 147 | + |
| 148 | + commitSummaries := make([]widget.CommitSummary, len(commits)) |
| 149 | + for i, c := range commits { |
| 150 | + commitSummaries[i] = widget.CommitSummary{ |
| 151 | + ShortHash: c.ShortHash, |
| 152 | + Subject: c.Subject, |
| 153 | + AuthorDate: c.AuthorDate, |
| 154 | + } |
| 155 | + shortToLongHash[c.ShortHash] = c.Hash |
| 156 | + } |
| 157 | + |
| 158 | + branches = append(branches, widget.CommitPickBranch{ |
| 159 | + Branch: name, |
| 160 | + Base: b.Base, |
| 161 | + Commits: commitSummaries, |
| 162 | + }) |
| 163 | + totalCommits += len(commitSummaries) |
| 164 | + } |
| 165 | + |
| 166 | + if totalCommits == 0 { |
| 167 | + log.Warn("Please provide a commit hash to cherry pick from.") |
| 168 | + return "", fmt.Errorf("upstack of %v does not have any commits to cherry-pick", cmd.From) |
| 169 | + } |
| 170 | + |
| 171 | + msg := fmt.Sprintf("Selected commit will be cherry-picked into %v", currentBranch) |
| 172 | + var selected git.Hash |
| 173 | + prompt := widget.NewCommitPick(). |
| 174 | + WithTitle("Pick a commit"). |
| 175 | + WithDescription(msg). |
| 176 | + WithBranches(branches...). |
| 177 | + WithValue(&selected) |
| 178 | + if err := ui.Run(view, prompt); err != nil { |
| 179 | + return "", err |
| 180 | + } |
| 181 | + |
| 182 | + if long, ok := shortToLongHash[selected]; ok { |
| 183 | + // This will always be true but it doesn't hurt |
| 184 | + // to be defensive here. |
| 185 | + selected = long |
| 186 | + } |
| 187 | + return selected, nil |
| 188 | +} |
0 commit comments