go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-17 22:32:58 +02:00
Code Issues Releases Activity

rename

Browse Source
This commit is contained in:
Jesse Duffield 2021-03-21 15:17:09 +11:00
parent d2e1b35eee
commit 5bb48b51a0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/file_change_manager.go
View File

@ -63,9 +63,9 @@ func (m *FileChangeManager) SetFiles(files []*models.File) {
func (m *FileChangeManager) SetTree() { func (m *FileChangeManager) SetTree() {
if m.ShowTree { if m.ShowTree {
m.Tree = GetTreeFromStatusFiles(m.Files) m.Tree = GetTreeFromFiles(m.Files)
} else { } else {
m.Tree = GetFlatTreeFromStatusFiles(m.Files) m.Tree = GetFlatTreeFromFiles(m.Files)
} }
} }

6
pkg/gui/status_tree.go
View File

@ -9,7 +9,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/models"
) )
func GetTreeFromStatusFiles(files []*models.File) *models.FileChangeNode { func GetTreeFromFiles(files []*models.File) *models.FileChangeNode {
root := &models.FileChangeNode{} root := &models.FileChangeNode{}
var curr *models.FileChangeNode var curr *models.FileChangeNode
@ -49,8 +49,8 @@ func GetTreeFromStatusFiles(files []*models.File) *models.FileChangeNode {
return root return root
} }
func GetFlatTreeFromStatusFiles(files []*models.File) *models.FileChangeNode { func GetFlatTreeFromFiles(files []*models.File) *models.FileChangeNode {
rootAux := GetTreeFromStatusFiles(files) rootAux := GetTreeFromFiles(files)
sortedFiles := rootAux.GetLeaves() sortedFiles := rootAux.GetLeaves()
// Move merge conflicts to top. This is the one way in which sorting // Move merge conflicts to top. This is the one way in which sorting