Merge pull request #2261 from sudoburt/merge-loaders-git-commands

pkg/commands/git.go

@@ -11,7 +11,6 @@ import (
 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
-	"github.com/jesseduffield/lazygit/pkg/commands/loaders"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
 	"github.com/jesseduffield/lazygit/pkg/common"
@@ -42,14 +41,14 @@ type GitCommand struct {
 }
 
 type Loaders struct {
-	Branches      *loaders.BranchLoader
-	CommitFiles   *loaders.CommitFileLoader
-	Commits       *loaders.CommitLoader
-	Files         *loaders.FileLoader
-	ReflogCommits *loaders.ReflogCommitLoader
-	Remotes       *loaders.RemoteLoader
-	Stash         *loaders.StashLoader
-	Tags          *loaders.TagLoader
+	BranchLoader       *git_commands.BranchLoader
+	CommitFileLoader   *git_commands.CommitFileLoader
+	CommitLoader       *git_commands.CommitLoader
+	FileLoader         *git_commands.FileLoader
+	ReflogCommitLoader *git_commands.ReflogCommitLoader
+	RemoteLoader       *git_commands.RemoteLoader
+	StashLoader        *git_commands.StashLoader
+	TagLoader          *git_commands.TagLoader
 }
 
 func NewGitCommand(
@@ -98,10 +97,11 @@ func NewGitCommandAux(
 	// on the one struct.
 	// common ones are: cmn, osCommand, dotGitDir, configCommands
 	configCommands := git_commands.NewConfigCommands(cmn, gitConfig, repo)
-	gitCommon := git_commands.NewGitCommon(cmn, cmd, osCommand, dotGitDir, repo, configCommands, syncMutex)
 
+	fileLoader := git_commands.NewFileLoader(cmn, cmd, configCommands)
+
+	gitCommon := git_commands.NewGitCommon(cmn, cmd, osCommand, dotGitDir, repo, configCommands, syncMutex)
 	statusCommands := git_commands.NewStatusCommands(gitCommon)
-	fileLoader := loaders.NewFileLoader(cmn, cmd, configCommands)
 	flowCommands := git_commands.NewFlowCommands(gitCommon)
 	remoteCommands := git_commands.NewRemoteCommands(gitCommon)
 	branchCommands := git_commands.NewBranchCommands(gitCommon)
@@ -119,6 +119,14 @@ func NewGitCommandAux(
 	patchCommands := git_commands.NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchManager)
 	bisectCommands := git_commands.NewBisectCommands(gitCommon)
 
+	branchLoader := git_commands.NewBranchLoader(cmn, branchCommands.GetRawBranches, branchCommands.CurrentBranchName, configCommands)
+	commitFileLoader := git_commands.NewCommitFileLoader(cmn, cmd)
+	commitLoader := git_commands.NewCommitLoader(cmn, cmd, dotGitDir, branchCommands.CurrentBranchName, statusCommands.RebaseMode)
+	reflogCommitLoader := git_commands.NewReflogCommitLoader(cmn, cmd)
+	remoteLoader := git_commands.NewRemoteLoader(cmn, cmd, repo.Remotes)
+	stashLoader := git_commands.NewStashLoader(cmn, cmd)
+	tagLoader := git_commands.NewTagLoader(cmn, cmd)
+
 	return &GitCommand{
 		Branch:      branchCommands,
 		Commit:      commitCommands,
@@ -137,14 +145,14 @@ func NewGitCommandAux(
 		Bisect:      bisectCommands,
 		WorkingTree: workingTreeCommands,
 		Loaders: Loaders{
-			Branches:      loaders.NewBranchLoader(cmn, branchCommands.GetRawBranches, branchCommands.CurrentBranchName, configCommands),
-			CommitFiles:   loaders.NewCommitFileLoader(cmn, cmd),
-			Commits:       loaders.NewCommitLoader(cmn, cmd, dotGitDir, branchCommands.CurrentBranchName, statusCommands.RebaseMode),
-			Files:         fileLoader,
-			ReflogCommits: loaders.NewReflogCommitLoader(cmn, cmd),
-			Remotes:       loaders.NewRemoteLoader(cmn, cmd, repo.Remotes),
-			Stash:         loaders.NewStashLoader(cmn, cmd),
-			Tags:          loaders.NewTagLoader(cmn, cmd),
+			BranchLoader:       branchLoader,
+			CommitFileLoader:   commitFileLoader,
+			CommitLoader:       commitLoader,
+			FileLoader:         fileLoader,
+			ReflogCommitLoader: reflogCommitLoader,
+			RemoteLoader:       remoteLoader,
+			StashLoader:        stashLoader,
+			TagLoader:          tagLoader,
 		},
 	}
 }

pkg/commands/git_commands/branch_loader.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"regexp"

pkg/commands/git_commands/branch_loader_test.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 // "*|feat/detect-purge|origin/feat/detect-purge|[ahead 1]"
 import (

pkg/commands/git_commands/commit_file_loader.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"fmt"

pkg/commands/git_commands/commit_file_loader_test.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"testing"

pkg/commands/git_commands/commit_loader.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"bytes"

pkg/commands/git_commands/commit_loader_test.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"path/filepath"

pkg/commands/git_commands/deps_test.go

@@ -6,7 +6,6 @@ import (
 	"github.com/go-errors/errors"
 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
-	"github.com/jesseduffield/lazygit/pkg/commands/loaders"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/config"
@@ -89,8 +88,8 @@ func buildRepo() *gogit.Repository {
 	return repo
 }
 
-func buildFileLoader(gitCommon *GitCommon) *loaders.FileLoader {
-	return loaders.NewFileLoader(gitCommon.Common, gitCommon.cmd, gitCommon.config)
+func buildFileLoader(gitCommon *GitCommon) *FileLoader {
+	return NewFileLoader(gitCommon.Common, gitCommon.cmd, gitCommon.config)
 }
 
 func buildSubmoduleCommands(deps commonDeps) *SubmoduleCommands {

pkg/commands/git_commands/file_loader.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"fmt"

pkg/commands/git_commands/file_loader_test.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"testing"

pkg/commands/git_commands/reflog_commit_loader.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"fmt"

pkg/commands/git_commands/reflog_commit_loader_test.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"errors"

pkg/commands/git_commands/remote_loader.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"fmt"

pkg/commands/git_commands/stash.go

@@ -4,19 +4,18 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jesseduffield/lazygit/pkg/commands/loaders"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 )
 
 type StashCommands struct {
 	*GitCommon
-	fileLoader  *loaders.FileLoader
+	fileLoader  *FileLoader
 	workingTree *WorkingTreeCommands
 }
 
 func NewStashCommands(
 	gitCommon *GitCommon,
-	fileLoader *loaders.FileLoader,
+	fileLoader *FileLoader,
 	workingTree *WorkingTreeCommands,
 ) *StashCommands {
 	return &StashCommands{
@@ -111,7 +110,7 @@ func (self *StashCommands) SaveStagedChanges(message string) error {
 	// meaning it's deleted in your working tree but added in your index. Given that it's
 	// now safely stashed, we need to remove it.
 	files := self.fileLoader.
-		GetStatusFiles(loaders.GetStatusFileOptions{})
+		GetStatusFiles(GetStatusFileOptions{})
 
 	for _, file := range files {
 		if file.ShortStatus == "AD" {

pkg/commands/git_commands/stash_loader.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"regexp"

pkg/commands/git_commands/stash_loader_test.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"testing"

pkg/commands/git_commands/tag_loader.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"github.com/jesseduffield/generics/slices"

pkg/commands/git_commands/tag_loader_test.go

@@ -1,4 +1,4 @@
-package loaders
+package git_commands
 
 import (
 	"testing"

pkg/commands/git_commands/working_tree.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/generics/slices"
-	"github.com/jesseduffield/lazygit/pkg/commands/loaders"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/utils"
@@ -18,13 +17,13 @@ import (
 type WorkingTreeCommands struct {
 	*GitCommon
 	submodule  *SubmoduleCommands
-	fileLoader *loaders.FileLoader
+	fileLoader *FileLoader
 }
 
 func NewWorkingTreeCommands(
 	gitCommon *GitCommon,
 	submodule *SubmoduleCommands,
-	fileLoader *loaders.FileLoader,
+	fileLoader *FileLoader,
 ) *WorkingTreeCommands {
 	return &WorkingTreeCommands{
 		GitCommon:  gitCommon,
@@ -90,7 +89,7 @@ func (self *WorkingTreeCommands) BeforeAndAfterFileForRename(file *models.File)
 	// all files, passing the --no-renames flag and then recursively call the function
 	// again for the before file and after file.
 
-	filesWithoutRenames := self.fileLoader.GetStatusFiles(loaders.GetStatusFileOptions{NoRenames: true})
+	filesWithoutRenames := self.fileLoader.GetStatusFiles(GetStatusFileOptions{NoRenames: true})
 
 	var beforeFile *models.File
 	var afterFile *models.File

pkg/gui/controllers/switch_to_sub_commits_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/lazygit/pkg/commands/loaders"
+	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
@@ -57,8 +57,8 @@ func (self *SwitchToSubCommitsController) viewCommits() error {
 	}
 
 	// need to populate my sub commits
-	commits, err := self.git.Loaders.Commits.GetCommits(
-		loaders.GetCommitsOptions{
+	commits, err := self.git.Loaders.CommitLoader.GetCommits(
+		git_commands.GetCommitsOptions{
 			Limit:                true,
 			FilterPath:           self.modes.Filtering.GetPath(),
 			IncludeRebaseCommits: false,

pkg/gui/refresh.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/jesseduffield/generics/set"
 	"github.com/jesseduffield/generics/slices"
-	"github.com/jesseduffield/lazygit/pkg/commands/loaders"
+	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
@@ -223,8 +223,8 @@ func (gui *Gui) refreshCommitsWithLimit() error {
 	gui.Mutexes.LocalCommitsMutex.Lock()
 	defer gui.Mutexes.LocalCommitsMutex.Unlock()
 
-	commits, err := gui.git.Loaders.Commits.GetCommits(
-		loaders.GetCommitsOptions{
+	commits, err := gui.git.Loaders.CommitLoader.GetCommits(
+		git_commands.GetCommitsOptions{
 			Limit:                gui.State.Contexts.LocalCommits.GetLimitCommits(),
 			FilterPath:           gui.State.Modes.Filtering.GetPath(),
 			IncludeRebaseCommits: true,
@@ -245,7 +245,7 @@ func (gui *Gui) refreshCommitFilesContext() error {
 	to := ref.RefName()
 	from, reverse := gui.State.Modes.Diffing.GetFromAndReverseArgsForDiff(ref.ParentRefName())
 
-	files, err := gui.git.Loaders.CommitFiles.GetFilesInDiff(from, to, reverse)
+	files, err := gui.git.Loaders.CommitFileLoader.GetFilesInDiff(from, to, reverse)
 	if err != nil {
 		return gui.c.Error(err)
 	}
@@ -259,7 +259,7 @@ func (gui *Gui) refreshRebaseCommits() error {
 	gui.Mutexes.LocalCommitsMutex.Lock()
 	defer gui.Mutexes.LocalCommitsMutex.Unlock()
 
-	updatedCommits, err := gui.git.Loaders.Commits.MergeRebasingCommits(gui.State.Model.Commits)
+	updatedCommits, err := gui.git.Loaders.CommitLoader.MergeRebasingCommits(gui.State.Model.Commits)
 	if err != nil {
 		return err
 	}
@@ -269,7 +269,7 @@ func (gui *Gui) refreshRebaseCommits() error {
 }
 
 func (self *Gui) refreshTags() error {
-	tags, err := self.git.Loaders.Tags.GetTags()
+	tags, err := self.git.Loaders.TagLoader.GetTags()
 	if err != nil {
 		return self.c.Error(err)
 	}
@@ -300,13 +300,13 @@ func (gui *Gui) refreshBranches() {
 		// which allows us to order them correctly. So if we're filtering we'll just
 		// manually load all the reflog commits here
 		var err error
-		reflogCommits, _, err = gui.git.Loaders.ReflogCommits.GetReflogCommits(nil, "")
+		reflogCommits, _, err = gui.git.Loaders.ReflogCommitLoader.GetReflogCommits(nil, "")
 		if err != nil {
 			gui.c.Log.Error(err)
 		}
 	}
 
-	branches, err := gui.git.Loaders.Branches.Load(reflogCommits)
+	branches, err := gui.git.Loaders.BranchLoader.Load(reflogCommits)
 	if err != nil {
 		_ = gui.c.Error(err)
 	}
@@ -406,8 +406,8 @@ func (gui *Gui) refreshStateFiles() error {
 		}
 	}
 
-	files := gui.git.Loaders.Files.
-		GetStatusFiles(loaders.GetStatusFileOptions{})
+	files := gui.git.Loaders.FileLoader.
+		GetStatusFiles(git_commands.GetStatusFileOptions{})
 
 	conflictFileCount := 0
 	for _, file := range files {
@@ -463,7 +463,7 @@ func (gui *Gui) refreshReflogCommits() error {
 	}
 
 	refresh := func(stateCommits *[]*models.Commit, filterPath string) error {
-		commits, onlyObtainedNewReflogCommits, err := gui.git.Loaders.ReflogCommits.
+		commits, onlyObtainedNewReflogCommits, err := gui.git.Loaders.ReflogCommitLoader.
 			GetReflogCommits(lastReflogCommit, filterPath)
 		if err != nil {
 			return gui.c.Error(err)
@@ -495,7 +495,7 @@ func (gui *Gui) refreshReflogCommits() error {
 func (gui *Gui) refreshRemotes() error {
 	prevSelectedRemote := gui.State.Contexts.Remotes.GetSelected()
 
-	remotes, err := gui.git.Loaders.Remotes.GetRemotes()
+	remotes, err := gui.git.Loaders.RemoteLoader.GetRemotes()
 	if err != nil {
 		return gui.c.Error(err)
 	}
@@ -525,7 +525,7 @@ func (gui *Gui) refreshRemotes() error {
 }
 
 func (gui *Gui) refreshStashEntries() error {
-	gui.State.Model.StashEntries = gui.git.Loaders.Stash.
+	gui.State.Model.StashEntries = gui.git.Loaders.StashLoader.
 		GetStashEntries(gui.State.Modes.Filtering.GetPath())
 
 	return gui.postRefreshUpdate(gui.State.Contexts.Stash)