diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-12-30 17:19:01 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-04 09:07:15 +1100 |
| commit | 9b2b0fc1226ebe0858fcbed59d87bcaae8c8a2e9 (patch) | |
| tree | 8d7a9e4c321e40a9b0dab0f2260ec4131fb0eefe /pkg/gui | |
| parent | 96c2887fd0c1ca95e6b3d55756be8d424f8d905a (diff) | |
WIP
Diffstat (limited to 'pkg/gui')
| -rw-r--r-- | pkg/gui/commit_files_panel.go | 3 | ||||
| -rw-r--r-- | pkg/gui/commits_panel.go | 4 | ||||
| -rw-r--r-- | pkg/gui/files_panel.go | 5 | ||||
| -rw-r--r-- | pkg/gui/sub_commits_panel.go | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go index 2b7e513df..8c300fb4d 100644 --- a/pkg/gui/commit_files_panel.go +++ b/pkg/gui/commit_files_panel.go @@ -1,6 +1,7 @@ package gui import ( + "github.com/jesseduffield/lazygit/pkg/commands/loaders" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/patch" "github.com/jesseduffield/lazygit/pkg/gui/filetree" @@ -105,7 +106,7 @@ func (gui *Gui) refreshCommitFilesView() error { to := gui.State.Panels.CommitFiles.refName from, reverse := gui.getFromAndReverseArgsForDiff(to) - files, err := gui.GitCommand.GetFilesInDiff(from, to, reverse) + files, err := loaders.NewCommitFileLoader(gui.Common, gui.GitCommand.Cmd).GetFilesInDiff(from, to, reverse) if err != nil { return gui.surfaceError(err) } diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go index 2fd04475a..ed1718c18 100644 --- a/pkg/gui/commits_panel.go +++ b/pkg/gui/commits_panel.go @@ -119,7 +119,7 @@ func (gui *Gui) refreshCommitsWithLimit() error { gui.Mutexes.BranchCommitsMutex.Lock() defer gui.Mutexes.BranchCommitsMutex.Unlock() - loader := loaders.NewCommitLoader(gui.Common, gui.GitCommand, gui.OSCommand) + loader := loaders.NewCommitLoader(gui.Common, gui.GitCommand) commits, err := loader.GetCommits( loaders.GetCommitsOptions{ @@ -142,7 +142,7 @@ func (gui *Gui) refreshRebaseCommits() error { gui.Mutexes.BranchCommitsMutex.Lock() defer gui.Mutexes.BranchCommitsMutex.Unlock() - loader := loaders.NewCommitLoader(gui.Common, gui.GitCommand, gui.OSCommand) + loader := loaders.NewCommitLoader(gui.Common, gui.GitCommand) updatedCommits, err := loader.MergeRebasingCommits(gui.State.Commits) if err != nil { diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index f1ac1d1a5..aa2f78447 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -7,6 +7,7 @@ import ( "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" + "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/config" @@ -553,7 +554,9 @@ func (gui *Gui) refreshStateFiles() error { prevNodes := gui.State.FileManager.GetAllItems() prevSelectedLineIdx := gui.State.Panels.Files.SelectedLineIdx - files := gui.GitCommand.GetStatusFiles(commands.GetStatusFileOptions{}) + files := loaders. + NewFileLoader(gui.Common, gui.GitCommand.Cmd, gui.GitCommand.GitConfig). + GetStatusFiles(loaders.GetStatusFileOptions{}) // for when you stage the old file of a rename and the new file is in a collapsed dir state.FileManager.RWMutex.Lock() diff --git a/pkg/gui/sub_commits_panel.go b/pkg/gui/sub_commits_panel.go index 75bd957d8..83661100d 100644 --- a/pkg/gui/sub_commits_panel.go +++ b/pkg/gui/sub_commits_panel.go @@ -75,7 +75,7 @@ func (gui *Gui) handleViewSubCommitFiles() error { func (gui *Gui) switchToSubCommitsContext(refName string) error { // need to populate my sub commits - loader := loaders.NewCommitLoader(gui.Common, gui.GitCommand, gui.OSCommand) + loader := loaders.NewCommitLoader(gui.Common, gui.GitCommand) commits, err := loader.GetCommits( loaders.GetCommitsOptions{ |