add feature of display diff between specific commits #397

3 files changed, 76 insertions, 1 deletions

diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go
index 1bd8be4a1..0d3dd6e84 100644
--- a/pkg/gui/commits_panel.go
+++ b/pkg/gui/commits_panel.go
@@ -39,6 +39,12 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
 	if err := gui.focusPoint(0, gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits), v); err != nil {
 		return err
 	}
+
+	// if specific diff mode is on, don't show diff
+	if gui.State.Panels.Commits.SpecificDiffMode {
+		return nil
+	}
+
 	commitText, err := gui.GitCommand.Show(commit.Sha)
 	if err != nil {
 		return err
@@ -56,6 +62,13 @@ func (gui *Gui) refreshCommits(g *gocui.Gui) error {
 		if err != nil {
 			return err
 		}
+
+		for _, commit := range commits {
+			if _, has := gui.State.DiffEntries[commit.Sha]; has {
+				commit.Selected = true
+			}
+		}
+
 		gui.State.Commits = commits
 
 		gui.refreshSelectedLine(&gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits))
@@ -448,3 +461,56 @@ func (gui *Gui) handleSwitchToCommitFilesPanel(g *gocui.Gui, v *gocui.View) erro
 
 	return gui.switchFocus(g, v, gui.getCommitFilesView())
 }
+
+func (gui *Gui) handleToggleDiffCommit(g *gocui.Gui, v *gocui.View) error {
+	selectLimit := 2
+
+	// get selected commit
+	commit := gui.getSelectedCommit(g)
+	if commit == nil {
+		return gui.renderString(g, "main", gui.Tr.SLocalize("NoCommitsThisBranch"))
+	}
+
+	// if already selected commit delete
+	if _, has := gui.State.DiffEntries[commit.Sha]; has {
+		delete(gui.State.DiffEntries, commit.Sha)
+		gui.setDiffMode()
+	} else {
+		if len(gui.State.DiffEntries) == selectLimit {
+			return gui.createErrorPanel(gui.g, "you have already selected two commit, please deselect one of two")
+		}
+		gui.State.DiffEntries[commit.Sha] = commit
+		gui.setDiffMode()
+	}
+
+	// if selected tow commits, display diff between
+	if len(gui.State.DiffEntries) == selectLimit {
+		var entries []string
+		for _, entry := range gui.State.DiffEntries {
+			entries = append(entries, entry.Sha)
+		}
+
+		commitText, err := gui.GitCommand.DiffCommits(entries[0], entries[1])
+
+		if err != nil {
+			return gui.createErrorPanel(gui.g, err.Error())
+		}
+
+		return gui.renderString(g, "main", commitText)
+	}
+
+	return nil
+}
+
+func (gui *Gui) setDiffMode() {
+	v := gui.getCommitsView()
+	if len(gui.State.DiffEntries) != 0 {
+		gui.State.Panels.Commits.SpecificDiffMode = true
+		v.Title = gui.Tr.SLocalize("CommitsDiffTitle")
+	} else {
+		gui.State.Panels.Commits.SpecificDiffMode = false
+		v.Title = gui.Tr.SLocalize("CommitsTitle")
+	}
+
+	gui.refreshCommits(gui.g)
+}
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 07d51e2bc..f6cdd093d 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -103,7 +103,8 @@ type branchPanelState struct {
 }
 
 type commitPanelState struct {
-	SelectedLine int
+	SelectedLine     int
+	SpecificDiffMode bool
 }
 
 type stashPanelState struct {
@@ -135,6 +136,7 @@ type guiState struct {
 	Commits             []*commands.Commit
 	StashEntries        []*commands.StashEntry
 	CommitFiles         []*commands.CommitFile
+	DiffEntries         map[string]*commands.Commit
 	MenuItemCount       int // can't store the actual list because it's of interface{} type
 	PreviousView        string
 	Platform            commands.Platform
@@ -154,6 +156,7 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
 		Commits:             make([]*commands.Commit, 0),
 		CherryPickedCommits: make([]*commands.Commit, 0),
 		StashEntries:        make([]*commands.StashEntry, 0),
+		DiffEntries:         make(map[string]*commands.Commit),
 		Platform:            *oSCommand.Platform,
 		Panels: &panelStates{
 			Files:       &filePanelState{SelectedLine: -1},
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index 518575550..28a60d473 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -389,6 +389,12 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Handler:     gui.handleSwitchToCommitFilesPanel,
 			Description: gui.Tr.SLocalize("viewCommitFiles"),
 		}, {
+			ViewName:    "commits",
+			Key:         gocui.KeySpace,
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleToggleDiffCommit,
+			Description: gui.Tr.SLocalize("CommitsDiff"),
+		}, {
 			ViewName:    "stash",
 			Key:         gocui.KeySpace,
 			Modifier:    gocui.ModNone,