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
|
package commit
import (
"context"
"errors"
"gitlab.com/gitlab-org/gitaly/v15/structerr"
"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
log "github.com/sirupsen/logrus"
"gitlab.com/gitlab-org/gitaly/proto/v15/go/gitalypb"
"gitlab.com/gitlab-org/gitaly/v15/internal/git"
"gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/service"
)
func validateCommitIsAncestorRequest(in *gitalypb.CommitIsAncestorRequest) error {
if err := service.ValidateRepository(in.GetRepository()); err != nil {
return err
}
if in.GetAncestorId() == "" {
return errors.New("empty ancestor sha")
}
if in.GetChildId() == "" {
return errors.New("empty child sha")
}
return nil
}
func (s *server) CommitIsAncestor(ctx context.Context, in *gitalypb.CommitIsAncestorRequest) (*gitalypb.CommitIsAncestorResponse, error) {
if err := validateCommitIsAncestorRequest(in); err != nil {
return nil, structerr.NewInvalidArgument("%w", err)
}
ret, err := s.commitIsAncestorName(ctx, in.Repository, in.AncestorId, in.ChildId)
return &gitalypb.CommitIsAncestorResponse{Value: ret}, err
}
// Assumes that `path`, `ancestorID` and `childID` are populated :trollface:
func (s *server) commitIsAncestorName(ctx context.Context, repo *gitalypb.Repository, ancestorID, childID string) (bool, error) {
ctxlogrus.Extract(ctx).WithFields(log.Fields{
"ancestorSha": ancestorID,
"childSha": childID,
}).Debug("commitIsAncestor")
cmd, err := s.gitCmdFactory.New(ctx, repo, git.Command{
Name: "merge-base",
Flags: []git.Option{git.Flag{Name: "--is-ancestor"}}, Args: []string{ancestorID, childID},
})
if err != nil {
return false, structerr.NewInternal("%w", err)
}
return cmd.Wait() == nil, nil
}
|
