diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-29 14:34:17 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-29 18:26:24 +1100 |
| commit | 40fbce91ce636eb037c2221946261ce4f4bf4317 (patch) | |
| tree | 9c31eb84b24e6e742ef519a4dad89218cca8092e /pkg/gui/commit_files_panel.go | |
| parent | 33d287d2f0c6335559ac75c1b9a4705dfaa9ad7b (diff) | |
add new diff mode
WIP
WIP
WIP
WIP
WIP
WIP
WIP
Diffstat (limited to 'pkg/gui/commit_files_panel.go')
| -rw-r--r-- | pkg/gui/commit_files_panel.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go index 810a732ec..4870876c0 100644 --- a/pkg/gui/commit_files_panel.go +++ b/pkg/gui/commit_files_panel.go @@ -7,7 +7,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/gui/presentation" ) -func (gui *Gui) getSelectedCommitFile(g *gocui.Gui) *commands.CommitFile { +func (gui *Gui) getSelectedCommitFile() *commands.CommitFile { selectedLine := gui.State.Panels.CommitFiles.SelectedLine if selectedLine == -1 { return nil @@ -34,7 +34,7 @@ func (gui *Gui) handleCommitFileSelect(g *gocui.Gui, v *gocui.View) error { gui.handleEscapeLineByLinePanel() } - commitFile := gui.getSelectedCommitFile(g) + commitFile := gui.getSelectedCommitFile() if commitFile == nil { gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles")) return nil @@ -99,7 +99,7 @@ func (gui *Gui) refreshCommitFilesView() error { return err } - commit := gui.getSelectedCommit(gui.g) + commit := gui.getSelectedCommit() if commit == nil { return nil } @@ -113,14 +113,14 @@ func (gui *Gui) refreshCommitFilesView() error { gui.refreshSelectedLine(&gui.State.Panels.CommitFiles.SelectedLine, len(gui.State.CommitFiles)) commitsFileView := gui.getCommitFilesView() - displayStrings := presentation.GetCommitFileListDisplayStrings(gui.State.CommitFiles) + displayStrings := presentation.GetCommitFileListDisplayStrings(gui.State.CommitFiles, gui.State.Diff.Ref) gui.renderDisplayStrings(commitsFileView, displayStrings) return gui.handleCommitFileSelect(gui.g, commitsFileView) } func (gui *Gui) handleOpenOldCommitFile(g *gocui.Gui, v *gocui.View) error { - file := gui.getSelectedCommitFile(g) + file := gui.getSelectedCommitFile() return gui.openFile(file.Name) } @@ -129,7 +129,7 @@ func (gui *Gui) handleToggleFileForPatch(g *gocui.Gui, v *gocui.View) error { return err } - commitFile := gui.getSelectedCommitFile(g) + commitFile := gui.getSelectedCommitFile() if commitFile == nil { gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles")) return nil @@ -167,7 +167,7 @@ func (gui *Gui) startPatchManager() error { diffMap[commitFile.Name] = commitText } - commit := gui.getSelectedCommit(gui.g) + commit := gui.getSelectedCommit() if commit == nil { return errors.New("No commit selected") } @@ -185,7 +185,7 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error { return err } - commitFile := gui.getSelectedCommitFile(gui.g) + commitFile := gui.getSelectedCommitFile() if commitFile == nil { gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles")) return nil |