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
|
//go:build !gitaly_test_sha256
package git2go
import (
"errors"
"strings"
"testing"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/v16/internal/git"
"gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest"
"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg"
)
func TestExecutor_Apply(t *testing.T) {
ctx := testhelper.Context(t)
cfg := testcfg.Build(t)
testcfg.BuildGitalyGit2Go(t, cfg)
repoProto, repoPath := gittest.CreateRepository(t, ctx, cfg, gittest.CreateRepositoryConfig{
SkipCreationViaService: true,
})
repo := localrepo.NewTestRepo(t, cfg, repoProto)
executor := NewExecutor(cfg, gittest.NewCommandFactory(t, cfg), config.NewLocator(cfg))
oidBase, err := repo.WriteBlob(ctx, "file", strings.NewReader("base"))
require.NoError(t, err)
oidA, err := repo.WriteBlob(ctx, "file", strings.NewReader("a"))
require.NoError(t, err)
oidB, err := repo.WriteBlob(ctx, "file", strings.NewReader("b"))
require.NoError(t, err)
author := defaultCommitAuthorSignature()
committer := defaultCommitAuthorSignature()
parentCommitSHA, err := executor.Commit(ctx, repo, CommitCommand{
Repository: repoPath,
Author: author,
Committer: committer,
Message: "base commit",
Actions: []Action{CreateFile{Path: "file", OID: oidBase.String()}},
})
require.NoError(t, err)
noCommonAncestor, err := executor.Commit(ctx, repo, CommitCommand{
Repository: repoPath,
Author: author,
Committer: committer,
Message: "commit with ab",
Actions: []Action{CreateFile{Path: "file", OID: oidA.String()}},
})
require.NoError(t, err)
updateToA, err := executor.Commit(ctx, repo, CommitCommand{
Repository: repoPath,
Author: author,
Committer: committer,
Message: "commit with a",
Parent: parentCommitSHA.String(),
Actions: []Action{UpdateFile{Path: "file", OID: oidA.String()}},
})
require.NoError(t, err)
updateToB, err := executor.Commit(ctx, repo, CommitCommand{
Repository: repoPath,
Author: author,
Committer: committer,
Message: "commit to b",
Parent: parentCommitSHA.String(),
Actions: []Action{UpdateFile{Path: "file", OID: oidB.String()}},
})
require.NoError(t, err)
updateFromAToB, err := executor.Commit(ctx, repo, CommitCommand{
Repository: repoPath,
Author: author,
Committer: committer,
Message: "commit a -> b",
Parent: updateToA.String(),
Actions: []Action{UpdateFile{Path: "file", OID: oidB.String()}},
})
require.NoError(t, err)
otherFile, err := executor.Commit(ctx, repo, CommitCommand{
Repository: repoPath,
Author: author,
Committer: committer,
Message: "commit with other-file",
Actions: []Action{CreateFile{Path: "other-file", OID: oidA.String()}},
})
require.NoError(t, err)
diffBetween := func(tb testing.TB, fromCommit, toCommit git.ObjectID) []byte {
tb.Helper()
return gittest.Exec(tb, cfg, "-C", repoPath, "format-patch", "--stdout", fromCommit.String()+".."+toCommit.String())
}
for _, tc := range []struct {
desc string
patches []Patch
parentCommit git.ObjectID
tree []gittest.TreeEntry
error error
}{
{
desc: "patch applies cleanly",
patches: []Patch{
{
Author: author,
Message: "test commit message",
Diff: diffBetween(t, parentCommitSHA, updateToA),
},
},
parentCommit: parentCommitSHA,
tree: []gittest.TreeEntry{
{Path: "file", Mode: "100644", Content: "a"},
},
},
{
desc: "multiple patches apply cleanly",
patches: []Patch{
{
Author: author,
Message: "commit with a",
Diff: diffBetween(t, parentCommitSHA, updateToA),
},
{
Author: author,
Message: "commit with a -> b",
Diff: diffBetween(t, updateToA, updateFromAToB),
},
},
parentCommit: updateToA,
tree: []gittest.TreeEntry{
{Path: "file", Mode: "100644", Content: "b"},
},
},
{
desc: "three way merged",
patches: []Patch{
{
Author: author,
Message: "three-way merged files",
Diff: diffBetween(t, parentCommitSHA, otherFile),
},
},
parentCommit: parentCommitSHA,
tree: []gittest.TreeEntry{
{Path: "file", Mode: "100644", Content: "base"},
{Path: "other-file", Mode: "100644", Content: "a"},
},
},
{
// This test asserts incorrect behavior due to a bug in libgit2's
// git_apply_to_tree function. The correct behavior would be to
// return an error about merge conflict but we currently concatenate
// the blobs of the two trees together. This test will fail once the
// issue is fixed.
//
// See: https://gitlab.com/gitlab-org/gitaly/-/issues/3325
desc: "no common ancestor",
patches: []Patch{
{
Author: author,
Message: "three-way merged file",
Diff: diffBetween(t, parentCommitSHA, noCommonAncestor),
},
},
parentCommit: parentCommitSHA,
// error: ErrMergeConflict, <- correct output
tree: []gittest.TreeEntry{
{Path: "file", Mode: "100644", Content: "abase"},
},
},
{
desc: "merge conflict",
patches: []Patch{
{
Author: author,
Message: "applies cleanly",
Diff: diffBetween(t, parentCommitSHA, updateToA),
},
{
Author: author,
Message: "conflicts",
Diff: diffBetween(t, parentCommitSHA, updateToB),
},
},
error: ErrMergeConflict,
},
} {
t.Run(tc.desc, func(t *testing.T) {
commitID, err := executor.Apply(ctx, repo, ApplyParams{
Repository: repoPath,
Committer: committer,
ParentCommit: parentCommitSHA.String(),
Patches: NewSlicePatchIterator(tc.patches),
})
if tc.error != nil {
require.True(t, errors.Is(err, tc.error), err)
return
}
commit, err := repo.ReadCommit(ctx, commitID.Revision())
require.NoError(t, err)
require.Equal(t, []string{string(tc.parentCommit)}, commit.ParentIds)
require.Equal(t, gittest.DefaultCommitAuthor, commit.Author)
require.Equal(t, gittest.DefaultCommitAuthor, commit.Committer)
require.Equal(t, []byte(tc.patches[len(tc.patches)-1].Message), commit.Body)
gittest.RequireTree(t, cfg, repoPath, commitID.String(), tc.tree)
})
}
}
|
