allow user to discard old file changes for a given commit

1 files changed, 6 insertions, 31 deletions

diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go
index 0de71e875..9b83d725d 100644
--- a/pkg/gui/commits_panel.go
+++ b/pkg/gui/commits_panel.go
@@ -3,7 +3,6 @@ package gui
 import (
 	"fmt"
 	"strconv"
-	"strings"
 
 	"github.com/go-errors/errors"
 
@@ -72,9 +71,12 @@ func (gui *Gui) refreshCommits(g *gocui.Gui) error {
 		fmt.Fprint(v, list)
 
 		gui.refreshStatus(g)
-		if v == g.CurrentView() {
+		if g.CurrentView() == v {
 			gui.handleCommitSelect(g, v)
 		}
+		if g.CurrentView() == gui.getCommitFilesView() {
+			gui.refreshCommitFilesView()
+		}
 		return nil
 	})
 	return nil
@@ -440,36 +442,9 @@ func (gui *Gui) HandlePasteCommits(g *gocui.Gui, v *gocui.View) error {
 }
 
 func (gui *Gui) handleSwitchToCommitFilesPanel(g *gocui.Gui, v *gocui.View) error {
-	commit := gui.getSelectedCommit(g)
-	if commit == nil {
-		return nil
-	}
-
-	commitfileView, err := g.View("commitFiles")
-	if err != nil {
+	if err := gui.refreshCommitFilesView(); err != nil {
 		return err
 	}
 
-	files, err := gui.GitCommand.CommitFiles(commit.Sha)
-	if err != nil {
-		return gui.createErrorPanel(g, err.Error())
-	}
-
-	gui.State.Panels.CommitFiles = &commitFilesPanelState{SelectedLine: 0}
-	gui.State.CommitFiles = make([]*commands.CommitFile, 0)
-
-	if files == "" {
-		gui.State.Panels.CommitFiles.SelectedLine = -1
-	}
-
-	for _, file := range strings.Split(strings.TrimRight(files, "\n"), "\n") {
-		gui.State.CommitFiles = append(gui.State.CommitFiles, &commands.CommitFile{
-			Sha:           commit.Sha,
-			Name:          file,
-			DisplayString: file,
-		})
-	}
-
-	gui.renderListPanel(gui.getCommitFilesView(), gui.State.CommitFiles)
-	return gui.switchFocus(g, v, commitfileView)
+	return gui.switchFocus(g, v, gui.getCommitFilesView())
 }