mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-12 11:15:00 +02:00
1dd7307fde
more and more move rebase commit refreshing into existing abstraction and more and more WIP and more handling clicks properly fix merge conflicts update cheatsheet lots more preparation to start moving things into controllers WIP better typing expand on remotes controller moving more code into controllers
295 lines
8.0 KiB
Go
295 lines
8.0 KiB
Go
package gui
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/patch"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/controllers"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/filetree"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/popup"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
)
|
|
|
|
func (gui *Gui) getSelectedCommitFileNode() *filetree.CommitFileNode {
|
|
selectedLine := gui.State.Panels.CommitFiles.SelectedLineIdx
|
|
if selectedLine == -1 || selectedLine > gui.State.CommitFileTreeViewModel.GetItemsLength()-1 {
|
|
return nil
|
|
}
|
|
|
|
return gui.State.CommitFileTreeViewModel.GetItemAtIndex(selectedLine)
|
|
}
|
|
|
|
func (gui *Gui) getSelectedCommitFile() *models.CommitFile {
|
|
node := gui.getSelectedCommitFileNode()
|
|
if node == nil {
|
|
return nil
|
|
}
|
|
return node.File
|
|
}
|
|
|
|
func (gui *Gui) getSelectedCommitFilePath() string {
|
|
node := gui.getSelectedCommitFileNode()
|
|
if node == nil {
|
|
return ""
|
|
}
|
|
return node.GetPath()
|
|
}
|
|
|
|
func (gui *Gui) onCommitFileFocus() error {
|
|
gui.escapeLineByLinePanel()
|
|
return nil
|
|
}
|
|
|
|
func (gui *Gui) commitFilesRenderToMain() error {
|
|
node := gui.getSelectedCommitFileNode()
|
|
if node == nil {
|
|
return nil
|
|
}
|
|
|
|
to := gui.State.CommitFileTreeViewModel.GetParent()
|
|
from, reverse := gui.getFromAndReverseArgsForDiff(to)
|
|
|
|
cmdObj := gui.git.WorkingTree.ShowFileDiffCmdObj(from, to, reverse, node.GetPath(), false)
|
|
task := NewRunPtyTask(cmdObj.GetCmd())
|
|
|
|
return gui.refreshMainViews(refreshMainOpts{
|
|
main: &viewUpdateOpts{
|
|
title: "Patch",
|
|
task: task,
|
|
},
|
|
secondary: gui.secondaryPatchPanelUpdateOpts(),
|
|
})
|
|
}
|
|
|
|
func (gui *Gui) handleCheckoutCommitFile() error {
|
|
node := gui.getSelectedCommitFileNode()
|
|
if node == nil {
|
|
return nil
|
|
}
|
|
|
|
gui.c.LogAction(gui.c.Tr.Actions.CheckoutFile)
|
|
if err := gui.git.WorkingTree.CheckoutFile(gui.State.CommitFileTreeViewModel.GetParent(), node.GetPath()); err != nil {
|
|
return gui.c.Error(err)
|
|
}
|
|
|
|
return gui.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
|
|
}
|
|
|
|
func (gui *Gui) handleDiscardOldFileChange() error {
|
|
if ok, err := gui.validateNormalWorkingTreeState(); !ok {
|
|
return err
|
|
}
|
|
|
|
fileName := gui.getSelectedCommitFileName()
|
|
|
|
return gui.c.Ask(popup.AskOpts{
|
|
Title: gui.c.Tr.DiscardFileChangesTitle,
|
|
Prompt: gui.c.Tr.DiscardFileChangesPrompt,
|
|
HandleConfirm: func() error {
|
|
return gui.c.WithWaitingStatus(gui.c.Tr.RebasingStatus, func() error {
|
|
gui.c.LogAction(gui.c.Tr.Actions.DiscardOldFileChange)
|
|
if err := gui.git.Rebase.DiscardOldFileChanges(gui.State.Commits, gui.State.Panels.Commits.SelectedLineIdx, fileName); err != nil {
|
|
if err := gui.checkMergeOrRebase(err); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return gui.c.Refresh(types.RefreshOptions{Mode: types.BLOCK_UI})
|
|
})
|
|
},
|
|
})
|
|
}
|
|
|
|
func (gui *Gui) refreshCommitFilesView() error {
|
|
currentSideContext := gui.currentSideContext()
|
|
if currentSideContext.GetKey() == COMMIT_FILES_CONTEXT_KEY || currentSideContext.GetKey() == BRANCH_COMMITS_CONTEXT_KEY {
|
|
if err := gui.handleRefreshPatchBuildingPanel(-1); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
to := gui.State.Panels.CommitFiles.refName
|
|
from, reverse := gui.getFromAndReverseArgsForDiff(to)
|
|
|
|
files, err := gui.git.Loaders.CommitFiles.GetFilesInDiff(from, to, reverse)
|
|
if err != nil {
|
|
return gui.c.Error(err)
|
|
}
|
|
gui.State.CommitFileTreeViewModel.SetParent(to)
|
|
gui.State.CommitFileTreeViewModel.SetFiles(files)
|
|
|
|
return gui.c.PostRefreshUpdate(gui.State.Contexts.CommitFiles)
|
|
}
|
|
|
|
func (gui *Gui) handleOpenOldCommitFile() error {
|
|
node := gui.getSelectedCommitFileNode()
|
|
if node == nil {
|
|
return nil
|
|
}
|
|
|
|
return gui.fileHelper.OpenFile(node.GetPath())
|
|
}
|
|
|
|
func (gui *Gui) handleEditCommitFile() error {
|
|
node := gui.getSelectedCommitFileNode()
|
|
if node == nil {
|
|
return nil
|
|
}
|
|
|
|
if node.File == nil {
|
|
return gui.c.ErrorMsg(gui.c.Tr.ErrCannotEditDirectory)
|
|
}
|
|
|
|
return gui.fileHelper.EditFile(node.GetPath())
|
|
}
|
|
|
|
func (gui *Gui) handleToggleFileForPatch() error {
|
|
node := gui.getSelectedCommitFileNode()
|
|
if node == nil {
|
|
return nil
|
|
}
|
|
|
|
toggleTheFile := func() error {
|
|
if !gui.git.Patch.PatchManager.Active() {
|
|
if err := gui.startPatchManager(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// if there is any file that hasn't been fully added we'll fully add everything,
|
|
// otherwise we'll remove everything
|
|
adding := node.AnyFile(func(file *models.CommitFile) bool {
|
|
return gui.git.Patch.PatchManager.GetFileStatus(file.Name, gui.State.CommitFileTreeViewModel.GetParent()) != patch.WHOLE
|
|
})
|
|
|
|
err := node.ForEachFile(func(file *models.CommitFile) error {
|
|
if adding {
|
|
return gui.git.Patch.PatchManager.AddFileWhole(file.Name)
|
|
} else {
|
|
return gui.git.Patch.PatchManager.RemoveFile(file.Name)
|
|
}
|
|
})
|
|
|
|
if err != nil {
|
|
return gui.c.Error(err)
|
|
}
|
|
|
|
if gui.git.Patch.PatchManager.IsEmpty() {
|
|
gui.git.Patch.PatchManager.Reset()
|
|
}
|
|
|
|
return gui.c.PostRefreshUpdate(gui.State.Contexts.CommitFiles)
|
|
}
|
|
|
|
if gui.git.Patch.PatchManager.Active() && gui.git.Patch.PatchManager.To != gui.State.CommitFileTreeViewModel.GetParent() {
|
|
return gui.c.Ask(popup.AskOpts{
|
|
Title: gui.c.Tr.DiscardPatch,
|
|
Prompt: gui.c.Tr.DiscardPatchConfirm,
|
|
HandleConfirm: func() error {
|
|
gui.git.Patch.PatchManager.Reset()
|
|
return toggleTheFile()
|
|
},
|
|
})
|
|
}
|
|
|
|
return toggleTheFile()
|
|
}
|
|
|
|
func (gui *Gui) startPatchManager() error {
|
|
canRebase := gui.State.Panels.CommitFiles.canRebase
|
|
|
|
to := gui.State.Panels.CommitFiles.refName
|
|
from, reverse := gui.getFromAndReverseArgsForDiff(to)
|
|
|
|
gui.git.Patch.PatchManager.Start(from, to, reverse, canRebase)
|
|
return nil
|
|
}
|
|
|
|
func (gui *Gui) handleEnterCommitFile() error {
|
|
return gui.enterCommitFile(types.OnFocusOpts{ClickedViewName: "", ClickedViewLineIdx: -1})
|
|
}
|
|
|
|
func (gui *Gui) enterCommitFile(opts types.OnFocusOpts) error {
|
|
node := gui.getSelectedCommitFileNode()
|
|
if node == nil {
|
|
return nil
|
|
}
|
|
|
|
if node.File == nil {
|
|
return gui.handleToggleCommitFileDirCollapsed()
|
|
}
|
|
|
|
enterTheFile := func() error {
|
|
if !gui.git.Patch.PatchManager.Active() {
|
|
if err := gui.startPatchManager(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return gui.c.PushContext(gui.State.Contexts.PatchBuilding, opts)
|
|
}
|
|
|
|
if gui.git.Patch.PatchManager.Active() && gui.git.Patch.PatchManager.To != gui.State.CommitFileTreeViewModel.GetParent() {
|
|
return gui.c.Ask(popup.AskOpts{
|
|
Title: gui.c.Tr.DiscardPatch,
|
|
Prompt: gui.c.Tr.DiscardPatchConfirm,
|
|
HandleConfirm: func() error {
|
|
gui.git.Patch.PatchManager.Reset()
|
|
return enterTheFile()
|
|
},
|
|
})
|
|
}
|
|
|
|
return enterTheFile()
|
|
}
|
|
|
|
func (gui *Gui) handleToggleCommitFileDirCollapsed() error {
|
|
node := gui.getSelectedCommitFileNode()
|
|
if node == nil {
|
|
return nil
|
|
}
|
|
|
|
gui.State.CommitFileTreeViewModel.ToggleCollapsed(node.GetPath())
|
|
|
|
if err := gui.c.PostRefreshUpdate(gui.State.Contexts.CommitFiles); err != nil {
|
|
gui.c.Log.Error(err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (gui *Gui) SwitchToCommitFilesContext(opts controllers.SwitchToCommitFilesContextOpts) error {
|
|
// sometimes the commitFiles view is already shown in another window, so we need to ensure that window
|
|
// no longer considers the commitFiles view as its main view.
|
|
gui.resetWindowForView(gui.Views.CommitFiles)
|
|
|
|
gui.State.Panels.CommitFiles.SelectedLineIdx = 0
|
|
gui.State.Panels.CommitFiles.refName = opts.RefName
|
|
gui.State.Panels.CommitFiles.canRebase = opts.CanRebase
|
|
gui.State.Contexts.CommitFiles.SetParentContext(opts.Context)
|
|
gui.State.Contexts.CommitFiles.SetWindowName(opts.WindowName)
|
|
|
|
if err := gui.refreshCommitFilesView(); err != nil {
|
|
return err
|
|
}
|
|
|
|
return gui.c.PushContext(gui.State.Contexts.CommitFiles)
|
|
}
|
|
|
|
// NOTE: this is very similar to handleToggleFileTreeView, could be DRY'd with generics
|
|
func (gui *Gui) handleToggleCommitFileTreeView() error {
|
|
path := gui.getSelectedCommitFilePath()
|
|
|
|
gui.State.CommitFileTreeViewModel.ToggleShowTree()
|
|
|
|
// find that same node in the new format and move the cursor to it
|
|
if path != "" {
|
|
gui.State.CommitFileTreeViewModel.ExpandToPath(path)
|
|
index, found := gui.State.CommitFileTreeViewModel.GetIndexForPath(path)
|
|
if found {
|
|
gui.State.Contexts.CommitFiles.GetPanelState().SetSelectedLineIdx(index)
|
|
}
|
|
}
|
|
|
|
return gui.c.PostRefreshUpdate(gui.State.Contexts.CommitFiles)
|
|
}
|