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
|
package operations
import (
"context"
"errors"
"fmt"
"strings"
"time"
"gitlab.com/gitlab-org/gitaly/v16/internal/git"
"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref"
"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
)
// UserCherryPick tries to perform a cherry-pick of a given commit onto a
// branch. See the protobuf documentation for details.
func (s *Server) UserCherryPick(ctx context.Context, req *gitalypb.UserCherryPickRequest) (*gitalypb.UserCherryPickResponse, error) {
if err := validateCherryPickOrRevertRequest(s.locator, req); err != nil {
return nil, structerr.NewInvalidArgument("%w", err)
}
quarantineDir, quarantineRepo, err := s.quarantinedRepo(ctx, req.GetRepository())
if err != nil {
return nil, err
}
startRevision, err := s.fetchStartRevision(ctx, quarantineRepo, req)
if err != nil {
return nil, err
}
repoHadBranches, err := quarantineRepo.HasBranches(ctx)
if err != nil {
return nil, structerr.NewInternal("has branches: %w", err)
}
committerDate := time.Now()
if req.Timestamp != nil {
committerDate = req.Timestamp.AsTime()
}
cherryCommit, err := quarantineRepo.ReadCommit(ctx, git.Revision(req.Commit.Id))
if err != nil {
if errors.Is(err, localrepo.ErrObjectNotFound) {
return nil, structerr.NewNotFound("cherry-pick: commit lookup: commit not found: %q", req.Commit.Id)
}
return nil, fmt.Errorf("cherry pick: %w", err)
}
cherryDate := cherryCommit.Author.GetDate().AsTime()
loc, err := time.Parse("-0700", string(cherryCommit.Author.GetTimezone()))
if err != nil {
return nil, fmt.Errorf("get cherry commit location: %w", err)
}
cherryDate = cherryDate.In(loc.Location())
// Cherry-pick is implemented using git-merge-tree(1). We
// "merge" in the changes from the commit that is cherry-picked,
// compared to it's parent commit (specified as merge base).
treeOID, err := quarantineRepo.MergeTree(
ctx,
startRevision.String(),
req.Commit.Id,
localrepo.WithMergeBase(git.Revision(req.Commit.Id+"^")),
localrepo.WithConflictingFileNamesOnly(),
)
if err != nil {
var conflictErr *localrepo.MergeTreeConflictError
if errors.As(err, &conflictErr) {
conflictingFiles := make([][]byte, 0, len(conflictErr.ConflictingFileInfo))
for _, conflictingFileInfo := range conflictErr.ConflictingFileInfo {
conflictingFiles = append(conflictingFiles, []byte(conflictingFileInfo.FileName))
}
return nil, structerr.NewFailedPrecondition("cherry pick: %w", err).WithDetail(
&gitalypb.UserCherryPickError{
Error: &gitalypb.UserCherryPickError_CherryPickConflict{
CherryPickConflict: &gitalypb.MergeConflictError{
ConflictingFiles: conflictingFiles,
},
},
},
)
}
return nil, fmt.Errorf("cherry-pick command: %w", err)
}
oldTree, err := quarantineRepo.ResolveRevision(
ctx,
git.Revision(fmt.Sprintf("%s^{tree}", startRevision.String())),
)
if err != nil {
return nil, fmt.Errorf("resolve old tree: %w", err)
}
if oldTree == treeOID {
return nil, structerr.NewFailedPrecondition("cherry-pick: could not apply because the result was empty").WithDetail(
&gitalypb.UserCherryPickError{
Error: &gitalypb.UserCherryPickError_ChangesAlreadyApplied{},
},
)
}
newrev, err := quarantineRepo.WriteCommit(
ctx,
localrepo.WriteCommitConfig{
TreeID: treeOID,
Message: string(req.Message),
Parents: []git.ObjectID{startRevision},
AuthorName: string(cherryCommit.Author.Name),
AuthorEmail: string(cherryCommit.Author.Email),
AuthorDate: cherryDate,
CommitterName: string(req.User.Name),
CommitterEmail: string(req.User.Email),
CommitterDate: committerDate,
SigningKey: s.signingKey,
},
)
if err != nil {
return nil, fmt.Errorf("write commit: %w", err)
}
referenceName := git.NewReferenceNameFromBranchName(string(req.BranchName))
branchCreated := false
var oldrev git.ObjectID
objectHash, err := quarantineRepo.ObjectHash(ctx)
if err != nil {
return nil, structerr.NewInternal("detecting object hash: %w", err)
}
if expectedOldOID := req.GetExpectedOldOid(); expectedOldOID != "" {
oldrev, err = objectHash.FromHex(expectedOldOID)
if err != nil {
return nil, structerr.NewInvalidArgument("invalid expected old object ID: %w", err).
WithMetadata("old_object_id", expectedOldOID)
}
oldrev, err = s.localrepo(req.GetRepository()).ResolveRevision(
ctx, git.Revision(fmt.Sprintf("%s^{object}", oldrev)),
)
if err != nil {
return nil, structerr.NewInvalidArgument("cannot resolve expected old object ID: %w", err).
WithMetadata("old_object_id", expectedOldOID)
}
} else {
oldrev, err = quarantineRepo.ResolveRevision(ctx, referenceName.Revision()+"^{commit}")
if errors.Is(err, git.ErrReferenceNotFound) {
branchCreated = true
oldrev = objectHash.ZeroOID
} else if err != nil {
return nil, structerr.NewInvalidArgument("resolve ref: %w", err)
}
}
if req.DryRun {
newrev = startRevision
}
if !branchCreated {
ancestor, err := quarantineRepo.IsAncestor(ctx, oldrev.Revision(), newrev.Revision())
if err != nil {
return nil, structerr.NewInternal("checking for ancestry: %w", err)
}
if !ancestor {
return nil, structerr.NewFailedPrecondition("cherry-pick: branch diverged").WithDetail(
&gitalypb.UserCherryPickError{
Error: &gitalypb.UserCherryPickError_TargetBranchDiverged{
TargetBranchDiverged: &gitalypb.NotAncestorError{
ParentRevision: []byte(oldrev.Revision()),
ChildRevision: []byte(newrev),
},
},
},
)
}
}
if err := s.updateReferenceWithHooks(ctx, req.GetRepository(), req.User, quarantineDir, referenceName, newrev, oldrev); err != nil {
var customHookErr updateref.CustomHookError
if errors.As(err, &customHookErr) {
return nil, structerr.NewFailedPrecondition("access check failed").WithDetail(
&gitalypb.UserCherryPickError{
Error: &gitalypb.UserCherryPickError_AccessCheck{
AccessCheck: &gitalypb.AccessCheckError{
ErrorMessage: strings.TrimSuffix(customHookErr.Error(), "\n"),
},
},
},
)
}
return nil, structerr.NewInternal("update reference with hooks: %w", err)
}
return &gitalypb.UserCherryPickResponse{
BranchUpdate: &gitalypb.OperationBranchUpdate{
CommitId: newrev.String(),
BranchCreated: branchCreated,
RepoCreated: !repoHadBranches,
},
}, nil
}
|
