mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-25 13:42:30 +03:00
05b3ae9524
Previously we would create new Commit objects to store in the CherryPicking mode which only contained a name and hash, all other fields were unset. I'm not sure why we did this; it's easier to just reference the original commits. Later on this branch we will need this because we need to determine whether a copied commit was a merge commit (by looking at its Parents field).
66 lines
1.8 KiB
Go
66 lines
1.8 KiB
Go
package cherrypicking
|
|
|
|
import (
|
|
"github.com/jesseduffield/generics/set"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
type CherryPicking struct {
|
|
CherryPickedCommits []*models.Commit
|
|
|
|
// we only allow cherry picking from one context at a time, so you can't copy a commit from
|
|
// the local commits context and then also copy a commit in the reflog context
|
|
ContextKey string
|
|
|
|
// keep track of whether the currently copied commits have been pasted already. If so, we hide
|
|
// the mode and the blue display of the commits, but we still allow pasting them again.
|
|
DidPaste bool
|
|
}
|
|
|
|
func New() *CherryPicking {
|
|
return &CherryPicking{
|
|
CherryPickedCommits: make([]*models.Commit, 0),
|
|
ContextKey: "",
|
|
}
|
|
}
|
|
|
|
func (self *CherryPicking) Active() bool {
|
|
return self.CanPaste() && !self.DidPaste
|
|
}
|
|
|
|
func (self *CherryPicking) CanPaste() bool {
|
|
return len(self.CherryPickedCommits) > 0
|
|
}
|
|
|
|
func (self *CherryPicking) SelectedHashSet() *set.Set[string] {
|
|
if self.DidPaste {
|
|
return set.New[string]()
|
|
}
|
|
|
|
hashes := lo.Map(self.CherryPickedCommits, func(commit *models.Commit, _ int) string {
|
|
return commit.Hash
|
|
})
|
|
return set.NewFromSlice(hashes)
|
|
}
|
|
|
|
func (self *CherryPicking) Add(selectedCommit *models.Commit, commitsList []*models.Commit) {
|
|
commitSet := self.SelectedHashSet()
|
|
commitSet.Add(selectedCommit.Hash)
|
|
|
|
self.update(commitSet, commitsList)
|
|
}
|
|
|
|
func (self *CherryPicking) Remove(selectedCommit *models.Commit, commitsList []*models.Commit) {
|
|
commitSet := self.SelectedHashSet()
|
|
commitSet.Remove(selectedCommit.Hash)
|
|
|
|
self.update(commitSet, commitsList)
|
|
}
|
|
|
|
func (self *CherryPicking) update(selectedHashSet *set.Set[string], commitsList []*models.Commit) {
|
|
self.CherryPickedCommits = lo.Filter(commitsList, func(commit *models.Commit, _ int) bool {
|
|
return selectedHashSet.Includes(commit.Hash)
|
|
})
|
|
}
|