sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

refactor to no longer call these things file changes

Browse Source
This commit is contained in:
Jesse Duffield
2021-03-31 23:26:53 +11:00
parent 8dee06f83a
commit 9e85d37fb9
19 changed files with 339 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/gui/filetree/build_tree.go
View File

@ -9,10 +9,10 @@ import (
"github.com/jesseduffield/lazygit/pkg/commands/models"
)
func BuildTreeFromFiles(files []*models.File) *FileChangeNode {
root := &FileChangeNode{}
func BuildTreeFromFiles(files []*models.File) *FileNode {
root := &FileNode{}
var curr *FileChangeNode
var curr *FileNode
for _, file := range files {
split := strings.Split(file.Name, string(os.PathSeparator))
curr = root
@ -33,7 +33,7 @@ func BuildTreeFromFiles(files []*models.File) *FileChangeNode {
}
}
newChild := &FileChangeNode{
newChild := &FileNode{
Path: path,
File: setFile,
}
@ -49,17 +49,17 @@ func BuildTreeFromFiles(files []*models.File) *FileChangeNode {
return root
}
func BuildFlatTreeFromCommitFiles(files []*models.CommitFile) *CommitFileChangeNode {
func BuildFlatTreeFromCommitFiles(files []*models.CommitFile) *CommitFileNode {
rootAux := BuildTreeFromCommitFiles(files)
sortedFiles := rootAux.GetLeaves()
return &CommitFileChangeNode{Children: sortedFiles}
return &CommitFileNode{Children: sortedFiles}
}
func BuildTreeFromCommitFiles(files []*models.CommitFile) *CommitFileChangeNode {
root := &CommitFileChangeNode{}
func BuildTreeFromCommitFiles(files []*models.CommitFile) *CommitFileNode {
root := &CommitFileNode{}
var curr *CommitFileChangeNode
var curr *CommitFileNode
for _, file := range files {
split := strings.Split(file.Name, string(os.PathSeparator))
curr = root
@ -80,7 +80,7 @@ func BuildTreeFromCommitFiles(files []*models.CommitFile) *CommitFileChangeNode
}
}
newChild := &CommitFileChangeNode{
newChild := &CommitFileNode{
Path: path,
File: setFile,
}
@ -96,7 +96,7 @@ func BuildTreeFromCommitFiles(files []*models.CommitFile) *CommitFileChangeNode
return root
}
func BuildFlatTreeFromFiles(files []*models.File) *FileChangeNode {
func BuildFlatTreeFromFiles(files []*models.File) *FileNode {
rootAux := BuildTreeFromFiles(files)
sortedFiles := rootAux.GetLeaves()
@ -106,5 +106,5 @@ func BuildFlatTreeFromFiles(files []*models.File) *FileChangeNode {
return sortedFiles[i].File != nil && sortedFiles[i].File.HasMergeConflicts && !(sortedFiles[j].File != nil && sortedFiles[j].File.HasMergeConflicts)
})
return &FileChangeNode{Children: sortedFiles}
return &FileNode{Children: sortedFiles}
}