start refactoring gui

1 files changed, 2 insertions, 197 deletions

diff --git a/pkg/gui/submodules_panel.go b/pkg/gui/submodules_panel.go
index be0574356..e63634bc6 100644
--- a/pkg/gui/submodules_panel.go
+++ b/pkg/gui/submodules_panel.go
@@ -3,8 +3,6 @@ package gui
 import (
 	"fmt"
 	"os"
-	"path/filepath"
-	"strings"
 
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
@@ -36,7 +34,7 @@ func (gui *Gui) submodulesRenderToMain() error {
 		if file == nil {
 			task = NewRenderStringTask(prefix)
 		} else {
-			cmdObj := gui.Git.WorkingTree.WorktreeFileDiffCmdObj(file, false, !file.HasUnstagedChanges && file.HasStagedChanges, gui.State.IgnoreWhitespaceInDiffView)
+			cmdObj := gui.Git.WorkingTree.WorktreeFileDiffCmdObj(file, false, !file.HasUnstagedChanges && file.HasStagedChanges, gui.IgnoreWhitespaceInDiffView)
 			task = NewRunCommandTaskWithPrefix(cmdObj.GetCmd(), prefix)
 		}
 	}
@@ -60,205 +58,12 @@ func (gui *Gui) refreshStateSubmoduleConfigs() error {
 	return nil
 }
 
-func (gui *Gui) handleSubmoduleEnter(submodule *models.SubmoduleConfig) error {
-	return gui.enterSubmodule(submodule)
-}
-
 func (gui *Gui) enterSubmodule(submodule *models.SubmoduleConfig) error {
 	wd, err := os.Getwd()
 	if err != nil {
 		return err
 	}
-	gui.RepoPathStack = append(gui.RepoPathStack, wd)
+	gui.RepoPathStack.Push(wd)
 
 	return gui.dispatchSwitchToRepo(submodule.Path, true)
 }
-
-func (gui *Gui) removeSubmodule(submodule *models.SubmoduleConfig) error {
-	return gui.ask(askOpts{
-		title:  gui.Tr.RemoveSubmodule,
-		prompt: fmt.Sprintf(gui.Tr.RemoveSubmodulePrompt, submodule.Name),
-		handleConfirm: func() error {
-			gui.logAction(gui.Tr.Actions.RemoveSubmodule)
-			if err := gui.Git.Submodule.Delete(submodule); err != nil {
-				return gui.surfaceError(err)
-			}
-
-			return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{SUBMODULES, FILES}})
-		},
-	})
-}
-
-func (gui *Gui) handleResetSubmodule(submodule *models.SubmoduleConfig) error {
-	return gui.WithWaitingStatus(gui.Tr.LcResettingSubmoduleStatus, func() error {
-		return gui.resetSubmodule(submodule)
-	})
-}
-
-func (gui *Gui) fileForSubmodule(submodule *models.SubmoduleConfig) *models.File {
-	for _, file := range gui.State.FileTreeViewModel.GetAllFiles() {
-		if file.IsSubmodule([]*models.SubmoduleConfig{submodule}) {
-			return file
-		}
-	}
-
-	return nil
-}
-
-func (gui *Gui) resetSubmodule(submodule *models.SubmoduleConfig) error {
-	gui.logAction(gui.Tr.Actions.ResetSubmodule)
-
-	file := gui.fileForSubmodule(submodule)
-	if file != nil {
-		if err := gui.Git.WorkingTree.UnStageFile(file.Names(), file.Tracked); err != nil {
-			return gui.surfaceError(err)
-		}
-	}
-
-	if err := gui.Git.Submodule.Stash(submodule); err != nil {
-		return gui.surfaceError(err)
-	}
-	if err := gui.Git.Submodule.Reset(submodule); err != nil {
-		return gui.surfaceError(err)
-	}
-
-	return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []RefreshableView{FILES, SUBMODULES}})
-}
-
-func (gui *Gui) handleAddSubmodule() error {
-	return gui.prompt(promptOpts{
-		title: gui.Tr.LcNewSubmoduleUrl,
-		handleConfirm: func(submoduleUrl string) error {
-			nameSuggestion := filepath.Base(strings.TrimSuffix(submoduleUrl, filepath.Ext(submoduleUrl)))
-
-			return gui.prompt(promptOpts{
-				title:          gui.Tr.LcNewSubmoduleName,
-				initialContent: nameSuggestion,
-				handleConfirm: func(submoduleName string) error {
-
-					return gui.prompt(promptOpts{
-						title:          gui.Tr.LcNewSubmodulePath,
-						initialContent: submoduleName,
-						handleConfirm: func(submodulePath string) error {
-							return gui.WithWaitingStatus(gui.Tr.LcAddingSubmoduleStatus, func() error {
-								gui.logAction(gui.Tr.Actions.AddSubmodule)
-								err := gui.Git.Submodule.Add(submoduleName, submodulePath, submoduleUrl)
-								gui.handleCredentialsPopup(err)
-
-								return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{SUBMODULES}})
-							})
-						},
-					})
-				},
-			})
-		},
-	})
-
-}
-
-func (gui *Gui) handleEditSubmoduleUrl(submodule *models.SubmoduleConfig) error {
-	return gui.prompt(promptOpts{
-		title:          fmt.Sprintf(gui.Tr.LcUpdateSubmoduleUrl, submodule.Name),
-		initialContent: submodule.Url,
-		handleConfirm: func(newUrl string) error {
-			return gui.WithWaitingStatus(gui.Tr.LcUpdatingSubmoduleUrlStatus, func() error {
-				gui.logAction(gui.Tr.Actions.UpdateSubmoduleUrl)
-				err := gui.Git.Submodule.UpdateUrl(submodule.Name, submodule.Path, newUrl)
-				gui.handleCredentialsPopup(err)
-
-				return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{SUBMODULES}})
-			})
-		},
-	})
-}
-
-func (gui *Gui) handleSubmoduleInit(submodule *models.SubmoduleConfig) error {
-	return gui.WithWaitingStatus(gui.Tr.LcInitializingSubmoduleStatus, func() error {
-		gui.logAction(gui.Tr.Actions.InitialiseSubmodule)
-		err := gui.Git.Submodule.Init(submodule.Path)
-		gui.handleCredentialsPopup(err)
-
-		return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{SUBMODULES}})
-	})
-}
-
-func (gui *Gui) forSubmodule(callback func(*models.SubmoduleConfig) error) func() error {
-	return func() error {
-		submodule := gui.getSelectedSubmodule()
-		if submodule == nil {
-			return nil
-		}
-
-		return callback(submodule)
-	}
-}
-
-func (gui *Gui) handleBulkSubmoduleActionsMenu() error {
-	menuItems := []*menuItem{
-		{
-			displayStrings: []string{gui.Tr.LcBulkInitSubmodules, style.FgGreen.Sprint(gui.Git.Submodule.BulkInitCmdObj().ToString())},
-			onPress: func() error {
-				return gui.WithWaitingStatus(gui.Tr.LcRunningCommand, func() error {
-					gui.logAction(gui.Tr.Actions.BulkInitialiseSubmodules)
-					err := gui.Git.Submodule.BulkInitCmdObj().Run()
-					if err != nil {
-						return gui.surfaceError(err)
-					}
-
-					return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{SUBMODULES}})
-				})
-			},
-		},
-		{
-			displayStrings: []string{gui.Tr.LcBulkUpdateSubmodules, style.FgYellow.Sprint(gui.Git.Submodule.BulkUpdateCmdObj().ToString())},
-			onPress: func() error {
-				return gui.WithWaitingStatus(gui.Tr.LcRunningCommand, func() error {
-					gui.logAction(gui.Tr.Actions.BulkUpdateSubmodules)
-					if err := gui.Git.Submodule.BulkUpdateCmdObj().Run(); err != nil {
-						return gui.surfaceError(err)
-					}
-
-					return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{SUBMODULES}})
-				})
-			},
-		},
-		{
-			displayStrings: []string{gui.Tr.LcSubmoduleStashAndReset, style.FgRed.Sprintf("git stash in each submodule && %s", gui.Git.Submodule.ForceBulkUpdateCmdObj().ToString())},
-			onPress: func() error {
-				return gui.WithWaitingStatus(gui.Tr.LcRunningCommand, func() error {
-					gui.logAction(gui.Tr.Actions.BulkStashAndResetSubmodules)
-					if err := gui.Git.Submodule.ResetSubmodules(gui.State.Submodules); err != nil {
-						return gui.surfaceError(err)
-					}
-
-					return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{SUBMODULES}})
-				})
-			},
-		},
-		{
-			displayStrings: []string{gui.Tr.LcBulkDeinitSubmodules, style.FgRed.Sprint(gui.Git.Submodule.BulkDeinitCmdObj().ToString())},
-			onPress: func() error {
-				return gui.WithWaitingStatus(gui.Tr.LcRunningCommand, func() error {
-					gui.logAction(gui.Tr.Actions.BulkDeinitialiseSubmodules)
-					if err := gui.Git.Submodule.BulkDeinitCmdObj().Run(); err != nil {
-						return gui.surfaceError(err)
-					}
-
-					return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{SUBMODULES}})
-				})
-			},
-		},
-	}
-
-	return gui.createMenu(gui.Tr.LcBulkSubmoduleOptions, menuItems, createMenuOptions{showCancel: true})
-}
-
-func (gui *Gui) handleUpdateSubmodule(submodule *models.SubmoduleConfig) error {
-	return gui.WithWaitingStatus(gui.Tr.LcUpdatingSubmoduleStatus, func() error {
-		gui.logAction(gui.Tr.Actions.UpdateSubmodule)
-		err := gui.Git.Submodule.Update(submodule.Path)
-		gui.handleCredentialsPopup(err)
-
-		return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{SUBMODULES}})
-	})
-}