Merge pull request #1927 from HiromasaNojima/option_always_show_unstaged_staged_panels

docs/Config.md

@@ -54,6 +54,7 @@ gui:
   showCommandLog: true
   showIcons: false
   commandLogSize: 8
+  splitDiff: 'auto' # one of 'auto' | 'always'
 git:
   paging:
     colorArg: always

pkg/config/user_config.go

@@ -46,6 +46,7 @@ type GuiConfig struct {
 	ShowBottomLine           bool               `yaml:"showBottomLine"`
 	ShowIcons                bool               `yaml:"showIcons"`
 	CommandLogSize           int                `yaml:"commandLogSize"`
+	SplitDiff                string             `yaml:"splitDiff"`
 }
 
 type ThemeConfig struct {
@@ -360,6 +361,7 @@ func GetDefaultConfig() *UserConfig {
 			ShowRandomTip:            true,
 			ShowIcons:                false,
 			CommandLogSize:           8,
+			SplitDiff:                "auto",
 		},
 		Git: GitConfig{
 			Paging: PagingConfig{

pkg/gui/files_panel.go

@@ -53,21 +53,25 @@ func (gui *Gui) filesRenderToMain() error {
 
 	gui.resetMergeStateWithLock()
 
-	cmdObj := gui.git.WorkingTree.WorktreeFileDiffCmdObj(node, false, !node.GetHasUnstagedChanges() && node.GetHasStagedChanges(), gui.IgnoreWhitespaceInDiffView)
-
 	mainContext := gui.State.Contexts.Normal
 	if node.File != nil {
 		mainContext = gui.State.Contexts.Staging
 	}
 
+	split := gui.c.UserConfig.Gui.SplitDiff == "always" || (node.GetHasUnstagedChanges() && node.GetHasStagedChanges())
+	mainShowsStaged := !split && node.GetHasStagedChanges()
+
+	cmdObj := gui.git.WorkingTree.WorktreeFileDiffCmdObj(node, false, mainShowsStaged, gui.IgnoreWhitespaceInDiffView)
 	refreshOpts := refreshMainOpts{main: &viewUpdateOpts{
 		title:   gui.c.Tr.UnstagedChanges,
 		task:    NewRunPtyTask(cmdObj.GetCmd()),
 		context: mainContext,
 	}}
+	if mainShowsStaged {
+		refreshOpts.main.title = gui.c.Tr.StagedChanges
+	}
 
-	if node.GetHasUnstagedChanges() {
-		if node.GetHasStagedChanges() {
+	if split {
 		cmdObj := gui.git.WorkingTree.WorktreeFileDiffCmdObj(node, false, true, gui.IgnoreWhitespaceInDiffView)
 
 		refreshOpts.secondary = &viewUpdateOpts{
@@ -76,9 +80,6 @@ func (gui *Gui) filesRenderToMain() error {
 			context: mainContext,
 		}
 	}
-	} else {
-		refreshOpts.main.title = gui.c.Tr.StagedChanges
-	}
 
 	return gui.refreshMainViews(refreshOpts)
 }