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
|
package commit
import (
"context"
"errors"
"fmt"
"io"
"strconv"
"strings"
"gitlab.com/gitlab-org/gitaly/v15/internal/git"
"gitlab.com/gitlab-org/gitaly/v15/internal/helper"
"gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
)
// CountDivergingCommits counts the diverging commits between from and to. Important to note that when --max-count is applied, the counts are not guaranteed to be
// accurate because --max-count is applied before it does the rev walk.
func (s *server) CountDivergingCommits(ctx context.Context, req *gitalypb.CountDivergingCommitsRequest) (*gitalypb.CountDivergingCommitsResponse, error) {
if err := s.validateCountDivergingCommitsRequest(req); err != nil {
return nil, helper.ErrInvalidArgument(err)
}
from, to := string(req.GetFrom()), string(req.GetTo())
maxCount := int(req.GetMaxCount())
left, right, err := s.findLeftRightCount(ctx, req.GetRepository(), from, to, maxCount)
if err != nil {
return nil, helper.ErrInternal(err)
}
return &gitalypb.CountDivergingCommitsResponse{LeftCount: left, RightCount: right}, nil
}
func (s *server) validateCountDivergingCommitsRequest(req *gitalypb.CountDivergingCommitsRequest) error {
if req.GetFrom() == nil || req.GetTo() == nil {
return errors.New("from and to are both required")
}
if req.GetRepository() == nil {
return errors.New("repository is empty")
}
if _, err := s.locator.GetRepoPath(req.GetRepository()); err != nil {
return fmt.Errorf("repository not valid: %v", err)
}
return nil
}
func buildRevListCountCmd(from, to string, maxCount int) git.SubCmd {
subCmd := git.SubCmd{
Name: "rev-list",
Flags: []git.Option{git.Flag{Name: "--count"}, git.Flag{Name: "--left-right"}},
Args: []string{fmt.Sprintf("%s...%s", from, to)},
}
if maxCount != 0 {
subCmd.Flags = append(subCmd.Flags, git.Flag{Name: fmt.Sprintf("--max-count=%d", maxCount)})
}
return subCmd
}
func (s *server) findLeftRightCount(ctx context.Context, repo *gitalypb.Repository, from, to string, maxCount int) (int32, int32, error) {
cmd, err := s.gitCmdFactory.New(ctx, repo, buildRevListCountCmd(from, to, maxCount))
if err != nil {
return 0, 0, fmt.Errorf("git rev-list cmd: %v", err)
}
var leftCount, rightCount int64
countStr, err := io.ReadAll(cmd)
if err != nil {
return 0, 0, fmt.Errorf("git rev-list error: %v", err)
}
if err := cmd.Wait(); err != nil {
return 0, 0, fmt.Errorf("gi rev-list error: %v", err)
}
counts := strings.Fields(string(countStr))
if len(counts) != 2 {
return 0, 0, fmt.Errorf("invalid output from git rev-list --left-right: %v", string(countStr))
}
leftCount, err = strconv.ParseInt(counts[0], 10, 32)
if err != nil {
return 0, 0, fmt.Errorf("invalid left count value: %v", counts[0])
}
rightCount, err = strconv.ParseInt(counts[1], 10, 32)
if err != nil {
return 0, 0, fmt.Errorf("invalid right count value: %v", counts[1])
}
return int32(leftCount), int32(rightCount), nil
}
|
