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
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
|
package operations
import (
"fmt"
"io/ioutil"
"path/filepath"
"strings"
"testing"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/internal/git/log"
"gitlab.com/gitlab-org/gitaly/internal/helper/text"
"gitlab.com/gitlab-org/gitaly/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
"google.golang.org/grpc/codes"
)
var (
author = &gitalypb.User{
Name: []byte("John Doe"),
Email: []byte("johndoe@gitlab.com"),
}
branchName = "not-merged-branch"
startSha = "b83d6e391c22777fca1ed3012fce84f633d7fed0"
endSha = "54cec5282aa9f21856362fe321c800c236a61615"
commitMessage = []byte("Squash message")
)
func TestSuccessfulUserSquashRequest(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
stop, serverSocketPath := runOperationServiceServer(t)
defer stop()
client, conn := NewOperationClient(t, serverSocketPath)
defer conn.Close()
testRepo, _, cleanup := testhelper.NewTestRepo(t)
defer cleanup()
request := &gitalypb.UserSquashRequest{
Repository: testRepo,
User: user,
SquashId: "1",
Author: author,
CommitMessage: commitMessage,
StartSha: startSha,
EndSha: endSha,
}
response, err := client.UserSquash(ctx, request)
require.NoError(t, err)
require.Empty(t, response.GetGitError())
commit, err := log.GetCommit(ctx, testRepo, response.SquashSha)
require.NoError(t, err)
require.Equal(t, []string{startSha}, commit.ParentIds)
require.Equal(t, author.Name, commit.Author.Name)
require.Equal(t, author.Email, commit.Author.Email)
require.Equal(t, user.Name, commit.Committer.Name)
require.Equal(t, user.Email, commit.Committer.Email)
require.Equal(t, commitMessage, commit.Subject)
}
func ensureSplitIndexExists(t *testing.T, repoDir string) bool {
testhelper.MustRunCommand(t, nil, "git", "-C", repoDir, "update-index", "--add")
fis, err := ioutil.ReadDir(repoDir)
require.NoError(t, err)
for _, fi := range fis {
if strings.HasPrefix(fi.Name(), "sharedindex") {
return true
}
}
return false
}
func TestSuccessfulUserSquashRequestWith3wayMerge(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
stop, serverSocketPath := runOperationServiceServer(t)
defer stop()
client, conn := NewOperationClient(t, serverSocketPath)
defer conn.Close()
testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t)
defer cleanupFn()
request := &gitalypb.UserSquashRequest{
Repository: testRepo,
User: user,
SquashId: "1",
Author: author,
CommitMessage: commitMessage,
// The diff between two of these commits results in some changes to files/ruby/popen.rb
StartSha: "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9",
EndSha: "570e7b2abdd848b95f2f578043fc23bd6f6fd24d",
}
response, err := client.UserSquash(ctx, request)
require.NoError(t, err)
require.Empty(t, response.GetGitError())
commit, err := log.GetCommit(ctx, testRepo, response.SquashSha)
require.NoError(t, err)
require.Equal(t, []string{"6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"}, commit.ParentIds)
require.Equal(t, author.Name, commit.Author.Name)
require.Equal(t, author.Email, commit.Author.Email)
require.Equal(t, user.Name, commit.Committer.Name)
require.Equal(t, user.Email, commit.Committer.Email)
require.Equal(t, commitMessage, commit.Subject)
// Ensure Git metadata is cleaned up
worktreeList := text.ChompBytes(testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "worktree", "list", "--porcelain"))
expectedOut := fmt.Sprintf("worktree %s\nbare\n", testRepoPath)
require.Equal(t, expectedOut, worktreeList)
// Ensure actual worktree is removed
files, err := ioutil.ReadDir(filepath.Join(testRepoPath, "gitlab-worktree"))
require.NoError(t, err)
require.Equal(t, 0, len(files))
}
func TestSplitIndex(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
stop, serverSocketPath := runOperationServiceServer(t)
defer stop()
client, conn := NewOperationClient(t, serverSocketPath)
defer conn.Close()
testRepo, testRepoPath, cleanup := testhelper.NewTestRepo(t)
defer cleanup()
require.False(t, ensureSplitIndexExists(t, testRepoPath))
request := &gitalypb.UserSquashRequest{
Repository: testRepo,
User: user,
SquashId: "1",
Author: author,
CommitMessage: commitMessage,
StartSha: startSha,
EndSha: endSha,
}
response, err := client.UserSquash(ctx, request)
require.NoError(t, err)
require.Empty(t, response.GetGitError())
require.False(t, ensureSplitIndexExists(t, testRepoPath))
}
func TestSquashRequestWithRenamedFiles(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
stop, serverSocketPath := runOperationServiceServer(t)
defer stop()
client, conn := NewOperationClient(t, serverSocketPath)
defer conn.Close()
testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepoWithWorktree(t)
defer cleanupFn()
originalFilename := "original-file.txt"
renamedFilename := "renamed-file.txt"
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "config", "user.name", string(author.Name))
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "config", "user.email", string(author.Email))
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "checkout", "-b", "squash-rename-test", "master")
require.NoError(t, ioutil.WriteFile(filepath.Join(testRepoPath, originalFilename), []byte("This is a test"), 0644))
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "add", ".")
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "commit", "-m", "test file")
startCommitID := text.ChompBytes(testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "rev-parse", "HEAD"))
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "mv", originalFilename, renamedFilename)
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "commit", "-a", "-m", "renamed test file")
// Modify the original file in another branch
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "checkout", "-b", "squash-rename-branch", startCommitID)
require.NoError(t, ioutil.WriteFile(filepath.Join(testRepoPath, originalFilename), []byte("This is a change"), 0644))
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "commit", "-a", "-m", "test")
require.NoError(t, ioutil.WriteFile(filepath.Join(testRepoPath, originalFilename), []byte("This is another change"), 0644))
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "commit", "-a", "-m", "test")
endCommitID := text.ChompBytes(testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "rev-parse", "HEAD"))
request := &gitalypb.UserSquashRequest{
Repository: testRepo,
User: user,
SquashId: "1",
Author: author,
CommitMessage: commitMessage,
StartSha: startCommitID,
EndSha: endCommitID,
}
response, err := client.UserSquash(ctx, request)
require.NoError(t, err)
require.Empty(t, response.GetGitError())
commit, err := log.GetCommit(ctx, testRepo, response.SquashSha)
require.NoError(t, err)
require.Equal(t, []string{startCommitID}, commit.ParentIds)
require.Equal(t, author.Name, commit.Author.Name)
require.Equal(t, author.Email, commit.Author.Email)
require.Equal(t, user.Name, commit.Committer.Name)
require.Equal(t, user.Email, commit.Committer.Email)
require.Equal(t, commitMessage, commit.Subject)
}
func TestSuccessfulUserSquashRequestWithMissingFileOnTargetBranch(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
stop, serverSocketPath := runOperationServiceServer(t)
defer stop()
client, conn := NewOperationClient(t, serverSocketPath)
defer conn.Close()
testRepo, _, cleanup := testhelper.NewTestRepo(t)
defer cleanup()
conflictingStartSha := "bbd36ad238d14e1c03ece0f3358f545092dc9ca3"
request := &gitalypb.UserSquashRequest{
Repository: testRepo,
User: user,
SquashId: "1",
Author: author,
CommitMessage: commitMessage,
StartSha: conflictingStartSha,
EndSha: endSha,
}
response, err := client.UserSquash(ctx, request)
require.NoError(t, err)
require.Empty(t, response.GetGitError())
}
func TestFailedUserSquashRequestDueToValidations(t *testing.T) {
stop, serverSocketPath := runOperationServiceServer(t)
defer stop()
client, conn := NewOperationClient(t, serverSocketPath)
defer conn.Close()
testRepo, _, cleanup := testhelper.NewTestRepo(t)
defer cleanup()
testCases := []struct {
desc string
request *gitalypb.UserSquashRequest
code codes.Code
}{
{
desc: "empty Repository",
request: &gitalypb.UserSquashRequest{
Repository: nil,
User: user,
SquashId: "1",
Author: user,
CommitMessage: commitMessage,
StartSha: startSha,
EndSha: endSha,
},
code: codes.InvalidArgument,
},
{
desc: "empty User",
request: &gitalypb.UserSquashRequest{
Repository: testRepo,
User: nil,
SquashId: "1",
Author: user,
CommitMessage: commitMessage,
StartSha: startSha,
EndSha: endSha,
},
code: codes.InvalidArgument,
},
{
desc: "empty SquashId",
request: &gitalypb.UserSquashRequest{
Repository: testRepo,
User: user,
SquashId: "",
Author: user,
CommitMessage: commitMessage,
StartSha: startSha,
EndSha: endSha,
},
code: codes.InvalidArgument,
},
{
desc: "empty StartSha",
request: &gitalypb.UserSquashRequest{
Repository: testRepo,
User: user,
SquashId: "1",
Author: user,
CommitMessage: commitMessage,
StartSha: "",
EndSha: endSha,
},
code: codes.InvalidArgument,
},
{
desc: "empty EndSha",
request: &gitalypb.UserSquashRequest{
Repository: testRepo,
User: user,
SquashId: "1",
Author: user,
CommitMessage: commitMessage,
StartSha: startSha,
EndSha: "",
},
code: codes.InvalidArgument,
},
{
desc: "empty Author",
request: &gitalypb.UserSquashRequest{
Repository: testRepo,
User: user,
SquashId: "1",
Author: nil,
CommitMessage: commitMessage,
StartSha: startSha,
EndSha: endSha,
},
code: codes.InvalidArgument,
},
{
desc: "empty CommitMessage",
request: &gitalypb.UserSquashRequest{
Repository: testRepo,
User: user,
SquashId: "1",
Author: user,
CommitMessage: nil,
StartSha: startSha,
EndSha: endSha,
},
code: codes.InvalidArgument,
},
}
for _, testCase := range testCases {
t.Run(testCase.desc, func(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
_, err := client.UserSquash(ctx, testCase.request)
testhelper.RequireGrpcError(t, err, testCase.code)
require.Contains(t, err.Error(), testCase.desc)
})
}
}
|
