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
|
// +build static,system_libgit2
package command
import (
"testing"
"time"
git "github.com/libgit2/git2go/v30"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
"gitlab.com/gitlab-org/gitaly/internal/testhelper"
)
func TestMergeFailsWithMissingArguments(t *testing.T) {
_, repoPath, cleanup := testhelper.NewTestRepo(t)
defer cleanup()
testcases := []struct {
desc string
request git2go.MergeCommand
expectedErr string
}{
{
desc: "no arguments",
expectedErr: "merge: invalid parameters: missing repository",
},
{
desc: "missing repository",
request: git2go.MergeCommand{AuthorName: "Foo", AuthorMail: "foo@example.com", Message: "Foo", Ours: "HEAD", Theirs: "HEAD"},
expectedErr: "merge: invalid parameters: missing repository",
},
{
desc: "missing author name",
request: git2go.MergeCommand{Repository: repoPath, AuthorMail: "foo@example.com", Message: "Foo", Ours: "HEAD", Theirs: "HEAD"},
expectedErr: "merge: invalid parameters: missing author name",
},
{
desc: "missing author mail",
request: git2go.MergeCommand{Repository: repoPath, AuthorName: "Foo", Message: "Foo", Ours: "HEAD", Theirs: "HEAD"},
expectedErr: "merge: invalid parameters: missing author mail",
},
{
desc: "missing message",
request: git2go.MergeCommand{Repository: repoPath, AuthorName: "Foo", AuthorMail: "foo@example.com", Ours: "HEAD", Theirs: "HEAD"},
expectedErr: "merge: invalid parameters: missing message",
},
{
desc: "missing ours",
request: git2go.MergeCommand{Repository: repoPath, AuthorName: "Foo", AuthorMail: "foo@example.com", Message: "Foo", Theirs: "HEAD"},
expectedErr: "merge: invalid parameters: missing ours",
},
{
desc: "missing theirs",
request: git2go.MergeCommand{Repository: repoPath, AuthorName: "Foo", AuthorMail: "foo@example.com", Message: "Foo", Ours: "HEAD"},
expectedErr: "merge: invalid parameters: missing theirs",
},
}
for _, tc := range testcases {
t.Run(tc.desc, func(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
_, err := tc.request.Run(ctx, config.Config)
require.Error(t, err)
require.Equal(t, tc.expectedErr, err.Error())
})
}
}
func TestMergeFailsWithInvalidRepositoryPath(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
_, err := git2go.MergeCommand{
Repository: "/does/not/exist", AuthorName: "Foo", AuthorMail: "foo@example.com", Message: "Foo", Ours: "HEAD", Theirs: "HEAD",
}.Run(ctx, config.Config)
require.Error(t, err)
require.Contains(t, err.Error(), "merge: could not open repository")
}
func buildCommit(t testing.TB, repoPath string, parent *git.Oid, fileContents map[string]string) *git.Oid {
repo, err := git.OpenRepository(repoPath)
require.NoError(t, err)
defer repo.Free()
odb, err := repo.Odb()
require.NoError(t, err)
treeBuilder, err := repo.TreeBuilder()
require.NoError(t, err)
for file, contents := range fileContents {
oid, err := odb.Write([]byte(contents), git.ObjectBlob)
require.NoError(t, err)
treeBuilder.Insert(file, oid, git.FilemodeBlob)
}
tree, err := treeBuilder.Write()
require.NoError(t, err)
committer := git.Signature{
Name: "Foo",
Email: "foo@example.com",
When: time.Date(2020, 1, 1, 1, 1, 1, 1, time.FixedZone("UTC+2", 2*60*60)),
}
var commit *git.Oid
if parent != nil {
commit, err = repo.CreateCommitFromIds("", &committer, &committer, "Message", tree, parent)
} else {
commit, err = repo.CreateCommitFromIds("", &committer, &committer, "Message", tree)
}
require.NoError(t, err)
return commit
}
func TestMergeTrees(t *testing.T) {
testcases := []struct {
desc string
base map[string]string
ours map[string]string
theirs map[string]string
expected map[string]string
expectedResponse git2go.MergeResult
expectedStderr string
}{
{
desc: "trivial merge succeeds",
base: map[string]string{
"file": "a",
},
ours: map[string]string{
"file": "a",
},
theirs: map[string]string{
"file": "a",
},
expected: map[string]string{
"file": "a",
},
expectedResponse: git2go.MergeResult{
CommitID: "7d5ae8fb6d2b301c53560bd728004d77778998df",
},
},
{
desc: "non-trivial merge succeeds",
base: map[string]string{
"file": "a\nb\nc\nd\ne\nf\n",
},
ours: map[string]string{
"file": "0\na\nb\nc\nd\ne\nf\n",
},
theirs: map[string]string{
"file": "a\nb\nc\nd\ne\nf\n0\n",
},
expected: map[string]string{
"file": "0\na\nb\nc\nd\ne\nf\n0\n",
},
expectedResponse: git2go.MergeResult{
CommitID: "348b9b489c3ca128a4555c7a51b20335262519c7",
},
},
{
desc: "multiple files succeed",
base: map[string]string{
"1": "foo",
"2": "bar",
"3": "qux",
},
ours: map[string]string{
"1": "foo",
"2": "modified",
"3": "qux",
},
theirs: map[string]string{
"1": "modified",
"2": "bar",
"3": "qux",
},
expected: map[string]string{
"1": "modified",
"2": "modified",
"3": "qux",
},
expectedResponse: git2go.MergeResult{
CommitID: "e9be4578f89ea52d44936fb36517e837d698b34b",
},
},
{
desc: "conflicting merge fails",
base: map[string]string{
"1": "foo",
},
ours: map[string]string{
"1": "bar",
},
theirs: map[string]string{
"1": "qux",
},
expectedStderr: "merge: could not auto-merge due to conflicts\n",
},
}
for _, tc := range testcases {
_, repoPath, cleanup := testhelper.NewTestRepo(t)
defer cleanup()
base := buildCommit(t, repoPath, nil, tc.base)
ours := buildCommit(t, repoPath, base, tc.ours)
theirs := buildCommit(t, repoPath, base, tc.theirs)
authorDate := time.Date(2020, 7, 30, 7, 45, 50, 0, time.FixedZone("UTC+2", +2*60*60))
t.Run(tc.desc, func(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
response, err := git2go.MergeCommand{
Repository: repoPath,
AuthorName: "John Doe",
AuthorMail: "john.doe@example.com",
AuthorDate: authorDate,
Message: "Merge message",
Ours: ours.String(),
Theirs: theirs.String(),
}.Run(ctx, config.Config)
if tc.expectedStderr != "" {
require.Error(t, err)
require.Contains(t, err.Error(), tc.expectedStderr)
return
}
require.NoError(t, err)
assert.Equal(t, tc.expectedResponse, response)
repo, err := git.OpenRepository(repoPath)
require.NoError(t, err)
defer repo.Free()
commitOid, err := git.NewOid(response.CommitID)
require.NoError(t, err)
commit, err := repo.LookupCommit(commitOid)
require.NoError(t, err)
tree, err := commit.Tree()
require.NoError(t, err)
require.EqualValues(t, len(tc.expected), 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())
}
})
}
}
|
