blob: 72416953aff283301099aa67b1d8161fc0ad7696 (
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
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
|
package conflicts
import (
"fmt"
"gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
func (s *server) ResolveConflicts(stream gitalypb.ConflictsService_ResolveConflictsServer) error {
firstRequest, err := stream.Recv()
if err != nil {
return err
}
header := firstRequest.GetHeader()
if header == nil {
return status.Errorf(codes.InvalidArgument, "ResolveConflicts: empty ResolveConflictsRequestHeader")
}
if err = validateResolveConflictsHeader(header); err != nil {
return status.Errorf(codes.InvalidArgument, "ResolveConflicts: %v", err)
}
ctx := stream.Context()
client, err := s.ConflictsServiceClient(ctx)
if err != nil {
return err
}
clientCtx, err := rubyserver.SetHeaders(ctx, header.GetRepository())
if err != nil {
return err
}
rubyStream, err := client.ResolveConflicts(clientCtx)
if err != nil {
return err
}
if err := rubyStream.Send(firstRequest); err != nil {
return err
}
err = rubyserver.Proxy(func() error {
request, err := stream.Recv()
if err != nil {
return err
}
return rubyStream.Send(request)
})
if err != nil {
return err
}
response, err := rubyStream.CloseAndRecv()
if err != nil {
return err
}
return stream.SendAndClose(response)
}
func validateResolveConflictsHeader(header *gitalypb.ResolveConflictsRequestHeader) error {
if header.GetOurCommitOid() == "" {
return fmt.Errorf("empty OurCommitOid")
}
if header.GetTargetRepository() == nil {
return fmt.Errorf("empty TargetRepository")
}
if header.GetTheirCommitOid() == "" {
return fmt.Errorf("empty TheirCommitOid")
}
if header.GetSourceBranch() == nil {
return fmt.Errorf("empty SourceBranch")
}
if header.GetTargetBranch() == nil {
return fmt.Errorf("empty TargetBranch")
}
if header.GetCommitMessage() == nil {
return fmt.Errorf("empty CommitMessage")
}
if header.GetUser() == nil {
return fmt.Errorf("empty User")
}
return nil
}
|
