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
|
package commit
import (
"context"
grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus"
log "github.com/sirupsen/logrus"
"gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
"gitlab.com/gitlab-org/gitaly/internal/git"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
func (s *server) CommitIsAncestor(ctx context.Context, in *gitalypb.CommitIsAncestorRequest) (*gitalypb.CommitIsAncestorResponse, error) {
if in.AncestorId == "" {
return nil, status.Errorf(codes.InvalidArgument, "Bad Request (empty ancestor sha)")
}
if in.ChildId == "" {
return nil, status.Errorf(codes.InvalidArgument, "Bad Request (empty child sha)")
}
ret, err := commitIsAncestorName(ctx, in.Repository, in.AncestorId, in.ChildId)
return &gitalypb.CommitIsAncestorResponse{Value: ret}, err
}
// Assumes that `path`, `ancestorID` and `childID` are populated :trollface:
func commitIsAncestorName(ctx context.Context, repo *gitalypb.Repository, ancestorID, childID string) (bool, error) {
grpc_logrus.Extract(ctx).WithFields(log.Fields{
"ancestorSha": ancestorID,
"childSha": childID,
}).Debug("commitIsAncestor")
cmd, err := git.Command(ctx, repo, "merge-base", "--is-ancestor", ancestorID, childID)
if err != nil {
if _, ok := status.FromError(err); ok {
return false, err
}
return false, status.Errorf(codes.Internal, err.Error())
}
return cmd.Wait() == nil, nil
}
|
