1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-25 12:24:47 +02:00

rearrange

This commit is contained in:
Jesse Duffield 2022-01-07 20:36:11 +11:00
parent ee8ff6512f
commit a7a61cdc83

View File

@ -20,32 +20,32 @@ import (
// GitCommand is our main git interface // GitCommand is our main git interface
type GitCommand struct { type GitCommand struct {
Loaders Loaders
Submodule *SubmoduleCommands
Tag *TagCommands
WorkingTree *WorkingTreeCommands
File *FileCommands
Branch *BranchCommands Branch *BranchCommands
Commit *CommitCommands Commit *CommitCommands
Config *ConfigCommands
Custom *CustomCommands
File *FileCommands
Flow *FlowCommands
Patch *PatchCommands
Rebase *RebaseCommands Rebase *RebaseCommands
Remote *RemoteCommands
Stash *StashCommands Stash *StashCommands
Status *StatusCommands Status *StatusCommands
Config *ConfigCommands Submodule *SubmoduleCommands
Patch *PatchCommands
Remote *RemoteCommands
Sync *SyncCommands Sync *SyncCommands
Flow *FlowCommands Tag *TagCommands
Custom *CustomCommands WorkingTree *WorkingTreeCommands
Loaders Loaders
} }
type Loaders struct { type Loaders struct {
Commits *loaders.CommitLoader
Branches *loaders.BranchLoader Branches *loaders.BranchLoader
Files *loaders.FileLoader
CommitFiles *loaders.CommitFileLoader CommitFiles *loaders.CommitFileLoader
Remotes *loaders.RemoteLoader Commits *loaders.CommitLoader
Files *loaders.FileLoader
ReflogCommits *loaders.ReflogCommitLoader ReflogCommits *loaders.ReflogCommitLoader
Remotes *loaders.RemoteLoader
Stash *loaders.StashLoader Stash *loaders.StashLoader
Tags *loaders.TagLoader Tags *loaders.TagLoader
} }
@ -119,28 +119,28 @@ func NewGitCommandAux(
patchCommands := NewPatchCommands(cmn, cmd, rebaseCommands, commitCommands, configCommands, statusCommands, patchManager) patchCommands := NewPatchCommands(cmn, cmd, rebaseCommands, commitCommands, configCommands, statusCommands, patchManager)
return &GitCommand{ return &GitCommand{
Submodule: submoduleCommands,
Tag: tagCommands,
WorkingTree: workingTreeCommands,
File: fileCommands,
Branch: branchCommands, Branch: branchCommands,
Commit: commitCommands, Commit: commitCommands,
Rebase: rebaseCommands,
Config: configCommands, Config: configCommands,
Custom: customCommands,
File: fileCommands,
Flow: flowCommands,
Patch: patchCommands,
Rebase: rebaseCommands,
Remote: remoteCommands,
Stash: stashCommands, Stash: stashCommands,
Status: statusCommands, Status: statusCommands,
Patch: patchCommands, Submodule: submoduleCommands,
Remote: remoteCommands,
Sync: syncCommands, Sync: syncCommands,
Flow: flowCommands, Tag: tagCommands,
Custom: customCommands, WorkingTree: workingTreeCommands,
Loaders: Loaders{ Loaders: Loaders{
Commits: loaders.NewCommitLoader(cmn, cmd, dotGitDir, branchCommands.CurrentBranchName, statusCommands.RebaseMode),
Branches: loaders.NewBranchLoader(cmn, branchCommands.GetRawBranches, branchCommands.CurrentBranchName), Branches: loaders.NewBranchLoader(cmn, branchCommands.GetRawBranches, branchCommands.CurrentBranchName),
Files: fileLoader,
CommitFiles: loaders.NewCommitFileLoader(cmn, cmd), CommitFiles: loaders.NewCommitFileLoader(cmn, cmd),
Remotes: loaders.NewRemoteLoader(cmn, cmd, repo.Remotes), Commits: loaders.NewCommitLoader(cmn, cmd, dotGitDir, branchCommands.CurrentBranchName, statusCommands.RebaseMode),
Files: fileLoader,
ReflogCommits: loaders.NewReflogCommitLoader(cmn, cmd), ReflogCommits: loaders.NewReflogCommitLoader(cmn, cmd),
Remotes: loaders.NewRemoteLoader(cmn, cmd, repo.Remotes),
Stash: loaders.NewStashLoader(cmn, cmd), Stash: loaders.NewStashLoader(cmn, cmd),
Tags: loaders.NewTagLoader(cmn, cmd), Tags: loaders.NewTagLoader(cmn, cmd),
}, },