mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-08 10:56:22 +02:00
99 lines
3.1 KiB
Go
99 lines
3.1 KiB
Go
package gui
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands"
|
|
)
|
|
|
|
func (gui *Gui) handleCreateRebaseOptionsMenu() error {
|
|
options := []string{"continue", "abort"}
|
|
|
|
if gui.GitCommand.WorkingTreeState() == commands.REBASE_MODE_REBASING {
|
|
options = append(options, "skip")
|
|
}
|
|
|
|
menuItems := make([]*menuItem, len(options))
|
|
for i, option := range options {
|
|
// note to self. Never, EVER, close over loop variables in a function
|
|
option := option
|
|
menuItems[i] = &menuItem{
|
|
displayString: option,
|
|
onPress: func() error {
|
|
return gui.genericMergeCommand(option)
|
|
},
|
|
}
|
|
}
|
|
|
|
var title string
|
|
if gui.GitCommand.WorkingTreeState() == commands.REBASE_MODE_MERGING {
|
|
title = gui.Tr.MergeOptionsTitle
|
|
} else {
|
|
title = gui.Tr.RebaseOptionsTitle
|
|
}
|
|
|
|
return gui.createMenu(title, menuItems, createMenuOptions{showCancel: true})
|
|
}
|
|
|
|
func (gui *Gui) genericMergeCommand(command string) error {
|
|
status := gui.GitCommand.WorkingTreeState()
|
|
|
|
if status != commands.REBASE_MODE_MERGING && status != commands.REBASE_MODE_REBASING {
|
|
return gui.createErrorPanel(gui.Tr.NotMergingOrRebasing)
|
|
}
|
|
|
|
gitCommand := gui.GitCommand.WithSpan(fmt.Sprintf("Merge/Rebase: %s", command))
|
|
|
|
commandType := strings.Replace(status, "ing", "e", 1)
|
|
// we should end up with a command like 'git merge --continue'
|
|
|
|
// it's impossible for a rebase to require a commit so we'll use a subprocess only if it's a merge
|
|
if status == commands.REBASE_MODE_MERGING && command != "abort" && gui.Config.GetUserConfig().Git.Merging.ManualCommit {
|
|
sub := gitCommand.OSCommand.PrepareSubProcess("git", commandType, fmt.Sprintf("--%s", command))
|
|
if sub != nil {
|
|
return gui.runSubprocessWithSuspenseAndRefresh(sub)
|
|
}
|
|
return nil
|
|
}
|
|
result := gitCommand.GenericMergeOrRebaseAction(commandType, command)
|
|
if err := gui.handleGenericMergeCommandResult(result); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (gui *Gui) handleGenericMergeCommandResult(result error) error {
|
|
if err := gui.refreshSidePanels(refreshOptions{mode: ASYNC}); err != nil {
|
|
return err
|
|
}
|
|
if result == nil {
|
|
return nil
|
|
} else if strings.Contains(result.Error(), "No changes - did you forget to use") {
|
|
return gui.genericMergeCommand("skip")
|
|
} else if strings.Contains(result.Error(), "The previous cherry-pick is now empty") {
|
|
return gui.genericMergeCommand("continue")
|
|
} else if strings.Contains(result.Error(), "No rebase in progress?") {
|
|
// assume in this case that we're already done
|
|
return nil
|
|
} else if strings.Contains(result.Error(), "When you have resolved this problem") || strings.Contains(result.Error(), "fix conflicts") || strings.Contains(result.Error(), "Resolve all conflicts manually") {
|
|
return gui.ask(askOpts{
|
|
title: gui.Tr.FoundConflictsTitle,
|
|
prompt: gui.Tr.FoundConflicts,
|
|
handlersManageFocus: true,
|
|
handleConfirm: func() error {
|
|
return gui.pushContext(gui.State.Contexts.Files)
|
|
},
|
|
handleClose: func() error {
|
|
if err := gui.returnFromContext(); err != nil {
|
|
return err
|
|
}
|
|
|
|
return gui.genericMergeCommand("abort")
|
|
},
|
|
})
|
|
} else {
|
|
return gui.createErrorPanel(result.Error())
|
|
}
|
|
}
|