blob: bd7155b9c5ae935f8ad803f2fc43f8def6ca20a9 (
plain)
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
|
package conflicts
import (
"fmt"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
)
func (s *server) ListConflictFiles(in *gitalypb.ListConflictFilesRequest, stream gitalypb.ConflictsService_ListConflictFilesServer) error {
ctx := stream.Context()
if err := validateListConflictFilesRequest(in); err != nil {
return status.Errorf(codes.InvalidArgument, "ListConflictFiles: %v", err)
}
client, err := s.ConflictsServiceClient(ctx)
if err != nil {
return err
}
clientCtx, err := rubyserver.SetHeaders(ctx, in.GetRepository())
if err != nil {
return err
}
rubyStream, err := client.ListConflictFiles(clientCtx, in)
if err != nil {
return err
}
return rubyserver.Proxy(func() error {
resp, err := rubyStream.Recv()
if err != nil {
md := rubyStream.Trailer()
stream.SetTrailer(md)
return err
}
return stream.Send(resp)
})
}
func validateListConflictFilesRequest(in *gitalypb.ListConflictFilesRequest) error {
if in.GetRepository() == nil {
return fmt.Errorf("empty Repository")
}
if in.GetOurCommitOid() == "" {
return fmt.Errorf("empty OurCommitOid")
}
if in.GetTheirCommitOid() == "" {
return fmt.Errorf("empty TheirCommitOid")
}
return nil
}
|
