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
|
package commit
import (
"bufio"
"context"
"errors"
"fmt"
"io"
"strings"
"github.com/golang/protobuf/proto"
"gitlab.com/gitlab-org/gitaly/internal/command"
"gitlab.com/gitlab-org/gitaly/internal/git"
"gitlab.com/gitlab-org/gitaly/internal/git/catfile"
"gitlab.com/gitlab-org/gitaly/internal/git/trailerparser"
"gitlab.com/gitlab-org/gitaly/internal/helper"
"gitlab.com/gitlab-org/gitaly/internal/helper/chunk"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
)
func (s *server) FindCommits(req *gitalypb.FindCommitsRequest, stream gitalypb.CommitService_FindCommitsServer) error {
ctx := stream.Context()
if err := git.ValidateRevisionAllowEmpty(req.Revision); err != nil {
return helper.ErrInvalidArgument(err)
}
repo := s.localrepo(req.GetRepository())
// Use Gitaly's default branch lookup function because that is already
// migrated.
if revision := req.Revision; len(revision) == 0 && !req.GetAll() {
var err error
req.Revision, err = defaultBranchName(ctx, repo)
if err != nil {
return helper.ErrInternal(fmt.Errorf("defaultBranchName: %v", err))
}
}
// Clients might send empty paths. That is an error
for _, path := range req.Paths {
if len(path) == 0 {
return helper.ErrInvalidArgument(errors.New("path is empty string"))
}
}
if err := s.findCommits(ctx, req, stream); err != nil {
return helper.ErrInternal(err)
}
return nil
}
func (s *server) findCommits(ctx context.Context, req *gitalypb.FindCommitsRequest, stream gitalypb.CommitService_FindCommitsServer) error {
opts := git.ConvertGlobalOptions(req.GetGlobalOptions())
repo := s.localrepo(req.GetRepository())
logCmd, err := repo.Exec(ctx, getLogCommandSubCmd(req), opts...)
if err != nil {
return fmt.Errorf("error when creating git log command: %v", err)
}
batch, err := s.catfileCache.BatchProcess(ctx, repo)
if err != nil {
return fmt.Errorf("creating catfile: %v", err)
}
getCommits := NewGetCommits(logCmd, batch)
if calculateOffsetManually(req) {
if err := getCommits.Offset(int(req.GetOffset())); err != nil {
// If we're at EOF, then it means that the offset has been greater than the
// number of available commits. We do not treat this as an error, but
// instead just return EOF ourselves.
if errors.Is(err, io.EOF) {
return nil
}
return fmt.Errorf("skipping to offset %d: %w", req.GetOffset(), err)
}
}
if err := streamCommits(getCommits, stream, req.GetTrailers()); err != nil {
return fmt.Errorf("error streaming commits: %v", err)
}
return nil
}
func calculateOffsetManually(req *gitalypb.FindCommitsRequest) bool {
return req.GetFollow() && req.GetOffset() > 0
}
// GetCommits wraps a git log command that can be interated on to get individual commit objects
type GetCommits struct {
scanner *bufio.Scanner
batch catfile.Batch
}
// NewGetCommits returns a new GetCommits object
func NewGetCommits(cmd *command.Command, batch catfile.Batch) *GetCommits {
return &GetCommits{
scanner: bufio.NewScanner(cmd),
batch: batch,
}
}
// Scan indicates whether or not there are more commits to return
func (g *GetCommits) Scan() bool {
return g.scanner.Scan()
}
// Err returns the first non EOF error
func (g *GetCommits) Err() error {
return g.scanner.Err()
}
// Offset skips over a number of commits
func (g *GetCommits) Offset(offset int) error {
for i := 0; i < offset; i++ {
if !g.Scan() {
err := g.Err()
if err == nil {
err = io.EOF
}
return fmt.Errorf("skipping commit: %w", err)
}
}
return nil
}
// Commit returns the current commit
func (g *GetCommits) Commit(ctx context.Context, trailers bool) (*gitalypb.GitCommit, error) {
logOutput := strings.TrimSpace(g.scanner.Text())
var revAndTrailers []string
var revision string
if trailers {
revAndTrailers = strings.SplitN(logOutput, "\000", 2)
revision = revAndTrailers[0]
} else {
revision = logOutput
}
commit, err := catfile.GetCommit(ctx, g.batch, git.Revision(revision))
if err != nil {
return nil, fmt.Errorf("cat-file get commit %q: %v", revision, err)
}
if trailers && len(revAndTrailers) == 2 {
commit.Trailers = trailerparser.Parse([]byte(revAndTrailers[1]))
}
return commit, nil
}
type findCommitsSender struct {
stream gitalypb.CommitService_FindCommitsServer
commits []*gitalypb.GitCommit
}
func (s *findCommitsSender) Reset() { s.commits = nil }
func (s *findCommitsSender) Append(m proto.Message) {
s.commits = append(s.commits, m.(*gitalypb.GitCommit))
}
func (s *findCommitsSender) Send() error {
return s.stream.Send(&gitalypb.FindCommitsResponse{Commits: s.commits})
}
func streamCommits(getCommits *GetCommits, stream gitalypb.CommitService_FindCommitsServer, trailers bool) error {
ctx := stream.Context()
chunker := chunk.New(&findCommitsSender{stream: stream})
for getCommits.Scan() {
commit, err := getCommits.Commit(ctx, trailers)
if err != nil {
return err
}
if err := chunker.Send(commit); err != nil {
return err
}
}
if getCommits.Err() != nil {
return fmt.Errorf("get commits: %v", getCommits.Err())
}
return chunker.Flush()
}
func getLogCommandSubCmd(req *gitalypb.FindCommitsRequest) git.SubCmd {
logFormatOption := "--format=%H"
if req.GetTrailers() {
logFormatOption += "%x00%(trailers:unfold,separator=%x00)"
}
subCmd := git.SubCmd{Name: "log", Flags: []git.Option{git.Flag{Name: logFormatOption}}}
// We will perform the offset in Go because --follow doesn't play well with --skip.
// See: https://gitlab.com/gitlab-org/gitlab-ce/issues/3574#note_3040520
if req.GetOffset() > 0 && !calculateOffsetManually(req) {
subCmd.Flags = append(subCmd.Flags, git.Flag{Name: fmt.Sprintf("--skip=%d", req.GetOffset())})
}
limit := req.GetLimit()
if calculateOffsetManually(req) {
limit += req.GetOffset()
}
subCmd.Flags = append(subCmd.Flags, git.Flag{Name: fmt.Sprintf("--max-count=%d", limit)})
if req.GetFollow() && len(req.GetPaths()) > 0 {
subCmd.Flags = append(subCmd.Flags, git.Flag{Name: "--follow"})
}
if req.GetAuthor() != nil {
subCmd.Flags = append(subCmd.Flags, git.Flag{Name: fmt.Sprintf("--author=%s", string(req.GetAuthor()))})
}
if req.GetSkipMerges() {
subCmd.Flags = append(subCmd.Flags, git.Flag{Name: "--no-merges"})
}
if req.GetBefore() != nil {
subCmd.Flags = append(subCmd.Flags, git.Flag{Name: fmt.Sprintf("--before=%s", req.GetBefore().String())})
}
if req.GetAfter() != nil {
subCmd.Flags = append(subCmd.Flags, git.Flag{Name: fmt.Sprintf("--after=%s", req.GetAfter().String())})
}
if req.GetAll() {
subCmd.Flags = append(subCmd.Flags, git.Flag{Name: "--all"}, git.Flag{Name: "--reverse"})
}
if req.GetRevision() != nil {
subCmd.Args = []string{string(req.GetRevision())}
}
if req.GetFirstParent() {
subCmd.Flags = append(subCmd.Flags, git.Flag{Name: "--first-parent"})
}
if len(req.GetPaths()) > 0 {
for _, path := range req.GetPaths() {
subCmd.PostSepArgs = append(subCmd.PostSepArgs, string(path))
}
}
if req.GetOrder() == gitalypb.FindCommitsRequest_TOPO {
subCmd.Flags = append(subCmd.Flags, git.Flag{Name: "--topo-order"})
}
return subCmd
}
|