ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

show only merge conflict files when there are merge conflicts

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-26 19:45:42 +11:00
parent 5a3f81d1f7
commit fa2e7ae1e7
146 changed files with 502 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/gui/files_panel.go
View File

@@ -530,7 +530,7 @@ func (gui *Gui) handleStatusFilterPressed() error {
func (gui *Gui) setStatusFiltering(filter filetree.FileTreeDisplayFilter) error {
state := gui.State
state.FileTreeViewModel.SetDisplayFilter(filter)
state.FileTreeViewModel.SetFilter(filter)
return gui.handleRefreshFiles()
}
@@ -640,6 +640,19 @@ func (gui *Gui) refreshStateFiles() error {
}
}
// only taking over the filter if it hasn't already been set by the user.
// Though this does make it impossible for the user to actually say they want to display all if
// conflicts are currently being shown. Hmm. Worth it I reckon. If we need to add some
// extra state here to see if the user's set the filter themselves we can do that, but
// I'd prefer to maintain as little state as possible.
if conflictFileCount > 0 {
if state.FileTreeViewModel.GetFilter() == filetree.DisplayAll {
state.FileTreeViewModel.SetFilter(filetree.DisplayConflicted)
}
} else if state.FileTreeViewModel.GetFilter() == filetree.DisplayConflicted {
state.FileTreeViewModel.SetFilter(filetree.DisplayAll)
}
state.FileTreeViewModel.SetFiles(files)
state.FileTreeViewModel.RWMutex.Unlock()