2021-03-21 06:25:29 +02:00
|
|
|
package filetree
|
2020-11-15 01:45:55 +02:00
|
|
|
|
|
|
|
import (
|
|
|
|
"os"
|
2021-03-14 05:41:11 +02:00
|
|
|
"path/filepath"
|
2021-03-21 00:57:13 +02:00
|
|
|
"sort"
|
2020-11-15 01:45:55 +02:00
|
|
|
"strings"
|
|
|
|
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
|
|
)
|
|
|
|
|
2021-03-21 06:58:15 +02:00
|
|
|
func BuildTreeFromFiles(files []*models.File) *FileChangeNode {
|
|
|
|
root := &FileChangeNode{}
|
2020-11-15 01:45:55 +02:00
|
|
|
|
2021-03-21 06:58:15 +02:00
|
|
|
var curr *FileChangeNode
|
2020-11-15 01:45:55 +02:00
|
|
|
for _, file := range files {
|
|
|
|
split := strings.Split(file.Name, string(os.PathSeparator))
|
|
|
|
curr = root
|
|
|
|
outer:
|
2021-03-20 23:41:06 +02:00
|
|
|
for i := range split {
|
2020-11-15 01:45:55 +02:00
|
|
|
var setFile *models.File
|
2021-03-20 23:41:06 +02:00
|
|
|
isFile := i == len(split)-1
|
|
|
|
if isFile {
|
2020-11-15 01:45:55 +02:00
|
|
|
setFile = file
|
|
|
|
}
|
2021-03-20 23:41:06 +02:00
|
|
|
|
|
|
|
path := filepath.Join(split[:i+1]...)
|
|
|
|
|
2020-11-15 01:45:55 +02:00
|
|
|
for _, existingChild := range curr.Children {
|
2021-03-20 23:41:06 +02:00
|
|
|
if existingChild.Path == path {
|
2020-11-15 01:45:55 +02:00
|
|
|
curr = existingChild
|
|
|
|
continue outer
|
|
|
|
}
|
|
|
|
}
|
2021-03-20 23:41:06 +02:00
|
|
|
|
2021-03-21 06:58:15 +02:00
|
|
|
newChild := &FileChangeNode{
|
2021-03-20 23:41:06 +02:00
|
|
|
Path: path,
|
2020-11-15 01:45:55 +02:00
|
|
|
File: setFile,
|
|
|
|
}
|
|
|
|
curr.Children = append(curr.Children, newChild)
|
|
|
|
|
|
|
|
curr = newChild
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-14 10:38:59 +02:00
|
|
|
root.Sort()
|
|
|
|
root.Compress()
|
2020-11-15 01:45:55 +02:00
|
|
|
|
|
|
|
return root
|
|
|
|
}
|
2021-03-20 23:41:06 +02:00
|
|
|
|
2021-03-21 06:58:15 +02:00
|
|
|
func BuildFlatTreeFromFiles(files []*models.File) *FileChangeNode {
|
2021-03-21 06:25:29 +02:00
|
|
|
rootAux := BuildTreeFromFiles(files)
|
2021-03-21 01:46:43 +02:00
|
|
|
sortedFiles := rootAux.GetLeaves()
|
2021-03-21 00:06:15 +02:00
|
|
|
|
2021-03-21 00:57:13 +02:00
|
|
|
// Move merge conflicts to top. This is the one way in which sorting
|
|
|
|
// differs between flat mode and tree mode
|
2021-03-21 01:46:43 +02:00
|
|
|
sort.SliceStable(sortedFiles, func(i, j int) bool {
|
|
|
|
return sortedFiles[i].File != nil && sortedFiles[i].File.HasMergeConflicts && !(sortedFiles[j].File != nil && sortedFiles[j].File.HasMergeConflicts)
|
2021-03-21 00:57:13 +02:00
|
|
|
})
|
|
|
|
|
2021-03-21 06:58:15 +02:00
|
|
|
return &FileChangeNode{Children: sortedFiles}
|
2021-03-20 23:41:06 +02:00
|
|
|
}
|