1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
//go:build !gitaly_test_sha256
package lstree
import (
"testing"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/v15/internal/git"
"gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest"
"gitlab.com/gitlab-org/gitaly/v15/internal/git/localrepo"
"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
)
func TestListEntries(t *testing.T) {
t.Parallel()
cfg := testcfg.Build(t)
ctx := testhelper.Context(t)
repoProto, repoPath := gittest.InitRepo(t, cfg, cfg.Storages[0])
repo := localrepo.NewTestRepo(t, cfg, repoProto)
blobID := gittest.WriteBlob(t, cfg, repoPath, []byte("blob contents"))
emptyTreeID := gittest.WriteTree(t, cfg, repoPath, []gittest.TreeEntry{})
treeWithBlob := gittest.WriteTree(t, cfg, repoPath, []gittest.TreeEntry{
{OID: blobID, Mode: "100644", Path: "nonexecutable"},
{OID: blobID, Mode: "100755", Path: "executable"},
})
treeWithSubtree := gittest.WriteTree(t, cfg, repoPath, []gittest.TreeEntry{
{OID: emptyTreeID, Mode: "040000", Path: "subdir"},
})
treeWithNestedSubtrees := gittest.WriteTree(t, cfg, repoPath, []gittest.TreeEntry{
{OID: treeWithSubtree, Mode: "040000", Path: "nested-subdir"},
})
treeWithSubtreeAndBlob := gittest.WriteTree(t, cfg, repoPath, []gittest.TreeEntry{
{OID: treeWithSubtree, Mode: "040000", Path: "subdir"},
{OID: blobID, Mode: "100644", Path: "blob"},
})
treeWithSubtreeContainingBlob := gittest.WriteTree(t, cfg, repoPath, []gittest.TreeEntry{
{OID: treeWithSubtreeAndBlob, Mode: "040000", Path: "subdir"},
})
for _, tc := range []struct {
desc string
treeish git.Revision
cfg *ListEntriesConfig
expectedResults []*Entry
expectedErr error
}{
{
desc: "empty tree",
treeish: emptyTreeID.Revision(),
},
{
desc: "tree with blob",
treeish: treeWithBlob.Revision(),
expectedResults: []*Entry{
{Mode: []byte("100755"), Type: Blob, ObjectID: blobID, Path: "executable"},
{Mode: []byte("100644"), Type: Blob, ObjectID: blobID, Path: "nonexecutable"},
},
},
{
desc: "tree with subtree",
treeish: treeWithSubtree.Revision(),
expectedResults: []*Entry{
{Mode: []byte("040000"), Type: Tree, ObjectID: emptyTreeID, Path: "subdir"},
},
},
{
desc: "nested trees",
treeish: treeWithNestedSubtrees.Revision(),
expectedResults: []*Entry{
{Mode: []byte("040000"), Type: Tree, ObjectID: treeWithSubtree, Path: "nested-subdir"},
},
},
{
desc: "recursive nested trees",
treeish: treeWithNestedSubtrees.Revision(),
cfg: &ListEntriesConfig{
Recursive: true,
},
expectedResults: []*Entry{
{Mode: []byte("040000"), Type: Tree, ObjectID: treeWithSubtree, Path: "nested-subdir"},
{Mode: []byte("040000"), Type: Tree, ObjectID: emptyTreeID, Path: "nested-subdir/subdir"},
},
},
{
desc: "nested subtree",
treeish: treeWithNestedSubtrees.Revision(),
cfg: &ListEntriesConfig{
RelativePath: "nested-subdir",
},
expectedResults: []*Entry{
{Mode: []byte("040000"), Type: Tree, ObjectID: emptyTreeID, Path: "subdir"},
},
},
{
desc: "nested recursive subtree",
treeish: treeWithSubtreeContainingBlob.Revision(),
cfg: &ListEntriesConfig{
RelativePath: "subdir",
Recursive: true,
},
expectedResults: []*Entry{
{Mode: []byte("100644"), Type: Blob, ObjectID: blobID, Path: "blob"},
{Mode: []byte("040000"), Type: Tree, ObjectID: treeWithSubtree, Path: "subdir"},
{Mode: []byte("040000"), Type: Tree, ObjectID: emptyTreeID, Path: "subdir/subdir"},
},
},
{
desc: "recursive nested trees and blobs",
treeish: treeWithSubtreeAndBlob.Revision(),
cfg: &ListEntriesConfig{
Recursive: true,
},
expectedResults: []*Entry{
{Mode: []byte("100644"), Type: Blob, ObjectID: blobID, Path: "blob"},
{Mode: []byte("040000"), Type: Tree, ObjectID: treeWithSubtree, Path: "subdir"},
{Mode: []byte("040000"), Type: Tree, ObjectID: emptyTreeID, Path: "subdir/subdir"},
},
},
{
desc: "listing blob fails",
treeish: blobID.Revision(),
// We get a NotExist error here because it's invalid to suffix an object ID
// which resolves to a blob with a colon (":") given that it's not possible
// to resolve a subpath.
expectedErr: ErrNotExist,
},
{
desc: "valid revision with invalid path",
treeish: treeWithSubtree.Revision(),
cfg: &ListEntriesConfig{
RelativePath: "does-not-exist",
},
expectedErr: ErrNotExist,
},
{
desc: "valid revision with path pointing to blob",
treeish: treeWithSubtreeAndBlob.Revision(),
cfg: &ListEntriesConfig{
RelativePath: "blob",
},
expectedErr: ErrNotTreeish,
},
{
desc: "listing nonexistent object fails",
treeish: "does-not-exist",
expectedErr: ErrNotExist,
},
} {
t.Run(tc.desc, func(t *testing.T) {
results, err := ListEntries(ctx, repo, tc.treeish, tc.cfg)
require.Equal(t, tc.expectedResults, results)
require.Equal(t, tc.expectedErr, err)
})
}
}
|
