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
|
package operations
import (
"context"
"errors"
"gitlab.com/gitlab-org/gitaly/internal/git"
"gitlab.com/gitlab-org/gitaly/internal/git/localrepo"
"gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver"
"gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
func (s *Server) UserCreateBranch(ctx context.Context, req *gitalypb.UserCreateBranchRequest) (*gitalypb.UserCreateBranchResponse, error) {
if len(req.BranchName) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "Bad Request (empty branch name)")
}
if req.User == nil {
return nil, status.Errorf(codes.InvalidArgument, "empty user")
}
if len(req.StartPoint) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "empty start point")
}
repo := localrepo.New(s.gitCmdFactory, req.Repository, s.cfg)
// BEGIN TODO: Uncomment if StartPoint started behaving sensibly
// like BranchName. See
// https://gitlab.com/gitlab-org/gitaly/-/issues/3331
//
// startPointReference, err := localrepo.New(req.Repository).GetReference(ctx, "refs/heads/"+string(req.StartPoint))
// startPointCommit, err := log.GetCommit(ctx, req.Repository, startPointReference.Target)
startPointCommit, err := repo.ReadCommit(ctx, git.Revision(req.StartPoint))
// END TODO
if err != nil {
return nil, status.Errorf(codes.FailedPrecondition, "revspec '%s' not found", req.StartPoint)
}
startPointOID, err := git.NewObjectIDFromHex(startPointCommit.Id)
if err != nil {
return nil, status.Errorf(codes.Internal, "could not parse start point commit ID: %v", err)
}
referenceName := git.NewReferenceNameFromBranchName(string(req.BranchName))
_, err = repo.GetReference(ctx, referenceName)
if err == nil {
return nil, status.Errorf(codes.FailedPrecondition, "Could not update %s. Please refresh and try again.", req.BranchName)
} else if !errors.Is(err, git.ErrReferenceNotFound) {
return nil, status.Error(codes.Internal, err.Error())
}
if err := s.updateReferenceWithHooks(ctx, req.Repository, req.User, referenceName, startPointOID, git.ZeroOID); err != nil {
var preReceiveError preReceiveError
if errors.As(err, &preReceiveError) {
return &gitalypb.UserCreateBranchResponse{
PreReceiveError: preReceiveError.message,
}, nil
}
var updateRefError updateRefError
if errors.As(err, &updateRefError) {
return nil, status.Error(codes.FailedPrecondition, err.Error())
}
return nil, err
}
return &gitalypb.UserCreateBranchResponse{
Branch: &gitalypb.Branch{
Name: req.BranchName,
TargetCommit: startPointCommit,
},
}, nil
}
func (s *Server) UserUpdateBranch(ctx context.Context, req *gitalypb.UserUpdateBranchRequest) (*gitalypb.UserUpdateBranchResponse, error) {
if featureflag.IsDisabled(ctx, featureflag.GoUserUpdateBranch) {
return s.userUpdateBranchRuby(ctx, req)
}
return s.userUpdateBranchGo(ctx, req)
}
func validateUserUpdateBranchGo(req *gitalypb.UserUpdateBranchRequest) error {
if req.User == nil {
return status.Errorf(codes.InvalidArgument, "empty user")
}
if len(req.BranchName) == 0 {
return status.Errorf(codes.InvalidArgument, "empty branch name")
}
if len(req.Oldrev) == 0 {
return status.Errorf(codes.InvalidArgument, "empty oldrev")
}
if len(req.Newrev) == 0 {
return status.Errorf(codes.InvalidArgument, "empty newrev")
}
return nil
}
func (s *Server) userUpdateBranchGo(ctx context.Context, req *gitalypb.UserUpdateBranchRequest) (*gitalypb.UserUpdateBranchResponse, error) {
// Validate the request
if err := validateUserUpdateBranchGo(req); err != nil {
return nil, err
}
newOID, err := git.NewObjectIDFromHex(string(req.Newrev))
if err != nil {
return nil, status.Errorf(codes.Internal, "could not parse newrev: %v", err)
}
oldOID, err := git.NewObjectIDFromHex(string(req.Oldrev))
if err != nil {
return nil, status.Errorf(codes.Internal, "could not parse oldrev: %v", err)
}
referenceName := git.NewReferenceNameFromBranchName(string(req.BranchName))
if err := s.updateReferenceWithHooks(ctx, req.Repository, req.User, referenceName, newOID, oldOID); err != nil {
var preReceiveError preReceiveError
if errors.As(err, &preReceiveError) {
return &gitalypb.UserUpdateBranchResponse{
PreReceiveError: preReceiveError.message,
}, nil
}
// An oddball response for compatibility with the old
// Ruby code. The "Could not update..." message is
// exactly like the default updateRefError, except we
// say "branch-name", not
// "refs/heads/branch-name". See the
// "Gitlab::Git::CommitError" case in the Ruby code.
return nil, status.Errorf(codes.FailedPrecondition, "Could not update %s. Please refresh and try again.", req.BranchName)
}
return &gitalypb.UserUpdateBranchResponse{}, nil
}
func (s *Server) userUpdateBranchRuby(ctx context.Context, req *gitalypb.UserUpdateBranchRequest) (*gitalypb.UserUpdateBranchResponse, error) {
client, err := s.ruby.OperationServiceClient(ctx)
if err != nil {
return nil, err
}
clientCtx, err := rubyserver.SetHeaders(ctx, s.locator, req.GetRepository())
if err != nil {
return nil, err
}
return client.UserUpdateBranch(clientCtx, req)
}
func (s *Server) UserDeleteBranch(ctx context.Context, req *gitalypb.UserDeleteBranchRequest) (*gitalypb.UserDeleteBranchResponse, error) {
// That we do the branch name & user check here first only in
// UserDelete but not UserCreate is "intentional", i.e. it's
// always been that way.
if len(req.BranchName) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "Bad Request (empty branch name)")
}
if req.User == nil {
return nil, status.Errorf(codes.InvalidArgument, "Bad Request (empty user)")
}
referenceName := git.NewReferenceNameFromBranchName(string(req.BranchName))
referenceValue, err := localrepo.New(s.gitCmdFactory, req.Repository, s.cfg).ResolveRevision(ctx, referenceName.Revision())
if err != nil {
return nil, status.Errorf(codes.FailedPrecondition, "branch not found: %s", req.BranchName)
}
if err := s.updateReferenceWithHooks(ctx, req.Repository, req.User, referenceName, git.ZeroOID, referenceValue); err != nil {
var preReceiveError preReceiveError
if errors.As(err, &preReceiveError) {
return &gitalypb.UserDeleteBranchResponse{
PreReceiveError: preReceiveError.message,
}, nil
}
var updateRefError updateRefError
if errors.As(err, &updateRefError) {
return nil, status.Error(codes.FailedPrecondition, err.Error())
}
return nil, err
}
return &gitalypb.UserDeleteBranchResponse{}, nil
}
|
