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
|
//go:build static && system_libgit2 && !gitaly_test_sha256
package main
import (
"errors"
"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/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/gitaly/config"
"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
)
func TestRevert_validation(t *testing.T) {
cfg, repo, repoPath := testcfg.BuildWithRepo(t)
testcfg.BuildGitalyGit2Go(t, cfg)
executor := buildExecutor(t, cfg)
testcases := []struct {
desc string
request git2go.RevertCommand
expectedErr string
}{
{
desc: "no arguments",
expectedErr: "revert: missing repository",
},
{
desc: "missing repository",
request: git2go.RevertCommand{AuthorName: "Foo", AuthorMail: "foo@example.com", Message: "Foo", Ours: "HEAD", Revert: "HEAD"},
expectedErr: "revert: missing repository",
},
{
desc: "missing author name",
request: git2go.RevertCommand{Repository: repoPath, AuthorMail: "foo@example.com", Message: "Foo", Ours: "HEAD", Revert: "HEAD"},
expectedErr: "revert: missing author name",
},
{
desc: "missing author mail",
request: git2go.RevertCommand{Repository: repoPath, AuthorName: "Foo", Message: "Foo", Ours: "HEAD", Revert: "HEAD"},
expectedErr: "revert: missing author mail",
},
{
desc: "missing message",
request: git2go.RevertCommand{Repository: repoPath, AuthorName: "Foo", AuthorMail: "foo@example.com", Ours: "HEAD", Revert: "HEAD"},
expectedErr: "revert: missing message",
},
{
desc: "missing ours",
request: git2go.RevertCommand{Repository: repoPath, AuthorName: "Foo", AuthorMail: "foo@example.com", Message: "Foo", Revert: "HEAD"},
expectedErr: "revert: missing ours",
},
{
desc: "missing revert",
request: git2go.RevertCommand{Repository: repoPath, AuthorName: "Foo", AuthorMail: "foo@example.com", Message: "Foo", Ours: "HEAD"},
expectedErr: "revert: missing revert",
},
}
for _, tc := range testcases {
t.Run(tc.desc, func(t *testing.T) {
ctx := testhelper.Context(t)
_, err := executor.Revert(ctx, repo, tc.request)
require.Error(t, err)
require.EqualError(t, err, tc.expectedErr)
})
}
}
func TestRevert_trees(t *testing.T) {
testcases := []struct {
desc string
setupRepo func(tb testing.TB, cfg config.Cfg, repoPath string) (ours, revert string)
expected map[string]string
expectedCommitID string
expectedErr string
expectedErrAs interface{}
}{
{
desc: "trivial revert succeeds",
setupRepo: func(tb testing.TB, cfg config.Cfg, repoPath string) (ours, revert string) {
baseOid := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithTreeEntries(
gittest.TreeEntry{Path: "a", Content: "apple", Mode: "100644"},
gittest.TreeEntry{Path: "b", Content: "banana", Mode: "100644"},
))
revertOid := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithParents(baseOid), gittest.WithTreeEntries(
gittest.TreeEntry{Path: "a", Content: "apple", Mode: "100644"},
gittest.TreeEntry{Path: "b", Content: "pineapple", Mode: "100644"},
))
oursOid := gittest.WriteCommit(tb, cfg, repoPath,
gittest.WithParents(revertOid), gittest.WithTreeEntries(
gittest.TreeEntry{Path: "a", Content: "apple", Mode: "100644"},
gittest.TreeEntry{Path: "b", Content: "pineapple", Mode: "100644"},
gittest.TreeEntry{Path: "c", Content: "carrot", Mode: "100644"},
))
return oursOid.String(), revertOid.String()
},
expected: map[string]string{
"a": "apple",
"b": "banana",
"c": "carrot",
},
expectedCommitID: "c9a58d2273b265cb229f02a5a88037bbdc96ad26",
},
{
desc: "conflicting revert fails",
setupRepo: func(tb testing.TB, cfg config.Cfg, repoPath string) (ours, revert string) {
baseOid := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithTreeEntries(
gittest.TreeEntry{Path: "a", Content: "apple", Mode: "100644"},
))
revertOid := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithParents(baseOid), gittest.WithTreeEntries(
gittest.TreeEntry{Path: "a", Content: "pineapple", Mode: "100644"},
))
oursOid := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithParents(revertOid), gittest.WithTreeEntries(
gittest.TreeEntry{Path: "a", Content: "carrot", Mode: "100644"},
))
return oursOid.String(), revertOid.String()
},
expectedErr: "revert: could not apply due to conflicts",
expectedErrAs: &git2go.HasConflictsError{},
},
{
desc: "empty revert fails",
setupRepo: func(tb testing.TB, cfg config.Cfg, repoPath string) (ours, revert string) {
baseOid := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithTreeEntries(
gittest.TreeEntry{Path: "a", Content: "apple", Mode: "100644"},
))
revertOid := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithParents(baseOid), gittest.WithTreeEntries(
gittest.TreeEntry{Path: "a", Content: "banana", Mode: "100644"},
))
oursOid := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithParents(revertOid), gittest.WithTreeEntries(
gittest.TreeEntry{Path: "a", Content: "apple", Mode: "100644"},
))
return oursOid.String(), revertOid.String()
},
expectedErr: "revert: could not apply because the result was empty",
expectedErrAs: &git2go.EmptyError{},
},
{
desc: "nonexistent ours fails",
setupRepo: func(tb testing.TB, cfg config.Cfg, repoPath string) (ours, revert string) {
revertOid := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithTreeEntries(
gittest.TreeEntry{Path: "a", Content: "apple", Mode: "100644"},
))
return "nonexistent", revertOid.String()
},
expectedErr: "revert: ours commit lookup: lookup commit \"nonexistent\": revspec 'nonexistent' not found",
},
{
desc: "nonexistent revert fails",
setupRepo: func(tb testing.TB, cfg config.Cfg, repoPath string) (ours, revert string) {
oursOid := gittest.WriteCommit(tb, cfg, repoPath, gittest.WithTreeEntries(
gittest.TreeEntry{Path: "a", Content: "apple", Mode: "100644"},
))
return oursOid.String(), "nonexistent"
},
expectedErr: "revert: revert commit lookup: lookup commit \"nonexistent\": revspec 'nonexistent' not found",
},
}
for _, tc := range testcases {
t.Run(tc.desc, func(t *testing.T) {
cfg, repoProto, repoPath := testcfg.BuildWithRepo(t)
testcfg.BuildGitalyGit2Go(t, cfg)
executor := buildExecutor(t, cfg)
ours, revert := tc.setupRepo(t, cfg, repoPath)
ctx := testhelper.Context(t)
authorDate := time.Date(2020, 7, 30, 7, 45, 50, 0, time.FixedZone("UTC+2", +2*60*60))
request := git2go.RevertCommand{
Repository: repoPath,
AuthorName: "Foo",
AuthorMail: "foo@example.com",
AuthorDate: authorDate,
Message: "Foo",
Ours: ours,
Revert: revert,
}
response, err := executor.Revert(ctx, repoProto, request)
if tc.expectedErr != "" {
require.EqualError(t, err, tc.expectedErr)
if tc.expectedErrAs != nil {
require.True(t, errors.As(err, tc.expectedErrAs))
}
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)
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())
}
})
}
}
|
