mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-24 10:13:41 -05:00
Stefan Haller
bee03d3b98
Git limits its tree diff by the pathspec before it looks for renames, so a directory only ever gets one end of a rename whose other end is outside it. Nothing is left to pair up, and the file turns into an addition or a deletion that the commit doesn't contain. Pass the other end along with the directory. This is bounded by the number of renames that cross the directory's boundary, so it costs nothing at all for the vast majority of commits.
80 lines
2.2 KiB
Go
80 lines
2.2 KiB
Go
package controllers
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/filetree"
|
|
"github.com/samber/lo"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestPathsForDiff(t *testing.T) {
|
|
files := []*models.CommitFile{
|
|
{Path: "dir/file1", PreviousPath: "file1", ChangeStatus: "R"},
|
|
{Path: "dir/file2-renamed", PreviousPath: "dir/file2", ChangeStatus: "R"},
|
|
{Path: "dir/sub/file3", ChangeStatus: "M"},
|
|
{Path: "file4", PreviousPath: "dir/sub/file4", ChangeStatus: "R"},
|
|
{Path: "file5", ChangeStatus: "M"},
|
|
}
|
|
|
|
scenarios := []struct {
|
|
testName string
|
|
selectedPath string
|
|
isFiltering bool
|
|
expectedPaths []string
|
|
}{
|
|
{
|
|
testName: "file",
|
|
selectedPath: "dir/sub/file3",
|
|
expectedPaths: []string{"dir/sub/file3"},
|
|
},
|
|
{
|
|
testName: "renamed file",
|
|
selectedPath: "dir/file1",
|
|
expectedPaths: []string{"dir/file1", "file1"},
|
|
},
|
|
{
|
|
testName: "directory: pass the other end of each rename that crosses its boundary",
|
|
selectedPath: "dir",
|
|
// dir/file2-renamed was renamed within the directory, so both of its
|
|
// paths are covered by it already
|
|
expectedPaths: []string{"dir", "file1", "file4"},
|
|
},
|
|
{
|
|
testName: "directory without renames crossing its boundary",
|
|
selectedPath: "dir/sub",
|
|
expectedPaths: []string{"dir/sub", "file4"},
|
|
},
|
|
{
|
|
testName: "root",
|
|
selectedPath: ".",
|
|
expectedPaths: []string{"."},
|
|
},
|
|
{
|
|
testName: "directory while filtering",
|
|
selectedPath: "dir",
|
|
isFiltering: true,
|
|
expectedPaths: []string{
|
|
"dir/file1", "file1",
|
|
"dir/file2-renamed", "dir/file2",
|
|
"dir/sub/file3",
|
|
"file4", "dir/sub/file4",
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, s := range scenarios {
|
|
t.Run(s.testName, func(t *testing.T) {
|
|
cmp := filetree.NodeSortComparator[models.CommitFile]("mixed", true)
|
|
root := filetree.BuildTreeFromCommitFiles(files, true, cmp)
|
|
node, found := lo.Find(root.Flatten(filetree.NewCollapsedPaths()), func(node *filetree.Node[models.CommitFile]) bool {
|
|
return node.GetPath() == s.selectedPath
|
|
})
|
|
assert.True(t, found, "no node for path %s", s.selectedPath)
|
|
|
|
assert.Equal(t, s.expectedPaths, pathsForDiff(node, root, s.isFiltering))
|
|
})
|
|
}
|
|
}
|