mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-04 10:34:55 +02:00
197 lines
5.1 KiB
Go
197 lines
5.1 KiB
Go
package gui
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/commands"
|
|
)
|
|
|
|
// you can only copy from one context at a time, because the order and position of commits matter
|
|
|
|
func (gui *Gui) resetCherryPickingIfNecessary(context Context) error {
|
|
oldContextKey := gui.State.Modes.CherryPicking.ContextKey
|
|
|
|
if oldContextKey != context.GetKey() {
|
|
// need to reset the cherry picking mode
|
|
gui.State.Modes.CherryPicking.ContextKey = context.GetKey()
|
|
gui.State.Modes.CherryPicking.CherryPickedCommits = make([]*commands.Commit, 0)
|
|
|
|
return gui.rerenderContextViewIfPresent(oldContextKey)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (gui *Gui) handleCopyCommit() error {
|
|
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
|
|
return err
|
|
}
|
|
|
|
// get currently selected commit, add the sha to state.
|
|
context := gui.currentSideContext()
|
|
if context == nil {
|
|
return nil
|
|
}
|
|
|
|
if err := gui.resetCherryPickingIfNecessary(context); err != nil {
|
|
return err
|
|
}
|
|
|
|
item, ok := context.SelectedItem()
|
|
if !ok {
|
|
return nil
|
|
}
|
|
commit, ok := item.(*commands.Commit)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
|
|
// we will un-copy it if it's already copied
|
|
for index, cherryPickedCommit := range gui.State.Modes.CherryPicking.CherryPickedCommits {
|
|
if commit.Sha == cherryPickedCommit.Sha {
|
|
gui.State.Modes.CherryPicking.CherryPickedCommits = append(gui.State.Modes.CherryPicking.CherryPickedCommits[0:index], gui.State.Modes.CherryPicking.CherryPickedCommits[index+1:]...)
|
|
return context.HandleRender()
|
|
}
|
|
}
|
|
|
|
gui.addCommitToCherryPickedCommits(context.GetPanelState().GetSelectedLineIdx())
|
|
return context.HandleRender()
|
|
}
|
|
|
|
func (gui *Gui) cherryPickedCommitShaMap() map[string]bool {
|
|
commitShaMap := map[string]bool{}
|
|
for _, commit := range gui.State.Modes.CherryPicking.CherryPickedCommits {
|
|
commitShaMap[commit.Sha] = true
|
|
}
|
|
return commitShaMap
|
|
}
|
|
|
|
func (gui *Gui) commitsListForContext() []*commands.Commit {
|
|
context := gui.currentSideContext()
|
|
if context == nil {
|
|
return nil
|
|
}
|
|
|
|
// using a switch statement, but we should use polymorphism
|
|
switch context.GetKey() {
|
|
case BRANCH_COMMITS_CONTEXT_KEY:
|
|
return gui.State.Commits
|
|
case REFLOG_COMMITS_CONTEXT_KEY:
|
|
return gui.State.FilteredReflogCommits
|
|
case SUB_COMMITS_CONTEXT_KEY:
|
|
return gui.State.SubCommits
|
|
default:
|
|
gui.Log.Errorf("no commit list for context %s", context.GetKey())
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func (gui *Gui) addCommitToCherryPickedCommits(index int) {
|
|
commitShaMap := gui.cherryPickedCommitShaMap()
|
|
commitsList := gui.commitsListForContext()
|
|
commitShaMap[commitsList[index].Sha] = true
|
|
|
|
newCommits := []*commands.Commit{}
|
|
for _, commit := range commitsList {
|
|
if commitShaMap[commit.Sha] {
|
|
// duplicating just the things we need to put in the rebase TODO list
|
|
newCommits = append(newCommits, &commands.Commit{Name: commit.Name, Sha: commit.Sha})
|
|
}
|
|
}
|
|
|
|
gui.State.Modes.CherryPicking.CherryPickedCommits = newCommits
|
|
}
|
|
|
|
func (gui *Gui) handleCopyCommitRange() error {
|
|
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
|
|
return err
|
|
}
|
|
|
|
// get currently selected commit, add the sha to state.
|
|
context := gui.currentSideContext()
|
|
if context == nil {
|
|
return nil
|
|
}
|
|
|
|
if err := gui.resetCherryPickingIfNecessary(context); err != nil {
|
|
return err
|
|
}
|
|
|
|
commitShaMap := gui.cherryPickedCommitShaMap()
|
|
commitsList := gui.commitsListForContext()
|
|
selectedLineIdx := context.GetPanelState().GetSelectedLineIdx()
|
|
|
|
if selectedLineIdx > len(commitsList)-1 {
|
|
return nil
|
|
}
|
|
|
|
// 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:selectedLineIdx] {
|
|
if commitShaMap[commit.Sha] {
|
|
startIndex = index
|
|
}
|
|
}
|
|
|
|
for index := startIndex; index <= selectedLineIdx; index++ {
|
|
gui.addCommitToCherryPickedCommits(index)
|
|
}
|
|
|
|
return context.HandleRender()
|
|
}
|
|
|
|
// HandlePasteCommits begins a cherry-pick rebase with the commits the user has copied
|
|
func (gui *Gui) HandlePasteCommits() error {
|
|
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
|
|
return err
|
|
}
|
|
|
|
return gui.ask(askOpts{
|
|
title: gui.Tr.SLocalize("CherryPick"),
|
|
prompt: gui.Tr.SLocalize("SureCherryPick"),
|
|
handleConfirm: func() error {
|
|
return gui.WithWaitingStatus(gui.Tr.SLocalize("CherryPickingStatus"), func() error {
|
|
err := gui.GitCommand.CherryPickCommits(gui.State.Modes.CherryPicking.CherryPickedCommits)
|
|
return gui.handleGenericMergeCommandResult(err)
|
|
})
|
|
},
|
|
})
|
|
}
|
|
|
|
func (gui *Gui) exitCherryPickingMode() error {
|
|
contextKey := gui.State.Modes.CherryPicking.ContextKey
|
|
|
|
gui.State.Modes.CherryPicking.ContextKey = ""
|
|
gui.State.Modes.CherryPicking.CherryPickedCommits = nil
|
|
|
|
if contextKey == "" {
|
|
gui.Log.Warn("context key blank when trying to exit cherry picking mode")
|
|
return nil
|
|
}
|
|
|
|
return gui.rerenderContextViewIfPresent(contextKey)
|
|
}
|
|
|
|
func (gui *Gui) rerenderContextViewIfPresent(contextKey string) error {
|
|
if contextKey == "" {
|
|
return nil
|
|
}
|
|
|
|
context := gui.contextForContextKey(contextKey)
|
|
|
|
viewName := context.GetViewName()
|
|
|
|
view, err := gui.g.View(viewName)
|
|
if err != nil {
|
|
gui.Log.Error(err)
|
|
return nil
|
|
}
|
|
|
|
if view.Context == contextKey {
|
|
if err := context.HandleRender(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|