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
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
|
//go:build static && system_libgit2 && !gitaly_test_sha256
package main
import (
"testing"
"time"
git "github.com/libgit2/git2go/v33"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
"gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest"
"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
)
func TestCherryPick_validation(t *testing.T) {
cfg, repo, repoPath := testcfg.BuildWithRepo(t)
testcfg.BuildGitalyGit2Go(t, cfg)
executor := buildExecutor(t, cfg)
testcases := []struct {
desc string
request git2go.CherryPickCommand
expectedErr string
}{
{
desc: "no arguments",
expectedErr: "cherry-pick: missing repository",
},
{
desc: "missing repository",
request: git2go.CherryPickCommand{CommitterName: "Foo", CommitterMail: "foo@example.com", CommitterDate: time.Now(), Message: "Foo", Ours: "HEAD", Commit: "HEAD"},
expectedErr: "cherry-pick: missing repository",
},
{
desc: "missing committer name",
request: git2go.CherryPickCommand{Repository: repoPath, CommitterMail: "foo@example.com", CommitterDate: time.Now(), Message: "Foo", Ours: "HEAD", Commit: "HEAD"},
expectedErr: "cherry-pick: missing committer name",
},
{
desc: "missing committer mail",
request: git2go.CherryPickCommand{Repository: repoPath, CommitterName: "Foo", CommitterDate: time.Now(), Message: "Foo", Ours: "HEAD", Commit: "HEAD"},
expectedErr: "cherry-pick: missing committer mail",
},
{
desc: "missing committer date",
request: git2go.CherryPickCommand{Repository: repoPath, CommitterName: "Foo", CommitterMail: "foo@example.com", Message: "Foo", Ours: "HEAD", Commit: "HEAD"},
expectedErr: "cherry-pick: missing committer date",
},
{
desc: "missing message",
request: git2go.CherryPickCommand{Repository: repoPath, CommitterName: "Foo", CommitterMail: "foo@example.com", CommitterDate: time.Now(), Ours: "HEAD", Commit: "HEAD"},
expectedErr: "cherry-pick: missing message",
},
{
desc: "missing ours",
request: git2go.CherryPickCommand{Repository: repoPath, CommitterName: "Foo", CommitterMail: "foo@example.com", CommitterDate: time.Now(), Message: "Foo", Commit: "HEAD"},
expectedErr: "cherry-pick: missing ours",
},
{
desc: "missing commit",
request: git2go.CherryPickCommand{Repository: repoPath, CommitterName: "Foo", CommitterMail: "foo@example.com", CommitterDate: time.Now(), Message: "Foo", Ours: "HEAD"},
expectedErr: "cherry-pick: missing commit",
},
}
for _, tc := range testcases {
t.Run(tc.desc, func(t *testing.T) {
ctx := testhelper.Context(t)
_, err := executor.CherryPick(ctx, repo, tc.request)
require.EqualError(t, err, tc.expectedErr)
})
}
}
func TestCherryPick(t *testing.T) {
testcases := []struct {
desc string
base []gittest.TreeEntry
ours []gittest.TreeEntry
commit []gittest.TreeEntry
expected map[string]string
expectedCommitID string
expectedErr error
expectedErrMsg string
}{
{
desc: "trivial cherry-pick succeeds",
base: []gittest.TreeEntry{
{Path: "file", Content: "foo", Mode: "100644"},
},
ours: []gittest.TreeEntry{
{Path: "file", Content: "foo", Mode: "100644"},
},
commit: []gittest.TreeEntry{
{Path: "file", Content: "foobar", Mode: "100644"},
},
expected: map[string]string{
"file": "foobar",
},
expectedCommitID: "a54ea83118c363c34cc605a6e61fd7abc4795cc4",
},
{
desc: "conflicting cherry-pick fails",
base: []gittest.TreeEntry{
{Path: "file", Content: "foo", Mode: "100644"},
},
ours: []gittest.TreeEntry{
{Path: "file", Content: "fooqux", Mode: "100644"},
},
commit: []gittest.TreeEntry{
{Path: "file", Content: "foobar", Mode: "100644"},
},
expectedErr: git2go.ConflictingFilesError{},
expectedErrMsg: "cherry-pick: there are conflicting files",
},
{
desc: "empty cherry-pick fails",
base: []gittest.TreeEntry{
{Path: "file", Content: "foo", Mode: "100644"},
},
ours: []gittest.TreeEntry{
{Path: "file", Content: "fooqux", Mode: "100644"},
},
commit: []gittest.TreeEntry{
{Path: "file", Content: "fooqux", Mode: "100644"},
},
expectedErr: git2go.EmptyError{},
expectedErrMsg: "cherry-pick: could not apply because the result was empty",
},
{
desc: "fails on nonexistent ours commit",
expectedErrMsg: "cherry-pick: ours commit lookup: lookup commit \"nonexistent\": revspec 'nonexistent' not found",
},
{
desc: "fails on nonexistent cherry-pick commit",
ours: []gittest.TreeEntry{
{Path: "file", Content: "fooqux", Mode: "100644"},
},
expectedErrMsg: "cherry-pick: commit lookup: lookup commit \"nonexistent\": revspec 'nonexistent' not found",
},
}
for _, tc := range testcases {
cfg, repo, repoPath := testcfg.BuildWithRepo(t)
testcfg.BuildGitalyGit2Go(t, cfg)
executor := buildExecutor(t, cfg)
base := gittest.WriteCommit(t, cfg, repoPath, gittest.WithParents(), gittest.WithTreeEntries(tc.base...))
ours, commit := "nonexistent", "nonexistent"
if len(tc.ours) > 0 {
ours = gittest.WriteCommit(t, cfg, repoPath, gittest.WithParents(base), gittest.WithTreeEntries(tc.ours...)).String()
}
if len(tc.commit) > 0 {
commit = gittest.WriteCommit(t, cfg, repoPath, gittest.WithParents(base), gittest.WithTreeEntries(tc.commit...)).String()
}
t.Run(tc.desc, func(t *testing.T) {
ctx := testhelper.Context(t)
committer := git.Signature{
Name: "Baz",
Email: "baz@example.com",
When: time.Date(2021, 1, 17, 14, 45, 51, 0, time.FixedZone("", +2*60*60)),
}
response, err := executor.CherryPick(ctx, repo, git2go.CherryPickCommand{
Repository: repoPath,
CommitterName: committer.Name,
CommitterMail: committer.Email,
CommitterDate: committer.When,
Message: "Foo",
Ours: ours,
Commit: commit,
})
if tc.expectedErrMsg != "" {
require.EqualError(t, err, tc.expectedErrMsg)
if tc.expectedErr != nil {
require.ErrorAs(t, err, &tc.expectedErr)
}
return
}
require.NoError(t, err)
assert.Equal(t, tc.expectedCommitID, response.String())
repo, err := git2goutil.OpenRepository(repoPath)
require.NoError(t, err)
defer repo.Free()
commitOid, err := git.NewOid(response.String())
require.NoError(t, err)
commit, err := repo.LookupCommit(commitOid)
require.NoError(t, err)
require.Equal(t, &DefaultAuthor, commit.Author())
require.Equal(t, &committer, commit.Committer())
tree, err := commit.Tree()
require.NoError(t, err)
require.Len(t, tc.expected, int(tree.EntryCount()))
for name, contents := range tc.expected {
entry := tree.EntryByName(name)
require.NotNil(t, entry)
blob, err := repo.LookupBlob(entry.Id)
require.NoError(t, err)
require.Equal(t, []byte(contents), blob.Contents())
}
})
}
}
func TestCherryPickStructuredErrors(t *testing.T) {
ctx := testhelper.Context(t)
cfg, repo, repoPath := testcfg.BuildWithRepo(t)
testcfg.BuildGitalyGit2Go(t, cfg)
executor := buildExecutor(t, cfg)
base := gittest.WriteCommit(
t,
cfg,
repoPath,
gittest.WithParents(),
gittest.WithTreeEntries(gittest.TreeEntry{
Path: "file", Content: "foo", Mode: "100644",
}))
ours := gittest.WriteCommit(
t,
cfg,
repoPath,
gittest.WithParents(base),
gittest.WithTreeEntries(
gittest.TreeEntry{Path: "file", Content: "fooqux", Mode: "100644"},
)).String()
commit := gittest.WriteCommit(
t,
cfg,
repoPath,
gittest.WithParents(base),
gittest.WithTreeEntries(
gittest.TreeEntry{Path: "file", Content: "foobar", Mode: "100644"},
)).String()
committer := git.Signature{
Name: "Baz",
Email: "baz@example.com",
When: time.Date(2021, 1, 17, 14, 45, 51, 0, time.FixedZone("", +2*60*60)),
}
_, err := executor.CherryPick(ctx, repo, git2go.CherryPickCommand{
Repository: repoPath,
CommitterName: committer.Name,
CommitterMail: committer.Email,
CommitterDate: committer.When,
Message: "Foo",
Ours: ours,
Commit: commit,
})
require.EqualError(t, err, "cherry-pick: there are conflicting files")
require.ErrorAs(t, err, &git2go.ConflictingFilesError{})
}
|
