1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-24 05:36:19 +02:00
lazygit/pkg/gui/controllers/helpers/cherry_pick_helper.go

156 lines
4.5 KiB
Go
Raw Normal View History

2022-02-06 15:54:26 +11:00
package helpers
2022-01-30 20:03:08 +11:00
import (
2022-03-19 12:26:30 +11:00
"github.com/jesseduffield/generics/set"
2022-03-19 15:36:46 +11:00
"github.com/jesseduffield/generics/slices"
2022-01-30 20:03:08 +11:00
"github.com/jesseduffield/lazygit/pkg/commands"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/gui/context"
"github.com/jesseduffield/lazygit/pkg/gui/modes/cherrypicking"
"github.com/jesseduffield/lazygit/pkg/gui/types"
)
type CherryPickHelper struct {
2022-02-06 15:54:26 +11:00
c *types.HelperCommon
2022-01-30 20:03:08 +11:00
git *commands.GitCommand
2022-01-31 22:20:28 +11:00
contexts *context.ContextTree
getData func() *cherrypicking.CherryPicking
2022-01-30 20:03:08 +11:00
2022-02-06 15:54:26 +11:00
rebaseHelper *MergeAndRebaseHelper
2022-01-30 20:03:08 +11:00
}
// I'm using the analogy of copy+paste in the terminology here because it's intuitively what's going on,
// even if in truth we're running git cherry-pick
func NewCherryPickHelper(
2022-02-06 15:54:26 +11:00
c *types.HelperCommon,
2022-01-30 20:03:08 +11:00
git *commands.GitCommand,
2022-01-31 22:20:28 +11:00
contexts *context.ContextTree,
2022-01-30 20:03:08 +11:00
getData func() *cherrypicking.CherryPicking,
2022-02-06 15:54:26 +11:00
rebaseHelper *MergeAndRebaseHelper,
2022-01-30 20:03:08 +11:00
) *CherryPickHelper {
return &CherryPickHelper{
c: c,
git: git,
2022-01-31 22:20:28 +11:00
contexts: contexts,
2022-01-30 20:03:08 +11:00
getData: getData,
rebaseHelper: rebaseHelper,
}
}
func (self *CherryPickHelper) Copy(commit *models.Commit, commitsList []*models.Commit, context types.Context) error {
if err := self.resetIfNecessary(context); err != nil {
return err
}
// we will un-copy it if it's already copied
for index, cherryPickedCommit := range self.getData().CherryPickedCommits {
if commit.Sha == cherryPickedCommit.Sha {
self.getData().CherryPickedCommits = append(
self.getData().CherryPickedCommits[0:index],
self.getData().CherryPickedCommits[index+1:]...,
)
return self.rerender()
}
}
self.add(commit, commitsList)
return self.rerender()
}
func (self *CherryPickHelper) CopyRange(selectedIndex int, commitsList []*models.Commit, context types.Context) error {
if err := self.resetIfNecessary(context); err != nil {
return err
}
2022-03-19 12:26:30 +11:00
commitSet := self.CherryPickedCommitShaSet()
2022-01-30 20:03:08 +11:00
// find the last commit that is copied that's above our position
// if there are none, startIndex = 0
startIndex := 0
for index, commit := range commitsList[0:selectedIndex] {
2022-03-19 12:26:30 +11:00
if commitSet.Includes(commit.Sha) {
2022-01-30 20:03:08 +11:00
startIndex = index
}
}
for index := startIndex; index <= selectedIndex; index++ {
commit := commitsList[index]
self.add(commit, commitsList)
}
return self.rerender()
}
// HandlePasteCommits begins a cherry-pick rebase with the commits the user has copied.
// Only to be called from the branch commits controller
func (self *CherryPickHelper) Paste() error {
return self.c.Confirm(types.ConfirmOpts{
2022-01-30 20:03:08 +11:00
Title: self.c.Tr.CherryPick,
Prompt: self.c.Tr.SureCherryPick,
HandleConfirm: func() error {
return self.c.WithWaitingStatus(self.c.Tr.CherryPickingStatus, func() error {
self.c.LogAction(self.c.Tr.Actions.CherryPick)
err := self.git.Rebase.CherryPickCommits(self.getData().CherryPickedCommits)
return self.rebaseHelper.CheckMergeOrRebase(err)
})
},
})
}
func (self *CherryPickHelper) Reset() error {
self.getData().ContextKey = ""
self.getData().CherryPickedCommits = nil
return self.rerender()
}
2022-03-19 12:26:30 +11:00
func (self *CherryPickHelper) CherryPickedCommitShaSet() *set.Set[string] {
shas := slices.Map(self.getData().CherryPickedCommits, func(commit *models.Commit) string {
2022-03-19 12:26:30 +11:00
return commit.Sha
})
return set.NewFromSlice(shas)
2022-01-30 20:03:08 +11:00
}
func (self *CherryPickHelper) add(selectedCommit *models.Commit, commitsList []*models.Commit) {
2022-03-19 12:26:30 +11:00
commitSet := self.CherryPickedCommitShaSet()
commitSet.Add(selectedCommit.Sha)
2022-03-20 09:24:39 +11:00
cherryPickedCommits := slices.Filter(commitsList, func(commit *models.Commit) bool {
return commitSet.Includes(commit.Sha)
})
2022-01-30 20:03:08 +11:00
2022-03-20 09:24:39 +11:00
self.getData().CherryPickedCommits = slices.Map(cherryPickedCommits, func(commit *models.Commit) *models.Commit {
return &models.Commit{Name: commit.Name, Sha: commit.Sha}
})
2022-01-30 20:03:08 +11:00
}
// you can only copy from one context at a time, because the order and position of commits matter
func (self *CherryPickHelper) resetIfNecessary(context types.Context) error {
oldContextKey := types.ContextKey(self.getData().ContextKey)
if oldContextKey != context.GetKey() {
// need to reset the cherry picking mode
self.getData().ContextKey = string(context.GetKey())
self.getData().CherryPickedCommits = make([]*models.Commit, 0)
}
return nil
}
func (self *CherryPickHelper) rerender() error {
for _, context := range []types.Context{
2022-02-13 17:01:53 +11:00
self.contexts.LocalCommits,
2022-01-31 22:20:28 +11:00
self.contexts.ReflogCommits,
self.contexts.SubCommits,
2022-01-30 20:03:08 +11:00
} {
if err := self.c.PostRefreshUpdate(context); err != nil {
return err
}
}
return nil
}