go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-15 01:34:26 +02:00
Code Issues Releases Activity

Add new filter to only show tracked files in Files panel

Browse Source 
This allows to hide all non-tracked files on large repos
This commit is contained in:
Yaroslav Veremenko
2024-11-01 16:21:09 -06:00
committed by Jesse Duffield
parent b0a766cc95
commit fdeaf9cea0
4 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/gui/controllers/files_controller.go
View File

@ -695,6 +695,13 @@ func (self *FilesController) handleStatusFilterPressed() error {
}, },
Key: 'u', Key: 'u',
}, },
{
Label: self.c.Tr.FilterTrackedFiles,
OnPress: func() error {
return self.setStatusFiltering(filetree.DisplayTracked)
},
Key: 't',
},
{ {
Label: self.c.Tr.ResetFilter, Label: self.c.Tr.ResetFilter,
OnPress: func() error { OnPress: func() error {

3
pkg/gui/filetree/file_tree.go
View File

@ -15,6 +15,7 @@ const (
DisplayAll FileTreeDisplayFilter = iota DisplayAll FileTreeDisplayFilter = iota
DisplayStaged DisplayStaged
DisplayUnstaged DisplayUnstaged
DisplayTracked
// this shows files with merge conflicts // this shows files with merge conflicts
DisplayConflicted DisplayConflicted
) )
@ -82,6 +83,8 @@ func (self *FileTree) getFilesForDisplay() []*models.File {
return self.FilterFiles(func(file *models.File) bool { return file.HasStagedChanges }) return self.FilterFiles(func(file *models.File) bool { return file.HasStagedChanges })
case DisplayUnstaged: case DisplayUnstaged:
return self.FilterFiles(func(file *models.File) bool { return file.HasUnstagedChanges }) return self.FilterFiles(func(file *models.File) bool { return file.HasUnstagedChanges })
case DisplayTracked:
return self.FilterFiles(func(file *models.File) bool { return file.Tracked })
case DisplayConflicted: case DisplayConflicted:
return self.FilterFiles(func(file *models.File) bool { return file.HasMergeConflicts }) return self.FilterFiles(func(file *models.File) bool { return file.HasMergeConflicts })
default: default:

13
pkg/gui/filetree/file_tree_test.go
View File

@ -40,6 +40,19 @@ func TestFilterAction(t *testing.T) {
{Name: "file1", ShortStatus: "M ", HasStagedChanges: true}, {Name: "file1", ShortStatus: "M ", HasStagedChanges: true},
}, },
}, },
{
name: "filter files that are tracked",
filter: DisplayTracked,
files: []*models.File{
{Name: "dir2/dir2/file4", ShortStatus: "M ", Tracked: true},
{Name: "dir2/file5", ShortStatus: "M ", Tracked: false},
{Name: "file1", ShortStatus: "M ", Tracked: true},
},
expected: []*models.File{
{Name: "dir2/dir2/file4", ShortStatus: "M ", Tracked: true},
{Name: "file1", ShortStatus: "M ", Tracked: true},
},
},
{ {
name: "filter all files", name: "filter all files",
filter: DisplayAll, filter: DisplayAll,

2
pkg/i18n/english.go
View File

@ -87,6 +87,7 @@ type TranslationSet struct {
AllFilesDiffCopiedToast string AllFilesDiffCopiedToast string
FilterStagedFiles string FilterStagedFiles string
FilterUnstagedFiles string FilterUnstagedFiles string
FilterTrackedFiles string
ResetFilter string ResetFilter string
MergeConflictsTitle string MergeConflictsTitle string
Checkout string Checkout string
@ -1075,6 +1076,7 @@ func EnglishTranslationSet() *TranslationSet {
AllFilesDiffCopiedToast: "All files diff copied to clipboard", AllFilesDiffCopiedToast: "All files diff copied to clipboard",
FilterStagedFiles: "Show only staged files", FilterStagedFiles: "Show only staged files",
FilterUnstagedFiles: "Show only unstaged files", FilterUnstagedFiles: "Show only unstaged files",
FilterTrackedFiles: "Show only tracked files",
ResetFilter: "Reset filter", ResetFilter: "Reset filter",
NoChangedFiles: "No changed files", NoChangedFiles: "No changed files",
SoftReset: "Soft reset", SoftReset: "Soft reset",