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
|
package lstree
import (
"bytes"
"io"
"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 TestParser(t *testing.T) {
t.Parallel()
ctx := testhelper.Context(t)
cfg := testcfg.Build(t)
_, repoPath := gittest.CreateRepository(t, ctx, cfg, gittest.CreateRepositoryConfig{
SkipCreationViaService: true,
})
gitignoreBlobID := gittest.WriteBlob(t, cfg, repoPath, []byte("gitignore"))
gitmodulesBlobID := gittest.WriteBlob(t, cfg, repoPath, []byte("gitmodules"))
submoduleCommitID := gittest.WriteCommit(t, cfg, repoPath)
regularEntriesTreeID := gittest.WriteTree(t, cfg, repoPath, []gittest.TreeEntry{
{Path: ".gitignore", Mode: "100644", OID: gitignoreBlobID},
{Path: ".gitmodules", Mode: "100644", OID: gitmodulesBlobID},
{Path: "entry with space", Mode: "040000", OID: gittest.DefaultObjectHash.EmptyTreeOID},
{Path: "gitlab-shell", Mode: "160000", OID: submoduleCommitID},
})
for _, tc := range []struct {
desc string
treeID git.ObjectID
expectedEntries localrepo.Entries
}{
{
desc: "regular entries",
treeID: regularEntriesTreeID,
expectedEntries: localrepo.Entries{
{
Mode: "100644",
Type: localrepo.Blob,
OID: gitignoreBlobID,
Path: ".gitignore",
},
{
Mode: "100644",
Type: localrepo.Blob,
OID: gitmodulesBlobID,
Path: ".gitmodules",
},
{
Mode: "040000",
Type: localrepo.Tree,
OID: gittest.DefaultObjectHash.EmptyTreeOID,
Path: "entry with space",
},
{
Mode: "160000",
Type: localrepo.Submodule,
OID: submoduleCommitID,
Path: "gitlab-shell",
},
},
},
} {
t.Run(tc.desc, func(t *testing.T) {
treeData := gittest.Exec(t, cfg, "-C", repoPath, "ls-tree", "-z", tc.treeID.String())
parser := NewParser(bytes.NewReader(treeData), gittest.DefaultObjectHash)
parsedEntries := localrepo.Entries{}
for {
entry, err := parser.NextEntry()
if err == io.EOF {
break
}
require.NoError(t, err)
parsedEntries = append(parsedEntries, *entry)
}
require.Equal(t, tc.expectedEntries, parsedEntries)
})
}
}
func TestParserReadEntryPath(t *testing.T) {
t.Parallel()
ctx := testhelper.Context(t)
cfg := testcfg.Build(t)
_, repoPath := gittest.CreateRepository(t, ctx, cfg, gittest.CreateRepositoryConfig{
SkipCreationViaService: true,
})
regularEntriesTreeID := gittest.WriteTree(t, cfg, repoPath, []gittest.TreeEntry{
{Path: ".gitignore", Mode: "100644", OID: gittest.WriteBlob(t, cfg, repoPath, []byte("gitignore"))},
{Path: ".gitmodules", Mode: "100644", OID: gittest.WriteBlob(t, cfg, repoPath, []byte("gitmodules"))},
{Path: "entry with space", Mode: "040000", OID: gittest.DefaultObjectHash.EmptyTreeOID},
{Path: "gitlab-shell", Mode: "160000", OID: gittest.WriteCommit(t, cfg, repoPath)},
{Path: "\"file with quote.txt", Mode: "100644", OID: gittest.WriteBlob(t, cfg, repoPath, []byte("file with quotes"))},
{Path: "cuộc đời là những chuyến đi.md", Mode: "100644", OID: gittest.WriteBlob(t, cfg, repoPath, []byte("file with non-ascii file name"))},
{Path: "编码 'foo'.md", Mode: "100644", OID: gittest.WriteBlob(t, cfg, repoPath, []byte("file with non-ascii file name"))},
})
for _, tc := range []struct {
desc string
treeID git.ObjectID
expectedPaths [][]byte
}{
{
desc: "regular entries",
treeID: regularEntriesTreeID,
expectedPaths: [][]byte{
[]byte("\"file with quote.txt"),
[]byte(".gitignore"),
[]byte(".gitmodules"),
[]byte("cuộc đời là những chuyến đi.md"),
[]byte("entry with space"),
[]byte("gitlab-shell"),
[]byte("编码 'foo'.md"),
},
},
} {
t.Run(tc.desc, func(t *testing.T) {
treeData := gittest.Exec(t, cfg, "-C", repoPath, "ls-tree", "--name-only", "-z", tc.treeID.String())
parser := NewParser(bytes.NewReader(treeData), gittest.DefaultObjectHash)
parsedPaths := [][]byte{}
for {
path, err := parser.NextEntryPath()
if err == io.EOF {
break
}
require.NoError(t, err)
parsedPaths = append(parsedPaths, path)
}
require.Equal(t, tc.expectedPaths, parsedPaths)
})
}
}
|
