go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-10 22:42:00 +02:00
Code Issues Releases Activity

Merge pull request #1927 from HiromasaNojima/option_always_show_unstaged_staged_panels

Browse Source
This commit is contained in:
Jesse Duffield
2022-05-15 19:24:56 +10:00
committed by GitHub
parent 7b0bb68741 d72ffdc4a7
commit 73491fed25
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Config.md
View File

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

2
pkg/config/user_config.go
View File

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

29
pkg/gui/files_panel.go
View File

@@ -53,33 +53,34 @@ func (gui *Gui) filesRenderToMain() error {
gui.resetMergeStateWithLock() gui.resetMergeStateWithLock()
cmdObj := gui.git.WorkingTree.WorktreeFileDiffCmdObj(node, false, !node.GetHasUnstagedChanges() && node.GetHasStagedChanges(), gui.IgnoreWhitespaceInDiffView)
mainContext := gui.State.Contexts.Normal mainContext := gui.State.Contexts.Normal
if node.File != nil { if node.File != nil {
mainContext = gui.State.Contexts.Staging 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{ refreshOpts := refreshMainOpts{main: &viewUpdateOpts{
title: gui.c.Tr.UnstagedChanges, title: gui.c.Tr.UnstagedChanges,
task: NewRunPtyTask(cmdObj.GetCmd()), task: NewRunPtyTask(cmdObj.GetCmd()),
context: mainContext, context: mainContext,
}} }}
if mainShowsStaged {
if node.GetHasUnstagedChanges() {
if node.GetHasStagedChanges() {
cmdObj := gui.git.WorkingTree.WorktreeFileDiffCmdObj(node, false, true, gui.IgnoreWhitespaceInDiffView)
refreshOpts.secondary = &viewUpdateOpts{
title: gui.c.Tr.StagedChanges,
task: NewRunPtyTask(cmdObj.GetCmd()),
context: mainContext,
}
}
} else {
refreshOpts.main.title = gui.c.Tr.StagedChanges refreshOpts.main.title = gui.c.Tr.StagedChanges
} }
if split {
cmdObj := gui.git.WorkingTree.WorktreeFileDiffCmdObj(node, false, true, gui.IgnoreWhitespaceInDiffView)
refreshOpts.secondary = &viewUpdateOpts{
title: gui.c.Tr.StagedChanges,
task: NewRunPtyTask(cmdObj.GetCmd()),
context: mainContext,
}
}
return gui.refreshMainViews(refreshOpts) return gui.refreshMainViews(refreshOpts)
} }