From 80dd143881262b937fb031420b3a3e1d05ae6aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Tue, 14 Feb 2017 18:01:13 +0100 Subject: [PATCH 1/9] ci_status && ci_environment_status --- gitaly.proto | 37 +++ go/gitaly.pb.go | 313 ++++++++++++++++++++++++-- ruby/lib/gitaly/gitaly_pb.rb | 24 ++ ruby/lib/gitaly/gitaly_services_pb.rb | 29 +++ 4 files changed, 381 insertions(+), 22 deletions(-) diff --git a/gitaly.proto b/gitaly.proto index 34159704..1e42def0 100644 --- a/gitaly.proto +++ b/gitaly.proto @@ -15,6 +15,19 @@ service Notifications { rpc PostReceive(PostReceiveRequest) returns (PostReceiveResponse) {} } +service Ref { + // Find a Ref matching the given constraints. Response may be empty. + rpc FindRefName(FindRefNameRequest) returns (RefNamesResponse) {} +} + +service Commit { + rpc CommitIsAncestor(CommitIsAncestorRequest) returns (Boolean) {} +} + +message Boolean { + bool true = 1; +} + message InfoRefsRequest { Repository repository = 1; } @@ -32,3 +45,27 @@ message PostReceiveRequest { } message PostReceiveResponse {} + +message CommitObject { + // SHA1 of the commit object represented as 40 hexadecimal characters + string id = 1; +} + +message FindRefNameRequest { + Repository repository = 1; + // Require that the resulting ref contains this commit as an ancestor + CommitObject containing = 2; + // Example prefix: "refs/heads/". Type bytes because that is the type of ref names. + bytes prefix = 3; +} + +message RefNamesResponse { + // Example name: "refs/heads/master". Cannot assume UTF8, so the type is bytes. + repeated bytes name = 1; +} + +message CommitIsAncestorRequest { + Repository repository = 1; + CommitObject ancestor = 2; + CommitObject child = 3; +} diff --git a/go/gitaly.pb.go b/go/gitaly.pb.go index 1ccf60c6..b26fea8d 100644 --- a/go/gitaly.pb.go +++ b/go/gitaly.pb.go @@ -9,11 +9,16 @@ It is generated from these files: gitaly.proto It has these top-level messages: + Boolean InfoRefsRequest InfoRefsResponse Repository PostReceiveRequest PostReceiveResponse + CommitObject + FindRefNameRequest + RefNamesResponse + CommitIsAncestorRequest */ package gitaly @@ -37,6 +42,22 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +type Boolean struct { + True bool `protobuf:"varint,1,opt,name=true" json:"true,omitempty"` +} + +func (m *Boolean) Reset() { *m = Boolean{} } +func (m *Boolean) String() string { return proto.CompactTextString(m) } +func (*Boolean) ProtoMessage() {} +func (*Boolean) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } + +func (m *Boolean) GetTrue() bool { + if m != nil { + return m.True + } + return false +} + type InfoRefsRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` } @@ -44,7 +65,7 @@ type InfoRefsRequest struct { func (m *InfoRefsRequest) Reset() { *m = InfoRefsRequest{} } func (m *InfoRefsRequest) String() string { return proto.CompactTextString(m) } func (*InfoRefsRequest) ProtoMessage() {} -func (*InfoRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (*InfoRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } func (m *InfoRefsRequest) GetRepository() *Repository { if m != nil { @@ -60,7 +81,7 @@ type InfoRefsResponse struct { func (m *InfoRefsResponse) Reset() { *m = InfoRefsResponse{} } func (m *InfoRefsResponse) String() string { return proto.CompactTextString(m) } func (*InfoRefsResponse) ProtoMessage() {} -func (*InfoRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } +func (*InfoRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } func (m *InfoRefsResponse) GetData() []byte { if m != nil { @@ -76,7 +97,7 @@ type Repository struct { func (m *Repository) Reset() { *m = Repository{} } func (m *Repository) String() string { return proto.CompactTextString(m) } func (*Repository) ProtoMessage() {} -func (*Repository) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } +func (*Repository) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } func (m *Repository) GetPath() string { if m != nil { @@ -92,7 +113,7 @@ type PostReceiveRequest struct { func (m *PostReceiveRequest) Reset() { *m = PostReceiveRequest{} } func (m *PostReceiveRequest) String() string { return proto.CompactTextString(m) } func (*PostReceiveRequest) ProtoMessage() {} -func (*PostReceiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } +func (*PostReceiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } func (m *PostReceiveRequest) GetRepository() *Repository { if m != nil { @@ -107,14 +128,119 @@ type PostReceiveResponse struct { func (m *PostReceiveResponse) Reset() { *m = PostReceiveResponse{} } func (m *PostReceiveResponse) String() string { return proto.CompactTextString(m) } func (*PostReceiveResponse) ProtoMessage() {} -func (*PostReceiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } +func (*PostReceiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } + +type CommitObject struct { + // SHA1 of the commit object represented as 40 hexadecimal characters + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` +} + +func (m *CommitObject) Reset() { *m = CommitObject{} } +func (m *CommitObject) String() string { return proto.CompactTextString(m) } +func (*CommitObject) ProtoMessage() {} +func (*CommitObject) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } + +func (m *CommitObject) GetId() string { + if m != nil { + return m.Id + } + return "" +} + +type FindRefNameRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + // Require that the resulting ref contains this commit as an ancestor + Containing *CommitObject `protobuf:"bytes,2,opt,name=containing" json:"containing,omitempty"` + // Example prefix: "refs/heads/". Type bytes because that is the type of ref names. + Prefix []byte `protobuf:"bytes,3,opt,name=prefix,proto3" json:"prefix,omitempty"` +} + +func (m *FindRefNameRequest) Reset() { *m = FindRefNameRequest{} } +func (m *FindRefNameRequest) String() string { return proto.CompactTextString(m) } +func (*FindRefNameRequest) ProtoMessage() {} +func (*FindRefNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } + +func (m *FindRefNameRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *FindRefNameRequest) GetContaining() *CommitObject { + if m != nil { + return m.Containing + } + return nil +} + +func (m *FindRefNameRequest) GetPrefix() []byte { + if m != nil { + return m.Prefix + } + return nil +} + +type RefNamesResponse struct { + // Example name: "refs/heads/master". Cannot assume UTF8, so the type is bytes. + Name [][]byte `protobuf:"bytes,1,rep,name=name,proto3" json:"name,omitempty"` +} + +func (m *RefNamesResponse) Reset() { *m = RefNamesResponse{} } +func (m *RefNamesResponse) String() string { return proto.CompactTextString(m) } +func (*RefNamesResponse) ProtoMessage() {} +func (*RefNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } + +func (m *RefNamesResponse) GetName() [][]byte { + if m != nil { + return m.Name + } + return nil +} + +type CommitIsAncestorRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + Ancestor *CommitObject `protobuf:"bytes,2,opt,name=ancestor" json:"ancestor,omitempty"` + Child *CommitObject `protobuf:"bytes,3,opt,name=child" json:"child,omitempty"` +} + +func (m *CommitIsAncestorRequest) Reset() { *m = CommitIsAncestorRequest{} } +func (m *CommitIsAncestorRequest) String() string { return proto.CompactTextString(m) } +func (*CommitIsAncestorRequest) ProtoMessage() {} +func (*CommitIsAncestorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } + +func (m *CommitIsAncestorRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *CommitIsAncestorRequest) GetAncestor() *CommitObject { + if m != nil { + return m.Ancestor + } + return nil +} + +func (m *CommitIsAncestorRequest) GetChild() *CommitObject { + if m != nil { + return m.Child + } + return nil +} func init() { + proto.RegisterType((*Boolean)(nil), "gitaly.Boolean") proto.RegisterType((*InfoRefsRequest)(nil), "gitaly.InfoRefsRequest") proto.RegisterType((*InfoRefsResponse)(nil), "gitaly.InfoRefsResponse") proto.RegisterType((*Repository)(nil), "gitaly.Repository") proto.RegisterType((*PostReceiveRequest)(nil), "gitaly.PostReceiveRequest") proto.RegisterType((*PostReceiveResponse)(nil), "gitaly.PostReceiveResponse") + proto.RegisterType((*CommitObject)(nil), "gitaly.CommitObject") + proto.RegisterType((*FindRefNameRequest)(nil), "gitaly.FindRefNameRequest") + proto.RegisterType((*RefNamesResponse)(nil), "gitaly.RefNamesResponse") + proto.RegisterType((*CommitIsAncestorRequest)(nil), "gitaly.CommitIsAncestorRequest") } // Reference imports to suppress errors if they are not otherwise used. @@ -344,24 +470,167 @@ var _Notifications_serviceDesc = grpc.ServiceDesc{ Metadata: "gitaly.proto", } +// Client API for Ref service + +type RefClient interface { + // Find a Ref matching the given constraints. Response may be empty. + FindRefName(ctx context.Context, in *FindRefNameRequest, opts ...grpc.CallOption) (*RefNamesResponse, error) +} + +type refClient struct { + cc *grpc.ClientConn +} + +func NewRefClient(cc *grpc.ClientConn) RefClient { + return &refClient{cc} +} + +func (c *refClient) FindRefName(ctx context.Context, in *FindRefNameRequest, opts ...grpc.CallOption) (*RefNamesResponse, error) { + out := new(RefNamesResponse) + err := grpc.Invoke(ctx, "/gitaly.Ref/FindRefName", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// Server API for Ref service + +type RefServer interface { + // Find a Ref matching the given constraints. Response may be empty. + FindRefName(context.Context, *FindRefNameRequest) (*RefNamesResponse, error) +} + +func RegisterRefServer(s *grpc.Server, srv RefServer) { + s.RegisterService(&_Ref_serviceDesc, srv) +} + +func _Ref_FindRefName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindRefNameRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RefServer).FindRefName(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.Ref/FindRefName", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RefServer).FindRefName(ctx, req.(*FindRefNameRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Ref_serviceDesc = grpc.ServiceDesc{ + ServiceName: "gitaly.Ref", + HandlerType: (*RefServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "FindRefName", + Handler: _Ref_FindRefName_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "gitaly.proto", +} + +// Client API for Commit service + +type CommitClient interface { + CommitIsAncestor(ctx context.Context, in *CommitIsAncestorRequest, opts ...grpc.CallOption) (*Boolean, error) +} + +type commitClient struct { + cc *grpc.ClientConn +} + +func NewCommitClient(cc *grpc.ClientConn) CommitClient { + return &commitClient{cc} +} + +func (c *commitClient) CommitIsAncestor(ctx context.Context, in *CommitIsAncestorRequest, opts ...grpc.CallOption) (*Boolean, error) { + out := new(Boolean) + err := grpc.Invoke(ctx, "/gitaly.Commit/CommitIsAncestor", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// Server API for Commit service + +type CommitServer interface { + CommitIsAncestor(context.Context, *CommitIsAncestorRequest) (*Boolean, error) +} + +func RegisterCommitServer(s *grpc.Server, srv CommitServer) { + s.RegisterService(&_Commit_serviceDesc, srv) +} + +func _Commit_CommitIsAncestor_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CommitIsAncestorRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(CommitServer).CommitIsAncestor(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.Commit/CommitIsAncestor", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(CommitServer).CommitIsAncestor(ctx, req.(*CommitIsAncestorRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Commit_serviceDesc = grpc.ServiceDesc{ + ServiceName: "gitaly.Commit", + HandlerType: (*CommitServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "CommitIsAncestor", + Handler: _Commit_CommitIsAncestor_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "gitaly.proto", +} + func init() { proto.RegisterFile("gitaly.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 256 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0xc1, 0x4a, 0xc3, 0x40, - 0x10, 0x86, 0x0d, 0x48, 0xa1, 0xd3, 0x8a, 0x32, 0x45, 0x2c, 0xf1, 0x52, 0xf6, 0x20, 0x9e, 0x8a, - 0xc4, 0x67, 0x10, 0x22, 0x8a, 0x84, 0xb5, 0x1e, 0x3c, 0xae, 0xe9, 0x44, 0x17, 0x6b, 0x66, 0xcd, - 0x8e, 0x42, 0x5f, 0xc8, 0xe7, 0x14, 0x37, 0xae, 0xa9, 0xd6, 0x5b, 0x6e, 0xb3, 0xfb, 0xff, 0xf3, - 0xed, 0xbf, 0xc3, 0xc0, 0xf8, 0xd1, 0x8a, 0x59, 0xad, 0xe7, 0xae, 0x61, 0x61, 0x1c, 0xb4, 0x27, - 0x75, 0x01, 0xfb, 0x97, 0x75, 0xc5, 0x9a, 0x2a, 0xaf, 0xe9, 0xf5, 0x8d, 0xbc, 0x60, 0x06, 0xd0, - 0x90, 0x63, 0x6f, 0x85, 0x9b, 0xf5, 0x34, 0x99, 0x25, 0xa7, 0xa3, 0x0c, 0xe7, 0xdf, 0xdd, 0xfa, - 0x47, 0xd1, 0x1b, 0x2e, 0x75, 0x02, 0x07, 0x1d, 0xc6, 0x3b, 0xae, 0x3d, 0x21, 0xc2, 0xee, 0xd2, - 0x88, 0x09, 0x84, 0xb1, 0x0e, 0xb5, 0x9a, 0x01, 0x74, 0x84, 0x2f, 0x87, 0x33, 0xf2, 0x14, 0x1c, - 0x43, 0x1d, 0x6a, 0x95, 0x03, 0x16, 0xec, 0x45, 0x53, 0x49, 0xf6, 0x9d, 0xfa, 0x64, 0x3a, 0x84, - 0xc9, 0x2f, 0x52, 0x1b, 0x2b, 0xfb, 0x48, 0x60, 0x78, 0xfb, 0x62, 0x1a, 0xc9, 0x17, 0x8b, 0x02, - 0xaf, 0x00, 0x63, 0xf0, 0x3b, 0xb7, 0x62, 0xb3, 0x2c, 0x4c, 0xf9, 0x8c, 0x47, 0x11, 0xfd, 0x67, - 0x36, 0xe9, 0x74, 0x5b, 0x68, 0xb1, 0x6a, 0xe7, 0x2c, 0xc1, 0x6b, 0x98, 0x74, 0xf7, 0xe1, 0xd5, - 0x1e, 0xb4, 0xec, 0x1e, 0xf6, 0x6e, 0x58, 0x6c, 0x65, 0x4b, 0x23, 0x96, 0x6b, 0x8f, 0x39, 0x8c, - 0x36, 0x3e, 0x84, 0x69, 0xec, 0xde, 0x9e, 0x57, 0x7a, 0xfc, 0xaf, 0x16, 0xe1, 0x0f, 0x83, 0xb0, - 0x04, 0xe7, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x86, 0x0b, 0x65, 0xc1, 0x14, 0x02, 0x00, 0x00, + // 454 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x94, 0xd1, 0x6e, 0xd3, 0x30, + 0x14, 0x86, 0x9b, 0x16, 0xc2, 0x76, 0x5a, 0xd8, 0x74, 0x06, 0x2c, 0x0a, 0x02, 0x26, 0x5f, 0x20, + 0xc4, 0xc5, 0x34, 0x05, 0x5e, 0x00, 0xd0, 0xa6, 0x4e, 0x4c, 0x23, 0x32, 0xe3, 0x82, 0x4b, 0x2f, + 0x71, 0x56, 0x43, 0x62, 0x87, 0xd8, 0x45, 0xf4, 0x45, 0x78, 0x04, 0x6e, 0x78, 0x49, 0x14, 0x27, + 0x69, 0xd2, 0x06, 0x76, 0x93, 0xbb, 0xe3, 0xf8, 0xf7, 0x97, 0xdf, 0xe7, 0xfc, 0x32, 0xcc, 0x6e, + 0x84, 0x61, 0xe9, 0xea, 0x38, 0x2f, 0x94, 0x51, 0xe8, 0x56, 0x2b, 0xf2, 0x14, 0xee, 0xbd, 0x53, + 0x2a, 0xe5, 0x4c, 0x22, 0xc2, 0x1d, 0x53, 0x2c, 0xb9, 0xe7, 0x1c, 0x39, 0x2f, 0x77, 0xa8, 0xad, + 0xc9, 0x29, 0xec, 0x9d, 0xcb, 0x44, 0x51, 0x9e, 0x68, 0xca, 0xbf, 0x2f, 0xb9, 0x36, 0x18, 0x00, + 0x14, 0x3c, 0x57, 0x5a, 0x18, 0x55, 0xac, 0xac, 0x78, 0x1a, 0xe0, 0x71, 0x0d, 0xa7, 0xeb, 0x1d, + 0xda, 0x51, 0x91, 0x17, 0xb0, 0xdf, 0x62, 0x74, 0xae, 0xa4, 0xe6, 0xe5, 0xef, 0x62, 0x66, 0x98, + 0x25, 0xcc, 0xa8, 0xad, 0xc9, 0x11, 0x40, 0x4b, 0x28, 0x15, 0x39, 0x33, 0x0b, 0xab, 0xd8, 0xa5, + 0xb6, 0x26, 0x73, 0xc0, 0x50, 0x69, 0x43, 0x79, 0xc4, 0xc5, 0x0f, 0x3e, 0xc4, 0xd3, 0x23, 0x38, + 0xd8, 0x20, 0x55, 0xb6, 0xc8, 0x33, 0x98, 0xbd, 0x57, 0x59, 0x26, 0xcc, 0xc7, 0xeb, 0xaf, 0x3c, + 0x32, 0xf8, 0x00, 0xc6, 0x22, 0xae, 0x2d, 0x8c, 0x45, 0x4c, 0x7e, 0x39, 0x80, 0x67, 0x42, 0xc6, + 0x94, 0x27, 0x97, 0x2c, 0x1b, 0xe2, 0x00, 0xdf, 0x00, 0x44, 0x4a, 0x1a, 0x26, 0xa4, 0x90, 0x37, + 0xde, 0xd8, 0x9e, 0x79, 0xd8, 0x9c, 0xe9, 0x9a, 0xa0, 0x1d, 0x1d, 0x3e, 0x06, 0x37, 0x2f, 0x78, + 0x22, 0x7e, 0x7a, 0x13, 0xdb, 0xb9, 0x7a, 0x55, 0xf6, 0xb8, 0xf6, 0xb4, 0xd1, 0x63, 0xc9, 0xb2, + 0x72, 0xa4, 0x93, 0xb2, 0xc7, 0x65, 0x4d, 0xfe, 0x38, 0x70, 0x58, 0xc1, 0xcf, 0xf5, 0x5b, 0x19, + 0x71, 0x6d, 0x54, 0x31, 0xe4, 0x16, 0x27, 0xb0, 0xc3, 0x6a, 0xcc, 0xad, 0x77, 0x58, 0xab, 0xf0, + 0x15, 0xdc, 0x8d, 0x16, 0x22, 0x8d, 0xed, 0x05, 0xfe, 0x27, 0xaf, 0x24, 0xc1, 0x6f, 0x07, 0x76, + 0x3f, 0x65, 0xac, 0x30, 0xf3, 0xab, 0xab, 0x10, 0x3f, 0x00, 0x36, 0x39, 0xfa, 0x9c, 0xa7, 0x8a, + 0xc5, 0x21, 0x8b, 0xbe, 0xe1, 0x61, 0x03, 0xd8, 0x8a, 0xaa, 0xef, 0xf5, 0x37, 0xea, 0x29, 0x8f, + 0x4e, 0x1c, 0xbc, 0x80, 0x83, 0xf6, 0xbb, 0x0d, 0xc1, 0x00, 0x5a, 0xf0, 0x05, 0xee, 0x5f, 0x2a, + 0x23, 0x12, 0x11, 0x31, 0x23, 0x94, 0xd4, 0x38, 0x87, 0x69, 0x27, 0x5f, 0xe8, 0x37, 0xa7, 0xfb, + 0xf1, 0xf5, 0x9f, 0xfc, 0x73, 0xaf, 0x81, 0x07, 0x17, 0x30, 0xa1, 0x3c, 0xc1, 0x53, 0x98, 0x76, + 0x82, 0xd7, 0x02, 0xfb, 0x69, 0x6c, 0xad, 0x6e, 0x27, 0x82, 0x8c, 0x82, 0x10, 0xdc, 0xaa, 0xd1, + 0x78, 0x06, 0xfb, 0xdb, 0x41, 0xc0, 0xe7, 0x9b, 0xc3, 0xe8, 0x45, 0xc4, 0xdf, 0x6b, 0x04, 0xf5, + 0xb3, 0x41, 0x46, 0xd7, 0xae, 0x7d, 0x52, 0x5e, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xf7, 0xee, + 0x2a, 0x7f, 0x62, 0x04, 0x00, 0x00, } diff --git a/ruby/lib/gitaly/gitaly_pb.rb b/ruby/lib/gitaly/gitaly_pb.rb index 9a040343..9e8d9d40 100644 --- a/ruby/lib/gitaly/gitaly_pb.rb +++ b/ruby/lib/gitaly/gitaly_pb.rb @@ -4,6 +4,9 @@ require 'google/protobuf' Google::Protobuf::DescriptorPool.generated_pool.build do + add_message "gitaly.Boolean" do + optional :true, :bool, 1 + end add_message "gitaly.InfoRefsRequest" do optional :repository, :message, 1, "gitaly.Repository" end @@ -18,12 +21,33 @@ Google::Protobuf::DescriptorPool.generated_pool.build do end add_message "gitaly.PostReceiveResponse" do end + add_message "gitaly.CommitObject" do + optional :id, :string, 1 + end + add_message "gitaly.FindRefNameRequest" do + optional :repository, :message, 1, "gitaly.Repository" + optional :containing, :message, 2, "gitaly.CommitObject" + optional :prefix, :bytes, 3 + end + add_message "gitaly.RefNamesResponse" do + repeated :name, :bytes, 1 + end + add_message "gitaly.CommitIsAncestorRequest" do + optional :repository, :message, 1, "gitaly.Repository" + optional :ancestor, :message, 2, "gitaly.CommitObject" + optional :child, :message, 3, "gitaly.CommitObject" + end end module Gitaly + Boolean = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.Boolean").msgclass InfoRefsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.InfoRefsRequest").msgclass InfoRefsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.InfoRefsResponse").msgclass Repository = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.Repository").msgclass PostReceiveRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.PostReceiveRequest").msgclass PostReceiveResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.PostReceiveResponse").msgclass + CommitObject = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CommitObject").msgclass + FindRefNameRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindRefNameRequest").msgclass + RefNamesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.RefNamesResponse").msgclass + CommitIsAncestorRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CommitIsAncestorRequest").msgclass end diff --git a/ruby/lib/gitaly/gitaly_services_pb.rb b/ruby/lib/gitaly/gitaly_services_pb.rb index 52872cd3..295cf4b7 100644 --- a/ruby/lib/gitaly/gitaly_services_pb.rb +++ b/ruby/lib/gitaly/gitaly_services_pb.rb @@ -35,6 +35,35 @@ module Gitaly rpc :PostReceive, PostReceiveRequest, PostReceiveResponse end + Stub = Service.rpc_stub_class + end + module Ref + class Service + + include GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.Ref' + + # Find a Ref matching the given constraints. Response may be empty. + rpc :FindRefName, FindRefNameRequest, RefNamesResponse + end + + Stub = Service.rpc_stub_class + end + module Commit + class Service + + include GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'gitaly.Commit' + + rpc :CommitIsAncestor, CommitIsAncestorRequest, Boolean + end + Stub = Service.rpc_stub_class end end -- GitLab From fc3c6de5bcad6df1fcaf64d0dc3a18bc5f5e3e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Thu, 16 Feb 2017 15:46:14 +0100 Subject: [PATCH 2/9] Rename true=>value --- gitaly.proto | 2 +- go/gitaly.pb.go | 66 ++++++++++++++++++------------------ ruby/lib/gitaly/gitaly_pb.rb | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/gitaly.proto b/gitaly.proto index 1e42def0..df6d5274 100644 --- a/gitaly.proto +++ b/gitaly.proto @@ -25,7 +25,7 @@ service Commit { } message Boolean { - bool true = 1; + bool value = 1; } message InfoRefsRequest { diff --git a/go/gitaly.pb.go b/go/gitaly.pb.go index b26fea8d..5ce6e370 100644 --- a/go/gitaly.pb.go +++ b/go/gitaly.pb.go @@ -43,7 +43,7 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type Boolean struct { - True bool `protobuf:"varint,1,opt,name=true" json:"true,omitempty"` + Value bool `protobuf:"varint,1,opt,name=value" json:"value,omitempty"` } func (m *Boolean) Reset() { *m = Boolean{} } @@ -51,9 +51,9 @@ func (m *Boolean) String() string { return proto.CompactTextString(m) func (*Boolean) ProtoMessage() {} func (*Boolean) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } -func (m *Boolean) GetTrue() bool { +func (m *Boolean) GetValue() bool { if m != nil { - return m.True + return m.Value } return false } @@ -603,34 +603,34 @@ var _Commit_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gitaly.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 454 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x94, 0xd1, 0x6e, 0xd3, 0x30, - 0x14, 0x86, 0x9b, 0x16, 0xc2, 0x76, 0x5a, 0xd8, 0x74, 0x06, 0x2c, 0x0a, 0x02, 0x26, 0x5f, 0x20, - 0xc4, 0xc5, 0x34, 0x05, 0x5e, 0x00, 0xd0, 0xa6, 0x4e, 0x4c, 0x23, 0x32, 0xe3, 0x82, 0x4b, 0x2f, - 0x71, 0x56, 0x43, 0x62, 0x87, 0xd8, 0x45, 0xf4, 0x45, 0x78, 0x04, 0x6e, 0x78, 0x49, 0x14, 0x27, - 0x69, 0xd2, 0x06, 0x76, 0x93, 0xbb, 0xe3, 0xf8, 0xf7, 0x97, 0xdf, 0xe7, 0xfc, 0x32, 0xcc, 0x6e, - 0x84, 0x61, 0xe9, 0xea, 0x38, 0x2f, 0x94, 0x51, 0xe8, 0x56, 0x2b, 0xf2, 0x14, 0xee, 0xbd, 0x53, - 0x2a, 0xe5, 0x4c, 0x22, 0xc2, 0x1d, 0x53, 0x2c, 0xb9, 0xe7, 0x1c, 0x39, 0x2f, 0x77, 0xa8, 0xad, - 0xc9, 0x29, 0xec, 0x9d, 0xcb, 0x44, 0x51, 0x9e, 0x68, 0xca, 0xbf, 0x2f, 0xb9, 0x36, 0x18, 0x00, - 0x14, 0x3c, 0x57, 0x5a, 0x18, 0x55, 0xac, 0xac, 0x78, 0x1a, 0xe0, 0x71, 0x0d, 0xa7, 0xeb, 0x1d, - 0xda, 0x51, 0x91, 0x17, 0xb0, 0xdf, 0x62, 0x74, 0xae, 0xa4, 0xe6, 0xe5, 0xef, 0x62, 0x66, 0x98, - 0x25, 0xcc, 0xa8, 0xad, 0xc9, 0x11, 0x40, 0x4b, 0x28, 0x15, 0x39, 0x33, 0x0b, 0xab, 0xd8, 0xa5, - 0xb6, 0x26, 0x73, 0xc0, 0x50, 0x69, 0x43, 0x79, 0xc4, 0xc5, 0x0f, 0x3e, 0xc4, 0xd3, 0x23, 0x38, - 0xd8, 0x20, 0x55, 0xb6, 0xc8, 0x33, 0x98, 0xbd, 0x57, 0x59, 0x26, 0xcc, 0xc7, 0xeb, 0xaf, 0x3c, - 0x32, 0xf8, 0x00, 0xc6, 0x22, 0xae, 0x2d, 0x8c, 0x45, 0x4c, 0x7e, 0x39, 0x80, 0x67, 0x42, 0xc6, - 0x94, 0x27, 0x97, 0x2c, 0x1b, 0xe2, 0x00, 0xdf, 0x00, 0x44, 0x4a, 0x1a, 0x26, 0xa4, 0x90, 0x37, - 0xde, 0xd8, 0x9e, 0x79, 0xd8, 0x9c, 0xe9, 0x9a, 0xa0, 0x1d, 0x1d, 0x3e, 0x06, 0x37, 0x2f, 0x78, - 0x22, 0x7e, 0x7a, 0x13, 0xdb, 0xb9, 0x7a, 0x55, 0xf6, 0xb8, 0xf6, 0xb4, 0xd1, 0x63, 0xc9, 0xb2, - 0x72, 0xa4, 0x93, 0xb2, 0xc7, 0x65, 0x4d, 0xfe, 0x38, 0x70, 0x58, 0xc1, 0xcf, 0xf5, 0x5b, 0x19, - 0x71, 0x6d, 0x54, 0x31, 0xe4, 0x16, 0x27, 0xb0, 0xc3, 0x6a, 0xcc, 0xad, 0x77, 0x58, 0xab, 0xf0, - 0x15, 0xdc, 0x8d, 0x16, 0x22, 0x8d, 0xed, 0x05, 0xfe, 0x27, 0xaf, 0x24, 0xc1, 0x6f, 0x07, 0x76, - 0x3f, 0x65, 0xac, 0x30, 0xf3, 0xab, 0xab, 0x10, 0x3f, 0x00, 0x36, 0x39, 0xfa, 0x9c, 0xa7, 0x8a, - 0xc5, 0x21, 0x8b, 0xbe, 0xe1, 0x61, 0x03, 0xd8, 0x8a, 0xaa, 0xef, 0xf5, 0x37, 0xea, 0x29, 0x8f, - 0x4e, 0x1c, 0xbc, 0x80, 0x83, 0xf6, 0xbb, 0x0d, 0xc1, 0x00, 0x5a, 0xf0, 0x05, 0xee, 0x5f, 0x2a, - 0x23, 0x12, 0x11, 0x31, 0x23, 0x94, 0xd4, 0x38, 0x87, 0x69, 0x27, 0x5f, 0xe8, 0x37, 0xa7, 0xfb, - 0xf1, 0xf5, 0x9f, 0xfc, 0x73, 0xaf, 0x81, 0x07, 0x17, 0x30, 0xa1, 0x3c, 0xc1, 0x53, 0x98, 0x76, - 0x82, 0xd7, 0x02, 0xfb, 0x69, 0x6c, 0xad, 0x6e, 0x27, 0x82, 0x8c, 0x82, 0x10, 0xdc, 0xaa, 0xd1, - 0x78, 0x06, 0xfb, 0xdb, 0x41, 0xc0, 0xe7, 0x9b, 0xc3, 0xe8, 0x45, 0xc4, 0xdf, 0x6b, 0x04, 0xf5, - 0xb3, 0x41, 0x46, 0xd7, 0xae, 0x7d, 0x52, 0x5e, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xf7, 0xee, - 0x2a, 0x7f, 0x62, 0x04, 0x00, 0x00, + // 455 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xc1, 0x6e, 0xd4, 0x30, + 0x10, 0xdd, 0xec, 0xd2, 0xd0, 0xce, 0x2e, 0xb4, 0x9a, 0x16, 0x1a, 0x05, 0x89, 0x56, 0x3e, 0x20, + 0xc4, 0xa1, 0xaa, 0x02, 0x3f, 0x00, 0xa8, 0xd5, 0x56, 0x54, 0x25, 0x32, 0xe5, 0xc0, 0xd1, 0x4d, + 0x9c, 0xd6, 0x90, 0xd8, 0x21, 0x76, 0x57, 0xec, 0x8f, 0xf0, 0x09, 0x5c, 0xf8, 0x49, 0x14, 0x27, + 0xd9, 0x64, 0x37, 0xc0, 0x25, 0xb7, 0x19, 0xcf, 0x9b, 0xa7, 0x37, 0x33, 0x4f, 0x86, 0xd9, 0xad, + 0x30, 0x2c, 0x5d, 0x9e, 0xe4, 0x85, 0x32, 0x0a, 0xdd, 0x2a, 0x23, 0x47, 0xf0, 0xf0, 0x9d, 0x52, + 0x29, 0x67, 0x12, 0x0f, 0x60, 0x6b, 0xc1, 0xd2, 0x7b, 0xee, 0x39, 0xc7, 0xce, 0xcb, 0x6d, 0x5a, + 0x25, 0xe4, 0x0c, 0x76, 0x2f, 0x64, 0xa2, 0x28, 0x4f, 0x34, 0xe5, 0xdf, 0xef, 0xb9, 0x36, 0x18, + 0x00, 0x14, 0x3c, 0x57, 0x5a, 0x18, 0x55, 0x2c, 0x2d, 0x7a, 0x1a, 0xe0, 0x49, 0x4d, 0x4f, 0x57, + 0x15, 0xda, 0x41, 0x91, 0x17, 0xb0, 0xd7, 0xd2, 0xe8, 0x5c, 0x49, 0xcd, 0x11, 0xe1, 0x41, 0xcc, + 0x0c, 0xb3, 0x0c, 0x33, 0x6a, 0x63, 0x72, 0x0c, 0xd0, 0x32, 0x94, 0x88, 0x9c, 0x99, 0x3b, 0x8b, + 0xd8, 0xa1, 0x36, 0x26, 0x73, 0xc0, 0x50, 0x69, 0x43, 0x79, 0xc4, 0xc5, 0x82, 0x0f, 0xd1, 0xf4, + 0x04, 0xf6, 0xd7, 0x98, 0x2a, 0x59, 0xe4, 0x39, 0xcc, 0xde, 0xab, 0x2c, 0x13, 0xe6, 0xe3, 0xcd, + 0x57, 0x1e, 0x19, 0x7c, 0x0c, 0x63, 0x11, 0xd7, 0x12, 0xc6, 0x22, 0x26, 0x3f, 0x1d, 0xc0, 0x73, + 0x21, 0x63, 0xca, 0x93, 0x2b, 0x96, 0x0d, 0x51, 0x80, 0x6f, 0x00, 0x22, 0x25, 0x0d, 0x13, 0x52, + 0xc8, 0x5b, 0x6f, 0x6c, 0x7b, 0x0e, 0x9a, 0x9e, 0xae, 0x08, 0xda, 0xc1, 0xe1, 0x53, 0x70, 0xf3, + 0x82, 0x27, 0xe2, 0x87, 0x37, 0xb1, 0x9b, 0xab, 0xb3, 0x72, 0xc7, 0xb5, 0xa6, 0xb5, 0x1d, 0x4b, + 0x96, 0x95, 0x37, 0x9d, 0x94, 0x3b, 0x2e, 0x63, 0xf2, 0xdb, 0x81, 0xc3, 0x8a, 0xfc, 0x42, 0xbf, + 0x95, 0x11, 0xd7, 0x46, 0x15, 0x43, 0xa6, 0x38, 0x85, 0x6d, 0x56, 0xd3, 0xfc, 0x77, 0x86, 0x15, + 0x0a, 0x5f, 0xc1, 0x56, 0x74, 0x27, 0xd2, 0xd8, 0x0e, 0xf0, 0x2f, 0x78, 0x05, 0x09, 0x7e, 0x39, + 0xb0, 0xf3, 0x29, 0x63, 0x85, 0x99, 0x5f, 0x5f, 0x87, 0xf8, 0x01, 0xb0, 0xf1, 0xd1, 0xe7, 0x3c, + 0x55, 0x2c, 0x0e, 0x59, 0xf4, 0x0d, 0x0f, 0x1b, 0x82, 0x0d, 0xab, 0xfa, 0x5e, 0xbf, 0x50, 0x5f, + 0x79, 0x74, 0xea, 0xe0, 0x25, 0xec, 0xb7, 0xef, 0xd6, 0x04, 0x03, 0xd8, 0x82, 0x2f, 0xf0, 0xe8, + 0x4a, 0x19, 0x91, 0x88, 0x88, 0x19, 0xa1, 0xa4, 0xc6, 0x39, 0x4c, 0x3b, 0xfe, 0x42, 0xbf, 0xe9, + 0xee, 0xdb, 0xd7, 0x7f, 0xf6, 0xd7, 0x5a, 0x43, 0x1e, 0x5c, 0xc2, 0x84, 0xf2, 0x04, 0xcf, 0x60, + 0xda, 0x31, 0x5e, 0x4b, 0xd8, 0x77, 0x63, 0x2b, 0x75, 0xd3, 0x11, 0x64, 0x14, 0x84, 0xe0, 0x56, + 0x8b, 0xc6, 0x73, 0xd8, 0xdb, 0x34, 0x02, 0x1e, 0xad, 0x1f, 0xa3, 0x67, 0x11, 0x7f, 0xb7, 0x01, + 0xd4, 0x1f, 0x07, 0x19, 0xdd, 0xb8, 0xf6, 0x53, 0x79, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0xb0, + 0x68, 0x70, 0xc9, 0x64, 0x04, 0x00, 0x00, } diff --git a/ruby/lib/gitaly/gitaly_pb.rb b/ruby/lib/gitaly/gitaly_pb.rb index 9e8d9d40..e96c6840 100644 --- a/ruby/lib/gitaly/gitaly_pb.rb +++ b/ruby/lib/gitaly/gitaly_pb.rb @@ -5,7 +5,7 @@ require 'google/protobuf' Google::Protobuf::DescriptorPool.generated_pool.build do add_message "gitaly.Boolean" do - optional :true, :bool, 1 + optional :value, :bool, 1 end add_message "gitaly.InfoRefsRequest" do optional :repository, :message, 1, "gitaly.Repository" -- GitLab From 7b3b7f3758545db383a09482ed67045841c4e434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Fri, 17 Feb 2017 17:04:06 +0100 Subject: [PATCH 3/9] name => names because array --- gitaly.proto | 2 +- go/gitaly.pb.go | 66 ++++++++++++++++++------------------ ruby/lib/gitaly/gitaly_pb.rb | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/gitaly.proto b/gitaly.proto index df6d5274..f6422ed1 100644 --- a/gitaly.proto +++ b/gitaly.proto @@ -61,7 +61,7 @@ message FindRefNameRequest { message RefNamesResponse { // Example name: "refs/heads/master". Cannot assume UTF8, so the type is bytes. - repeated bytes name = 1; + repeated bytes names = 1; } message CommitIsAncestorRequest { diff --git a/go/gitaly.pb.go b/go/gitaly.pb.go index 5ce6e370..e7e7ba4c 100644 --- a/go/gitaly.pb.go +++ b/go/gitaly.pb.go @@ -183,7 +183,7 @@ func (m *FindRefNameRequest) GetPrefix() []byte { type RefNamesResponse struct { // Example name: "refs/heads/master". Cannot assume UTF8, so the type is bytes. - Name [][]byte `protobuf:"bytes,1,rep,name=name,proto3" json:"name,omitempty"` + Names [][]byte `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"` } func (m *RefNamesResponse) Reset() { *m = RefNamesResponse{} } @@ -191,9 +191,9 @@ func (m *RefNamesResponse) String() string { return proto.CompactText func (*RefNamesResponse) ProtoMessage() {} func (*RefNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } -func (m *RefNamesResponse) GetName() [][]byte { +func (m *RefNamesResponse) GetNames() [][]byte { if m != nil { - return m.Name + return m.Names } return nil } @@ -603,34 +603,34 @@ var _Commit_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gitaly.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 455 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xc1, 0x6e, 0xd4, 0x30, - 0x10, 0xdd, 0xec, 0xd2, 0xd0, 0xce, 0x2e, 0xb4, 0x9a, 0x16, 0x1a, 0x05, 0x89, 0x56, 0x3e, 0x20, - 0xc4, 0xa1, 0xaa, 0x02, 0x3f, 0x00, 0xa8, 0xd5, 0x56, 0x54, 0x25, 0x32, 0xe5, 0xc0, 0xd1, 0x4d, - 0x9c, 0xd6, 0x90, 0xd8, 0x21, 0x76, 0x57, 0xec, 0x8f, 0xf0, 0x09, 0x5c, 0xf8, 0x49, 0x14, 0x27, - 0xd9, 0x64, 0x37, 0xc0, 0x25, 0xb7, 0x19, 0xcf, 0x9b, 0xa7, 0x37, 0x33, 0x4f, 0x86, 0xd9, 0xad, - 0x30, 0x2c, 0x5d, 0x9e, 0xe4, 0x85, 0x32, 0x0a, 0xdd, 0x2a, 0x23, 0x47, 0xf0, 0xf0, 0x9d, 0x52, - 0x29, 0x67, 0x12, 0x0f, 0x60, 0x6b, 0xc1, 0xd2, 0x7b, 0xee, 0x39, 0xc7, 0xce, 0xcb, 0x6d, 0x5a, - 0x25, 0xe4, 0x0c, 0x76, 0x2f, 0x64, 0xa2, 0x28, 0x4f, 0x34, 0xe5, 0xdf, 0xef, 0xb9, 0x36, 0x18, - 0x00, 0x14, 0x3c, 0x57, 0x5a, 0x18, 0x55, 0x2c, 0x2d, 0x7a, 0x1a, 0xe0, 0x49, 0x4d, 0x4f, 0x57, - 0x15, 0xda, 0x41, 0x91, 0x17, 0xb0, 0xd7, 0xd2, 0xe8, 0x5c, 0x49, 0xcd, 0x11, 0xe1, 0x41, 0xcc, - 0x0c, 0xb3, 0x0c, 0x33, 0x6a, 0x63, 0x72, 0x0c, 0xd0, 0x32, 0x94, 0x88, 0x9c, 0x99, 0x3b, 0x8b, - 0xd8, 0xa1, 0x36, 0x26, 0x73, 0xc0, 0x50, 0x69, 0x43, 0x79, 0xc4, 0xc5, 0x82, 0x0f, 0xd1, 0xf4, - 0x04, 0xf6, 0xd7, 0x98, 0x2a, 0x59, 0xe4, 0x39, 0xcc, 0xde, 0xab, 0x2c, 0x13, 0xe6, 0xe3, 0xcd, - 0x57, 0x1e, 0x19, 0x7c, 0x0c, 0x63, 0x11, 0xd7, 0x12, 0xc6, 0x22, 0x26, 0x3f, 0x1d, 0xc0, 0x73, - 0x21, 0x63, 0xca, 0x93, 0x2b, 0x96, 0x0d, 0x51, 0x80, 0x6f, 0x00, 0x22, 0x25, 0x0d, 0x13, 0x52, - 0xc8, 0x5b, 0x6f, 0x6c, 0x7b, 0x0e, 0x9a, 0x9e, 0xae, 0x08, 0xda, 0xc1, 0xe1, 0x53, 0x70, 0xf3, - 0x82, 0x27, 0xe2, 0x87, 0x37, 0xb1, 0x9b, 0xab, 0xb3, 0x72, 0xc7, 0xb5, 0xa6, 0xb5, 0x1d, 0x4b, - 0x96, 0x95, 0x37, 0x9d, 0x94, 0x3b, 0x2e, 0x63, 0xf2, 0xdb, 0x81, 0xc3, 0x8a, 0xfc, 0x42, 0xbf, - 0x95, 0x11, 0xd7, 0x46, 0x15, 0x43, 0xa6, 0x38, 0x85, 0x6d, 0x56, 0xd3, 0xfc, 0x77, 0x86, 0x15, - 0x0a, 0x5f, 0xc1, 0x56, 0x74, 0x27, 0xd2, 0xd8, 0x0e, 0xf0, 0x2f, 0x78, 0x05, 0x09, 0x7e, 0x39, - 0xb0, 0xf3, 0x29, 0x63, 0x85, 0x99, 0x5f, 0x5f, 0x87, 0xf8, 0x01, 0xb0, 0xf1, 0xd1, 0xe7, 0x3c, - 0x55, 0x2c, 0x0e, 0x59, 0xf4, 0x0d, 0x0f, 0x1b, 0x82, 0x0d, 0xab, 0xfa, 0x5e, 0xbf, 0x50, 0x5f, - 0x79, 0x74, 0xea, 0xe0, 0x25, 0xec, 0xb7, 0xef, 0xd6, 0x04, 0x03, 0xd8, 0x82, 0x2f, 0xf0, 0xe8, - 0x4a, 0x19, 0x91, 0x88, 0x88, 0x19, 0xa1, 0xa4, 0xc6, 0x39, 0x4c, 0x3b, 0xfe, 0x42, 0xbf, 0xe9, - 0xee, 0xdb, 0xd7, 0x7f, 0xf6, 0xd7, 0x5a, 0x43, 0x1e, 0x5c, 0xc2, 0x84, 0xf2, 0x04, 0xcf, 0x60, - 0xda, 0x31, 0x5e, 0x4b, 0xd8, 0x77, 0x63, 0x2b, 0x75, 0xd3, 0x11, 0x64, 0x14, 0x84, 0xe0, 0x56, - 0x8b, 0xc6, 0x73, 0xd8, 0xdb, 0x34, 0x02, 0x1e, 0xad, 0x1f, 0xa3, 0x67, 0x11, 0x7f, 0xb7, 0x01, - 0xd4, 0x1f, 0x07, 0x19, 0xdd, 0xb8, 0xf6, 0x53, 0x79, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0xb0, - 0x68, 0x70, 0xc9, 0x64, 0x04, 0x00, 0x00, + // 460 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x94, 0xd1, 0x6e, 0xd3, 0x30, + 0x14, 0x86, 0x9b, 0x96, 0x96, 0xed, 0x34, 0xb0, 0xea, 0xac, 0xb0, 0x28, 0x48, 0xac, 0xf2, 0x05, + 0xaa, 0xb8, 0x98, 0xa6, 0xc0, 0x0b, 0x00, 0xda, 0xd4, 0x89, 0x69, 0x44, 0x66, 0x5c, 0x70, 0xe9, + 0x25, 0xce, 0x66, 0x48, 0xec, 0x10, 0x7b, 0x13, 0x7b, 0x11, 0x1e, 0x81, 0x1b, 0x5e, 0x12, 0xcd, + 0x49, 0x96, 0xb4, 0x81, 0xdd, 0xe4, 0xce, 0xc7, 0xfe, 0xfd, 0xe9, 0x3f, 0xc7, 0xbf, 0x0c, 0xee, + 0xa5, 0x30, 0x2c, 0xbd, 0x3d, 0xc8, 0x0b, 0x65, 0x14, 0x4e, 0xca, 0x8a, 0xec, 0xc3, 0xe3, 0xf7, + 0x4a, 0xa5, 0x9c, 0x49, 0x9c, 0xc3, 0xf8, 0x86, 0xa5, 0xd7, 0xdc, 0x73, 0x16, 0xce, 0x72, 0x8b, + 0x96, 0x05, 0x39, 0x82, 0x9d, 0x13, 0x99, 0x28, 0xca, 0x13, 0x4d, 0xf9, 0x8f, 0x6b, 0xae, 0x0d, + 0x06, 0x00, 0x05, 0xcf, 0x95, 0x16, 0x46, 0x15, 0xb7, 0x56, 0x3d, 0x0d, 0xf0, 0xa0, 0xc2, 0xd3, + 0xfb, 0x13, 0xda, 0x52, 0x91, 0x57, 0x30, 0x6b, 0x30, 0x3a, 0x57, 0x52, 0x73, 0x44, 0x78, 0x14, + 0x33, 0xc3, 0x2c, 0xc1, 0xa5, 0x76, 0x4d, 0x16, 0x00, 0x0d, 0xe1, 0x4e, 0x91, 0x33, 0x73, 0x65, + 0x15, 0xdb, 0xd4, 0xae, 0xc9, 0x0a, 0x30, 0x54, 0xda, 0x50, 0x1e, 0x71, 0x71, 0xc3, 0xfb, 0x78, + 0x7a, 0x06, 0xbb, 0x6b, 0xa4, 0xd2, 0x16, 0x79, 0x09, 0xee, 0x07, 0x95, 0x65, 0xc2, 0x7c, 0xba, + 0xf8, 0xc6, 0x23, 0x83, 0x4f, 0x61, 0x28, 0xe2, 0xca, 0xc2, 0x50, 0xc4, 0xe4, 0x97, 0x03, 0x78, + 0x2c, 0x64, 0x4c, 0x79, 0x72, 0xc6, 0xb2, 0x3e, 0x0e, 0xf0, 0x2d, 0x40, 0xa4, 0xa4, 0x61, 0x42, + 0x0a, 0x79, 0xe9, 0x0d, 0xed, 0x9d, 0x79, 0x7d, 0xa7, 0x6d, 0x82, 0xb6, 0x74, 0xf8, 0x1c, 0x26, + 0x79, 0xc1, 0x13, 0xf1, 0xd3, 0x1b, 0xd9, 0xc9, 0x55, 0x15, 0x59, 0xc2, 0xac, 0xf2, 0xd4, 0xcc, + 0x78, 0x0e, 0x63, 0x79, 0xb7, 0xe1, 0x39, 0x8b, 0xd1, 0xd2, 0xa5, 0x65, 0x41, 0xfe, 0x38, 0xb0, + 0x57, 0xe2, 0x4f, 0xf4, 0x3b, 0x19, 0x71, 0x6d, 0x54, 0xd1, 0xa7, 0x8f, 0x43, 0xd8, 0x62, 0x15, + 0xe6, 0xc1, 0x2e, 0xee, 0x55, 0xf8, 0x1a, 0xc6, 0xd1, 0x95, 0x48, 0x63, 0xdb, 0xc2, 0xff, 0xe4, + 0xa5, 0x24, 0xf8, 0xed, 0xc0, 0xf6, 0xe7, 0x8c, 0x15, 0x66, 0x75, 0x7e, 0x1e, 0xe2, 0x47, 0xc0, + 0x3a, 0x49, 0x5f, 0xf2, 0x54, 0xb1, 0x38, 0x64, 0xd1, 0x77, 0xdc, 0xab, 0x01, 0x1b, 0x61, 0xf5, + 0xbd, 0xee, 0x41, 0xf5, 0xce, 0x83, 0x43, 0x07, 0x4f, 0x61, 0xb7, 0xd9, 0xb7, 0x31, 0xe8, 0x41, + 0x0b, 0xbe, 0xc2, 0x93, 0x33, 0x65, 0x44, 0x22, 0x22, 0x66, 0x84, 0x92, 0x1a, 0x57, 0x30, 0x6d, + 0x25, 0x0c, 0xfd, 0xfa, 0x76, 0x37, 0xc0, 0xfe, 0x8b, 0x7f, 0x9e, 0xd5, 0xf0, 0xe0, 0x14, 0x46, + 0x94, 0x27, 0x78, 0x04, 0xd3, 0x56, 0xf4, 0x1a, 0x60, 0x37, 0x8f, 0x8d, 0xd5, 0xcd, 0x4c, 0x90, + 0x41, 0x10, 0xc2, 0xa4, 0x1c, 0x34, 0x1e, 0xc3, 0x6c, 0x33, 0x08, 0xb8, 0xbf, 0xfe, 0x18, 0x9d, + 0x88, 0xf8, 0x3b, 0xb5, 0xa0, 0xfa, 0x3a, 0xc8, 0xe0, 0x62, 0x62, 0xbf, 0x95, 0x37, 0x7f, 0x03, + 0x00, 0x00, 0xff, 0xff, 0x18, 0x9b, 0xdf, 0xa5, 0x66, 0x04, 0x00, 0x00, } diff --git a/ruby/lib/gitaly/gitaly_pb.rb b/ruby/lib/gitaly/gitaly_pb.rb index e96c6840..a5e0cfc5 100644 --- a/ruby/lib/gitaly/gitaly_pb.rb +++ b/ruby/lib/gitaly/gitaly_pb.rb @@ -30,7 +30,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :prefix, :bytes, 3 end add_message "gitaly.RefNamesResponse" do - repeated :name, :bytes, 1 + repeated :names, :bytes, 1 end add_message "gitaly.CommitIsAncestorRequest" do optional :repository, :message, 1, "gitaly.Repository" -- GitLab From 2e74a702beb93e8733fd325aac6efe27d87ddb09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Tue, 21 Feb 2017 14:23:43 +0100 Subject: [PATCH 4/9] No more CommitObject for IsAncestor --- gitaly.proto | 4 +- go/gitaly.pb.go | 79 ++++++++++++++++++------------------ ruby/lib/gitaly/gitaly_pb.rb | 4 +- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/gitaly.proto b/gitaly.proto index f6422ed1..b854bd72 100644 --- a/gitaly.proto +++ b/gitaly.proto @@ -66,6 +66,6 @@ message RefNamesResponse { message CommitIsAncestorRequest { Repository repository = 1; - CommitObject ancestor = 2; - CommitObject child = 3; + string ancestor_id = 2; + string child_id = 3; } diff --git a/go/gitaly.pb.go b/go/gitaly.pb.go index e7e7ba4c..0379be46 100644 --- a/go/gitaly.pb.go +++ b/go/gitaly.pb.go @@ -199,9 +199,9 @@ func (m *RefNamesResponse) GetNames() [][]byte { } type CommitIsAncestorRequest struct { - Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` - Ancestor *CommitObject `protobuf:"bytes,2,opt,name=ancestor" json:"ancestor,omitempty"` - Child *CommitObject `protobuf:"bytes,3,opt,name=child" json:"child,omitempty"` + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + AncestorId string `protobuf:"bytes,2,opt,name=ancestor_id,json=ancestorId" json:"ancestor_id,omitempty"` + ChildId string `protobuf:"bytes,3,opt,name=child_id,json=childId" json:"child_id,omitempty"` } func (m *CommitIsAncestorRequest) Reset() { *m = CommitIsAncestorRequest{} } @@ -216,18 +216,18 @@ func (m *CommitIsAncestorRequest) GetRepository() *Repository { return nil } -func (m *CommitIsAncestorRequest) GetAncestor() *CommitObject { +func (m *CommitIsAncestorRequest) GetAncestorId() string { if m != nil { - return m.Ancestor + return m.AncestorId } - return nil + return "" } -func (m *CommitIsAncestorRequest) GetChild() *CommitObject { +func (m *CommitIsAncestorRequest) GetChildId() string { if m != nil { - return m.Child + return m.ChildId } - return nil + return "" } func init() { @@ -603,34 +603,35 @@ var _Commit_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gitaly.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 460 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x94, 0xd1, 0x6e, 0xd3, 0x30, - 0x14, 0x86, 0x9b, 0x96, 0x96, 0xed, 0x34, 0xb0, 0xea, 0xac, 0xb0, 0x28, 0x48, 0xac, 0xf2, 0x05, - 0xaa, 0xb8, 0x98, 0xa6, 0xc0, 0x0b, 0x00, 0xda, 0xd4, 0x89, 0x69, 0x44, 0x66, 0x5c, 0x70, 0xe9, - 0x25, 0xce, 0x66, 0x48, 0xec, 0x10, 0x7b, 0x13, 0x7b, 0x11, 0x1e, 0x81, 0x1b, 0x5e, 0x12, 0xcd, - 0x49, 0x96, 0xb4, 0x81, 0xdd, 0xe4, 0xce, 0xc7, 0xfe, 0xfd, 0xe9, 0x3f, 0xc7, 0xbf, 0x0c, 0xee, - 0xa5, 0x30, 0x2c, 0xbd, 0x3d, 0xc8, 0x0b, 0x65, 0x14, 0x4e, 0xca, 0x8a, 0xec, 0xc3, 0xe3, 0xf7, - 0x4a, 0xa5, 0x9c, 0x49, 0x9c, 0xc3, 0xf8, 0x86, 0xa5, 0xd7, 0xdc, 0x73, 0x16, 0xce, 0x72, 0x8b, - 0x96, 0x05, 0x39, 0x82, 0x9d, 0x13, 0x99, 0x28, 0xca, 0x13, 0x4d, 0xf9, 0x8f, 0x6b, 0xae, 0x0d, - 0x06, 0x00, 0x05, 0xcf, 0x95, 0x16, 0x46, 0x15, 0xb7, 0x56, 0x3d, 0x0d, 0xf0, 0xa0, 0xc2, 0xd3, - 0xfb, 0x13, 0xda, 0x52, 0x91, 0x57, 0x30, 0x6b, 0x30, 0x3a, 0x57, 0x52, 0x73, 0x44, 0x78, 0x14, - 0x33, 0xc3, 0x2c, 0xc1, 0xa5, 0x76, 0x4d, 0x16, 0x00, 0x0d, 0xe1, 0x4e, 0x91, 0x33, 0x73, 0x65, - 0x15, 0xdb, 0xd4, 0xae, 0xc9, 0x0a, 0x30, 0x54, 0xda, 0x50, 0x1e, 0x71, 0x71, 0xc3, 0xfb, 0x78, - 0x7a, 0x06, 0xbb, 0x6b, 0xa4, 0xd2, 0x16, 0x79, 0x09, 0xee, 0x07, 0x95, 0x65, 0xc2, 0x7c, 0xba, - 0xf8, 0xc6, 0x23, 0x83, 0x4f, 0x61, 0x28, 0xe2, 0xca, 0xc2, 0x50, 0xc4, 0xe4, 0x97, 0x03, 0x78, - 0x2c, 0x64, 0x4c, 0x79, 0x72, 0xc6, 0xb2, 0x3e, 0x0e, 0xf0, 0x2d, 0x40, 0xa4, 0xa4, 0x61, 0x42, - 0x0a, 0x79, 0xe9, 0x0d, 0xed, 0x9d, 0x79, 0x7d, 0xa7, 0x6d, 0x82, 0xb6, 0x74, 0xf8, 0x1c, 0x26, - 0x79, 0xc1, 0x13, 0xf1, 0xd3, 0x1b, 0xd9, 0xc9, 0x55, 0x15, 0x59, 0xc2, 0xac, 0xf2, 0xd4, 0xcc, - 0x78, 0x0e, 0x63, 0x79, 0xb7, 0xe1, 0x39, 0x8b, 0xd1, 0xd2, 0xa5, 0x65, 0x41, 0xfe, 0x38, 0xb0, - 0x57, 0xe2, 0x4f, 0xf4, 0x3b, 0x19, 0x71, 0x6d, 0x54, 0xd1, 0xa7, 0x8f, 0x43, 0xd8, 0x62, 0x15, - 0xe6, 0xc1, 0x2e, 0xee, 0x55, 0xf8, 0x1a, 0xc6, 0xd1, 0x95, 0x48, 0x63, 0xdb, 0xc2, 0xff, 0xe4, - 0xa5, 0x24, 0xf8, 0xed, 0xc0, 0xf6, 0xe7, 0x8c, 0x15, 0x66, 0x75, 0x7e, 0x1e, 0xe2, 0x47, 0xc0, - 0x3a, 0x49, 0x5f, 0xf2, 0x54, 0xb1, 0x38, 0x64, 0xd1, 0x77, 0xdc, 0xab, 0x01, 0x1b, 0x61, 0xf5, - 0xbd, 0xee, 0x41, 0xf5, 0xce, 0x83, 0x43, 0x07, 0x4f, 0x61, 0xb7, 0xd9, 0xb7, 0x31, 0xe8, 0x41, - 0x0b, 0xbe, 0xc2, 0x93, 0x33, 0x65, 0x44, 0x22, 0x22, 0x66, 0x84, 0x92, 0x1a, 0x57, 0x30, 0x6d, - 0x25, 0x0c, 0xfd, 0xfa, 0x76, 0x37, 0xc0, 0xfe, 0x8b, 0x7f, 0x9e, 0xd5, 0xf0, 0xe0, 0x14, 0x46, - 0x94, 0x27, 0x78, 0x04, 0xd3, 0x56, 0xf4, 0x1a, 0x60, 0x37, 0x8f, 0x8d, 0xd5, 0xcd, 0x4c, 0x90, - 0x41, 0x10, 0xc2, 0xa4, 0x1c, 0x34, 0x1e, 0xc3, 0x6c, 0x33, 0x08, 0xb8, 0xbf, 0xfe, 0x18, 0x9d, - 0x88, 0xf8, 0x3b, 0xb5, 0xa0, 0xfa, 0x3a, 0xc8, 0xe0, 0x62, 0x62, 0xbf, 0x95, 0x37, 0x7f, 0x03, - 0x00, 0x00, 0xff, 0xff, 0x18, 0x9b, 0xdf, 0xa5, 0x66, 0x04, 0x00, 0x00, + // 467 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xd1, 0x6e, 0xd3, 0x30, + 0x14, 0x6d, 0x5a, 0xd6, 0xad, 0xb7, 0x85, 0x55, 0x77, 0x85, 0x85, 0x22, 0xd1, 0xca, 0x0f, 0xa8, + 0x4f, 0x13, 0x0a, 0xfc, 0x00, 0xa0, 0x4d, 0xad, 0x98, 0x46, 0x65, 0xc6, 0x03, 0x4f, 0xc8, 0x8b, + 0x9d, 0xcd, 0x90, 0xd8, 0x21, 0xf6, 0x26, 0xf6, 0x09, 0xfc, 0x00, 0x9f, 0xc0, 0x77, 0xa2, 0x3a, + 0x09, 0x49, 0x9b, 0xbd, 0xe5, 0x2d, 0xf7, 0xde, 0x73, 0x4f, 0x8e, 0x7d, 0x8e, 0x0c, 0xa3, 0x6b, + 0x69, 0x59, 0x7c, 0x7f, 0x92, 0x66, 0xda, 0x6a, 0xec, 0xe7, 0x15, 0x99, 0xc1, 0xfe, 0x7b, 0xad, + 0x63, 0xc1, 0x14, 0x4e, 0x60, 0xef, 0x8e, 0xc5, 0xb7, 0xc2, 0xf7, 0xe6, 0xde, 0xe2, 0x80, 0xe6, + 0x05, 0x39, 0x85, 0xc3, 0x95, 0x8a, 0x34, 0x15, 0x91, 0xa1, 0xe2, 0xe7, 0xad, 0x30, 0x16, 0x03, + 0x80, 0x4c, 0xa4, 0xda, 0x48, 0xab, 0xb3, 0x7b, 0x87, 0x1e, 0x06, 0x78, 0x52, 0xd0, 0xd3, 0xff, + 0x13, 0x5a, 0x43, 0x91, 0x57, 0x30, 0xae, 0x68, 0x4c, 0xaa, 0x95, 0x11, 0x88, 0xf0, 0x88, 0x33, + 0xcb, 0x1c, 0xc3, 0x88, 0xba, 0x6f, 0x32, 0x07, 0xa8, 0x18, 0x36, 0x88, 0x94, 0xd9, 0x1b, 0x87, + 0x18, 0x50, 0xf7, 0x4d, 0x96, 0x80, 0x6b, 0x6d, 0x2c, 0x15, 0xa1, 0x90, 0x77, 0xa2, 0x8d, 0xa6, + 0xa7, 0x70, 0xb4, 0xc5, 0x94, 0xcb, 0x22, 0x2f, 0x61, 0xf4, 0x41, 0x27, 0x89, 0xb4, 0x9f, 0xae, + 0xbe, 0x8b, 0xd0, 0xe2, 0x13, 0xe8, 0x4a, 0x5e, 0x48, 0xe8, 0x4a, 0x4e, 0xfe, 0x78, 0x80, 0x67, + 0x52, 0x71, 0x2a, 0xa2, 0x0b, 0x96, 0xb4, 0x51, 0x80, 0x6f, 0x01, 0x42, 0xad, 0x2c, 0x93, 0x4a, + 0xaa, 0x6b, 0xbf, 0xeb, 0x76, 0x26, 0xe5, 0x4e, 0x5d, 0x04, 0xad, 0xe1, 0xf0, 0x19, 0xf4, 0xd3, + 0x4c, 0x44, 0xf2, 0x97, 0xdf, 0x73, 0x37, 0x57, 0x54, 0x64, 0x01, 0xe3, 0x42, 0x53, 0x75, 0xc7, + 0x13, 0xd8, 0x53, 0x9b, 0x86, 0xef, 0xcd, 0x7b, 0x8b, 0x11, 0xcd, 0x0b, 0xf2, 0xdb, 0x83, 0xe3, + 0x9c, 0x7e, 0x65, 0xde, 0xa9, 0x50, 0x18, 0xab, 0xb3, 0x36, 0xe7, 0x98, 0xc1, 0x90, 0x15, 0x34, + 0xdf, 0x24, 0x77, 0x07, 0x19, 0x50, 0x28, 0x5b, 0x2b, 0x8e, 0xcf, 0xe1, 0x20, 0xbc, 0x91, 0x31, + 0xdf, 0x4c, 0x7b, 0x6e, 0xba, 0xef, 0xea, 0x15, 0x0f, 0xfe, 0x7a, 0x30, 0xf8, 0x9c, 0xb0, 0xcc, + 0x2e, 0x2f, 0x2f, 0xd7, 0xf8, 0x11, 0xb0, 0xcc, 0xc9, 0x97, 0x34, 0xd6, 0x8c, 0xaf, 0x59, 0xf8, + 0x03, 0x8f, 0xcb, 0xff, 0xef, 0x44, 0x71, 0xea, 0x37, 0x07, 0x85, 0x8b, 0x9d, 0xd7, 0x1e, 0x9e, + 0xc3, 0x51, 0xd5, 0x77, 0x26, 0xb7, 0x60, 0x0b, 0xbe, 0xc2, 0xe3, 0x0b, 0x6d, 0x65, 0x24, 0x43, + 0x66, 0xa5, 0x56, 0x06, 0x97, 0x30, 0xac, 0xe5, 0x07, 0xa7, 0xe5, 0x76, 0x33, 0x9e, 0xd3, 0x17, + 0x0f, 0xce, 0x4a, 0xf2, 0xe0, 0x1c, 0x7a, 0x54, 0x44, 0x78, 0x0a, 0xc3, 0x5a, 0xb0, 0x2a, 0xc2, + 0x66, 0xda, 0x2a, 0xa9, 0xbb, 0x8e, 0x93, 0x4e, 0xb0, 0x86, 0x7e, 0x6e, 0x2e, 0x9e, 0xc1, 0x78, + 0xd7, 0x66, 0x9c, 0x6d, 0xe7, 0xab, 0x11, 0x80, 0xe9, 0x61, 0x09, 0x28, 0x1e, 0x06, 0xd2, 0xb9, + 0xea, 0xbb, 0x47, 0xe3, 0xcd, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x0d, 0x02, 0x3f, 0x44, + 0x04, 0x00, 0x00, } diff --git a/ruby/lib/gitaly/gitaly_pb.rb b/ruby/lib/gitaly/gitaly_pb.rb index a5e0cfc5..21494a44 100644 --- a/ruby/lib/gitaly/gitaly_pb.rb +++ b/ruby/lib/gitaly/gitaly_pb.rb @@ -34,8 +34,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do end add_message "gitaly.CommitIsAncestorRequest" do optional :repository, :message, 1, "gitaly.Repository" - optional :ancestor, :message, 2, "gitaly.CommitObject" - optional :child, :message, 3, "gitaly.CommitObject" + optional :ancestor_id, :string, 2 + optional :child_id, :string, 3 end end -- GitLab From db19a1667fb0b2a15a116acc26a5fccc7e422e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Tue, 21 Feb 2017 14:27:34 +0100 Subject: [PATCH 5/9] No more CommitObject at all (really this time) --- gitaly.proto | 7 +-- go/gitaly.pb.go | 93 ++++++++++++++---------------------- ruby/lib/gitaly/gitaly_pb.rb | 6 +-- 3 files changed, 38 insertions(+), 68 deletions(-) diff --git a/gitaly.proto b/gitaly.proto index b854bd72..54ff6bc2 100644 --- a/gitaly.proto +++ b/gitaly.proto @@ -46,15 +46,10 @@ message PostReceiveRequest { message PostReceiveResponse {} -message CommitObject { - // SHA1 of the commit object represented as 40 hexadecimal characters - string id = 1; -} - message FindRefNameRequest { Repository repository = 1; // Require that the resulting ref contains this commit as an ancestor - CommitObject containing = 2; + string commit_id = 2; // Example prefix: "refs/heads/". Type bytes because that is the type of ref names. bytes prefix = 3; } diff --git a/go/gitaly.pb.go b/go/gitaly.pb.go index 0379be46..8d944d93 100644 --- a/go/gitaly.pb.go +++ b/go/gitaly.pb.go @@ -15,7 +15,6 @@ It has these top-level messages: Repository PostReceiveRequest PostReceiveResponse - CommitObject FindRefNameRequest RefNamesResponse CommitIsAncestorRequest @@ -130,27 +129,10 @@ func (m *PostReceiveResponse) String() string { return proto.CompactT func (*PostReceiveResponse) ProtoMessage() {} func (*PostReceiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } -type CommitObject struct { - // SHA1 of the commit object represented as 40 hexadecimal characters - Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` -} - -func (m *CommitObject) Reset() { *m = CommitObject{} } -func (m *CommitObject) String() string { return proto.CompactTextString(m) } -func (*CommitObject) ProtoMessage() {} -func (*CommitObject) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } - -func (m *CommitObject) GetId() string { - if m != nil { - return m.Id - } - return "" -} - type FindRefNameRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` // Require that the resulting ref contains this commit as an ancestor - Containing *CommitObject `protobuf:"bytes,2,opt,name=containing" json:"containing,omitempty"` + CommitId string `protobuf:"bytes,2,opt,name=commit_id,json=commitId" json:"commit_id,omitempty"` // Example prefix: "refs/heads/". Type bytes because that is the type of ref names. Prefix []byte `protobuf:"bytes,3,opt,name=prefix,proto3" json:"prefix,omitempty"` } @@ -158,7 +140,7 @@ type FindRefNameRequest struct { func (m *FindRefNameRequest) Reset() { *m = FindRefNameRequest{} } func (m *FindRefNameRequest) String() string { return proto.CompactTextString(m) } func (*FindRefNameRequest) ProtoMessage() {} -func (*FindRefNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } +func (*FindRefNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } func (m *FindRefNameRequest) GetRepository() *Repository { if m != nil { @@ -167,11 +149,11 @@ func (m *FindRefNameRequest) GetRepository() *Repository { return nil } -func (m *FindRefNameRequest) GetContaining() *CommitObject { +func (m *FindRefNameRequest) GetCommitId() string { if m != nil { - return m.Containing + return m.CommitId } - return nil + return "" } func (m *FindRefNameRequest) GetPrefix() []byte { @@ -189,7 +171,7 @@ type RefNamesResponse struct { func (m *RefNamesResponse) Reset() { *m = RefNamesResponse{} } func (m *RefNamesResponse) String() string { return proto.CompactTextString(m) } func (*RefNamesResponse) ProtoMessage() {} -func (*RefNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } +func (*RefNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } func (m *RefNamesResponse) GetNames() [][]byte { if m != nil { @@ -207,7 +189,7 @@ type CommitIsAncestorRequest struct { func (m *CommitIsAncestorRequest) Reset() { *m = CommitIsAncestorRequest{} } func (m *CommitIsAncestorRequest) String() string { return proto.CompactTextString(m) } func (*CommitIsAncestorRequest) ProtoMessage() {} -func (*CommitIsAncestorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } +func (*CommitIsAncestorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } func (m *CommitIsAncestorRequest) GetRepository() *Repository { if m != nil { @@ -237,7 +219,6 @@ func init() { proto.RegisterType((*Repository)(nil), "gitaly.Repository") proto.RegisterType((*PostReceiveRequest)(nil), "gitaly.PostReceiveRequest") proto.RegisterType((*PostReceiveResponse)(nil), "gitaly.PostReceiveResponse") - proto.RegisterType((*CommitObject)(nil), "gitaly.CommitObject") proto.RegisterType((*FindRefNameRequest)(nil), "gitaly.FindRefNameRequest") proto.RegisterType((*RefNamesResponse)(nil), "gitaly.RefNamesResponse") proto.RegisterType((*CommitIsAncestorRequest)(nil), "gitaly.CommitIsAncestorRequest") @@ -603,35 +584,33 @@ var _Commit_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gitaly.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 467 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xd1, 0x6e, 0xd3, 0x30, - 0x14, 0x6d, 0x5a, 0xd6, 0xad, 0xb7, 0x85, 0x55, 0x77, 0x85, 0x85, 0x22, 0xd1, 0xca, 0x0f, 0xa8, - 0x4f, 0x13, 0x0a, 0xfc, 0x00, 0xa0, 0x4d, 0xad, 0x98, 0x46, 0x65, 0xc6, 0x03, 0x4f, 0xc8, 0x8b, - 0x9d, 0xcd, 0x90, 0xd8, 0x21, 0xf6, 0x26, 0xf6, 0x09, 0xfc, 0x00, 0x9f, 0xc0, 0x77, 0xa2, 0x3a, - 0x09, 0x49, 0x9b, 0xbd, 0xe5, 0x2d, 0xf7, 0xde, 0x73, 0x4f, 0x8e, 0x7d, 0x8e, 0x0c, 0xa3, 0x6b, - 0x69, 0x59, 0x7c, 0x7f, 0x92, 0x66, 0xda, 0x6a, 0xec, 0xe7, 0x15, 0x99, 0xc1, 0xfe, 0x7b, 0xad, - 0x63, 0xc1, 0x14, 0x4e, 0x60, 0xef, 0x8e, 0xc5, 0xb7, 0xc2, 0xf7, 0xe6, 0xde, 0xe2, 0x80, 0xe6, - 0x05, 0x39, 0x85, 0xc3, 0x95, 0x8a, 0x34, 0x15, 0x91, 0xa1, 0xe2, 0xe7, 0xad, 0x30, 0x16, 0x03, - 0x80, 0x4c, 0xa4, 0xda, 0x48, 0xab, 0xb3, 0x7b, 0x87, 0x1e, 0x06, 0x78, 0x52, 0xd0, 0xd3, 0xff, - 0x13, 0x5a, 0x43, 0x91, 0x57, 0x30, 0xae, 0x68, 0x4c, 0xaa, 0x95, 0x11, 0x88, 0xf0, 0x88, 0x33, - 0xcb, 0x1c, 0xc3, 0x88, 0xba, 0x6f, 0x32, 0x07, 0xa8, 0x18, 0x36, 0x88, 0x94, 0xd9, 0x1b, 0x87, - 0x18, 0x50, 0xf7, 0x4d, 0x96, 0x80, 0x6b, 0x6d, 0x2c, 0x15, 0xa1, 0x90, 0x77, 0xa2, 0x8d, 0xa6, - 0xa7, 0x70, 0xb4, 0xc5, 0x94, 0xcb, 0x22, 0x2f, 0x61, 0xf4, 0x41, 0x27, 0x89, 0xb4, 0x9f, 0xae, - 0xbe, 0x8b, 0xd0, 0xe2, 0x13, 0xe8, 0x4a, 0x5e, 0x48, 0xe8, 0x4a, 0x4e, 0xfe, 0x78, 0x80, 0x67, - 0x52, 0x71, 0x2a, 0xa2, 0x0b, 0x96, 0xb4, 0x51, 0x80, 0x6f, 0x01, 0x42, 0xad, 0x2c, 0x93, 0x4a, - 0xaa, 0x6b, 0xbf, 0xeb, 0x76, 0x26, 0xe5, 0x4e, 0x5d, 0x04, 0xad, 0xe1, 0xf0, 0x19, 0xf4, 0xd3, - 0x4c, 0x44, 0xf2, 0x97, 0xdf, 0x73, 0x37, 0x57, 0x54, 0x64, 0x01, 0xe3, 0x42, 0x53, 0x75, 0xc7, - 0x13, 0xd8, 0x53, 0x9b, 0x86, 0xef, 0xcd, 0x7b, 0x8b, 0x11, 0xcd, 0x0b, 0xf2, 0xdb, 0x83, 0xe3, - 0x9c, 0x7e, 0x65, 0xde, 0xa9, 0x50, 0x18, 0xab, 0xb3, 0x36, 0xe7, 0x98, 0xc1, 0x90, 0x15, 0x34, - 0xdf, 0x24, 0x77, 0x07, 0x19, 0x50, 0x28, 0x5b, 0x2b, 0x8e, 0xcf, 0xe1, 0x20, 0xbc, 0x91, 0x31, - 0xdf, 0x4c, 0x7b, 0x6e, 0xba, 0xef, 0xea, 0x15, 0x0f, 0xfe, 0x7a, 0x30, 0xf8, 0x9c, 0xb0, 0xcc, - 0x2e, 0x2f, 0x2f, 0xd7, 0xf8, 0x11, 0xb0, 0xcc, 0xc9, 0x97, 0x34, 0xd6, 0x8c, 0xaf, 0x59, 0xf8, - 0x03, 0x8f, 0xcb, 0xff, 0xef, 0x44, 0x71, 0xea, 0x37, 0x07, 0x85, 0x8b, 0x9d, 0xd7, 0x1e, 0x9e, - 0xc3, 0x51, 0xd5, 0x77, 0x26, 0xb7, 0x60, 0x0b, 0xbe, 0xc2, 0xe3, 0x0b, 0x6d, 0x65, 0x24, 0x43, - 0x66, 0xa5, 0x56, 0x06, 0x97, 0x30, 0xac, 0xe5, 0x07, 0xa7, 0xe5, 0x76, 0x33, 0x9e, 0xd3, 0x17, - 0x0f, 0xce, 0x4a, 0xf2, 0xe0, 0x1c, 0x7a, 0x54, 0x44, 0x78, 0x0a, 0xc3, 0x5a, 0xb0, 0x2a, 0xc2, - 0x66, 0xda, 0x2a, 0xa9, 0xbb, 0x8e, 0x93, 0x4e, 0xb0, 0x86, 0x7e, 0x6e, 0x2e, 0x9e, 0xc1, 0x78, - 0xd7, 0x66, 0x9c, 0x6d, 0xe7, 0xab, 0x11, 0x80, 0xe9, 0x61, 0x09, 0x28, 0x1e, 0x06, 0xd2, 0xb9, - 0xea, 0xbb, 0x47, 0xe3, 0xcd, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x0d, 0x02, 0x3f, 0x44, - 0x04, 0x00, 0x00, + // 436 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x93, 0xdf, 0x6e, 0xd3, 0x30, + 0x14, 0xc6, 0x1b, 0xc2, 0xb2, 0xf6, 0xa4, 0x68, 0xd5, 0xd9, 0x60, 0x21, 0xbb, 0x68, 0xe5, 0x0b, + 0xd4, 0xab, 0x09, 0x85, 0x27, 0x00, 0xb4, 0xa9, 0x11, 0xd3, 0x14, 0x99, 0x71, 0xc1, 0x15, 0x32, + 0xb1, 0xc3, 0x2c, 0x92, 0x38, 0xc4, 0x5e, 0x45, 0x2f, 0x78, 0x00, 0x5e, 0x84, 0xe7, 0x44, 0x75, + 0x12, 0x52, 0x5a, 0xb8, 0xca, 0x5d, 0xce, 0x1f, 0xff, 0xce, 0x71, 0xbe, 0xcf, 0x30, 0xfd, 0x22, + 0x0d, 0xcb, 0x37, 0x97, 0x55, 0xad, 0x8c, 0x42, 0xaf, 0x89, 0xc8, 0x1c, 0x8e, 0xdf, 0x28, 0x95, + 0x0b, 0x56, 0xe2, 0x19, 0x1c, 0xad, 0x59, 0xfe, 0x20, 0x02, 0x67, 0xe1, 0x2c, 0xc7, 0xb4, 0x09, + 0xc8, 0x15, 0x9c, 0xc4, 0x65, 0xa6, 0xa8, 0xc8, 0x34, 0x15, 0xdf, 0x1e, 0x84, 0x36, 0x18, 0x01, + 0xd4, 0xa2, 0x52, 0x5a, 0x1a, 0x55, 0x6f, 0x6c, 0xb7, 0x1f, 0xe1, 0x65, 0x8b, 0xa7, 0x7f, 0x2a, + 0x74, 0xa7, 0x8b, 0xbc, 0x80, 0x59, 0x8f, 0xd1, 0x95, 0x2a, 0xb5, 0x40, 0x84, 0xc7, 0x9c, 0x19, + 0x66, 0x09, 0x53, 0x6a, 0xbf, 0xc9, 0x02, 0xa0, 0x27, 0x6c, 0x3b, 0x2a, 0x66, 0xee, 0x6d, 0xc7, + 0x84, 0xda, 0x6f, 0xb2, 0x02, 0x4c, 0x94, 0x36, 0x54, 0xa4, 0x42, 0xae, 0xc5, 0x90, 0x9d, 0x9e, + 0xc2, 0xe9, 0x5f, 0xa4, 0x66, 0x2d, 0xf2, 0x03, 0xf0, 0x5a, 0x96, 0x9c, 0x8a, 0xec, 0x96, 0x15, + 0x43, 0x06, 0xe0, 0x05, 0x4c, 0x52, 0x55, 0x14, 0xd2, 0x7c, 0x92, 0x3c, 0x78, 0x64, 0xef, 0x30, + 0x6e, 0x12, 0x31, 0xc7, 0x67, 0xe0, 0x55, 0xb5, 0xc8, 0xe4, 0xf7, 0xc0, 0xb5, 0xf7, 0x6f, 0x23, + 0xb2, 0x84, 0x59, 0x3b, 0xba, 0xff, 0x53, 0x67, 0x70, 0x54, 0x6e, 0x13, 0x81, 0xb3, 0x70, 0x97, + 0x53, 0xda, 0x04, 0xe4, 0xa7, 0x03, 0xe7, 0x6f, 0x1b, 0x9c, 0x7e, 0x5d, 0xa6, 0x42, 0x1b, 0x55, + 0x0f, 0x59, 0x77, 0x0e, 0x3e, 0x6b, 0x31, 0xfd, 0xc2, 0xd0, 0xa5, 0x62, 0x8e, 0xcf, 0x61, 0x9c, + 0xde, 0xcb, 0x9c, 0x6f, 0xab, 0xae, 0xad, 0x1e, 0xdb, 0x38, 0xe6, 0xd1, 0x2f, 0x07, 0x26, 0xef, + 0x0b, 0x56, 0x9b, 0xd5, 0xdd, 0x5d, 0x82, 0xef, 0x00, 0x3b, 0xb5, 0x3f, 0x54, 0xb9, 0x62, 0x3c, + 0x61, 0xe9, 0x57, 0x3c, 0xef, 0xe6, 0xef, 0x19, 0x2a, 0x0c, 0x0e, 0x0b, 0xad, 0x16, 0xa3, 0x97, + 0x0e, 0xde, 0xc0, 0x69, 0x9f, 0xb7, 0x52, 0x0d, 0xa0, 0x45, 0x1f, 0xe1, 0xc9, 0xad, 0x32, 0x32, + 0x93, 0x29, 0x33, 0x52, 0x95, 0x1a, 0x57, 0xe0, 0xef, 0xb8, 0x00, 0xc3, 0xee, 0xf4, 0xa1, 0xc9, + 0xc2, 0x8b, 0x7f, 0xd6, 0x3a, 0x78, 0x74, 0x03, 0x2e, 0x15, 0x19, 0x5e, 0x81, 0xbf, 0xe3, 0x9f, + 0x1e, 0x78, 0x68, 0xaa, 0x7e, 0xd5, 0x7d, 0xc5, 0xc9, 0x28, 0x4a, 0xc0, 0x6b, 0xc4, 0xc5, 0x6b, + 0x98, 0xed, 0xcb, 0x8c, 0xf3, 0xee, 0xe4, 0x7f, 0x0c, 0x10, 0x9e, 0x74, 0x0d, 0xed, 0xf3, 0x26, + 0xa3, 0xcf, 0x9e, 0x7d, 0xfa, 0xaf, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xe0, 0xc3, 0xc9, + 0x0a, 0x04, 0x00, 0x00, } diff --git a/ruby/lib/gitaly/gitaly_pb.rb b/ruby/lib/gitaly/gitaly_pb.rb index 21494a44..f0d5e809 100644 --- a/ruby/lib/gitaly/gitaly_pb.rb +++ b/ruby/lib/gitaly/gitaly_pb.rb @@ -21,12 +21,9 @@ Google::Protobuf::DescriptorPool.generated_pool.build do end add_message "gitaly.PostReceiveResponse" do end - add_message "gitaly.CommitObject" do - optional :id, :string, 1 - end add_message "gitaly.FindRefNameRequest" do optional :repository, :message, 1, "gitaly.Repository" - optional :containing, :message, 2, "gitaly.CommitObject" + optional :commit_id, :string, 2 optional :prefix, :bytes, 3 end add_message "gitaly.RefNamesResponse" do @@ -46,7 +43,6 @@ module Gitaly Repository = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.Repository").msgclass PostReceiveRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.PostReceiveRequest").msgclass PostReceiveResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.PostReceiveResponse").msgclass - CommitObject = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CommitObject").msgclass FindRefNameRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindRefNameRequest").msgclass RefNamesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.RefNamesResponse").msgclass CommitIsAncestorRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CommitIsAncestorRequest").msgclass -- GitLab From c2752d79f0dec2368d42400be76376c1def22e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Tue, 21 Feb 2017 16:25:55 +0100 Subject: [PATCH 6/9] first-class response for for-each-ref --- gitaly.proto | 6 +- go/gitaly.pb.go | 84 +++++++++++++-------------- ruby/lib/gitaly/gitaly_pb.rb | 6 +- ruby/lib/gitaly/gitaly_services_pb.rb | 2 +- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/gitaly.proto b/gitaly.proto index 54ff6bc2..e5d2e4bb 100644 --- a/gitaly.proto +++ b/gitaly.proto @@ -17,7 +17,7 @@ service Notifications { service Ref { // Find a Ref matching the given constraints. Response may be empty. - rpc FindRefName(FindRefNameRequest) returns (RefNamesResponse) {} + rpc FindRefName(FindRefNameRequest) returns (FindRefNamesResponse) {} } service Commit { @@ -54,9 +54,9 @@ message FindRefNameRequest { bytes prefix = 3; } -message RefNamesResponse { +message FindRefNamesResponse { // Example name: "refs/heads/master". Cannot assume UTF8, so the type is bytes. - repeated bytes names = 1; + bytes names = 1; } message CommitIsAncestorRequest { diff --git a/go/gitaly.pb.go b/go/gitaly.pb.go index 8d944d93..ef077f86 100644 --- a/go/gitaly.pb.go +++ b/go/gitaly.pb.go @@ -16,7 +16,7 @@ It has these top-level messages: PostReceiveRequest PostReceiveResponse FindRefNameRequest - RefNamesResponse + FindRefNamesResponse CommitIsAncestorRequest */ package gitaly @@ -163,17 +163,17 @@ func (m *FindRefNameRequest) GetPrefix() []byte { return nil } -type RefNamesResponse struct { +type FindRefNamesResponse struct { // Example name: "refs/heads/master". Cannot assume UTF8, so the type is bytes. - Names [][]byte `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"` + Names []byte `protobuf:"bytes,1,opt,name=names,proto3" json:"names,omitempty"` } -func (m *RefNamesResponse) Reset() { *m = RefNamesResponse{} } -func (m *RefNamesResponse) String() string { return proto.CompactTextString(m) } -func (*RefNamesResponse) ProtoMessage() {} -func (*RefNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } +func (m *FindRefNamesResponse) Reset() { *m = FindRefNamesResponse{} } +func (m *FindRefNamesResponse) String() string { return proto.CompactTextString(m) } +func (*FindRefNamesResponse) ProtoMessage() {} +func (*FindRefNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } -func (m *RefNamesResponse) GetNames() [][]byte { +func (m *FindRefNamesResponse) GetNames() []byte { if m != nil { return m.Names } @@ -220,7 +220,7 @@ func init() { proto.RegisterType((*PostReceiveRequest)(nil), "gitaly.PostReceiveRequest") proto.RegisterType((*PostReceiveResponse)(nil), "gitaly.PostReceiveResponse") proto.RegisterType((*FindRefNameRequest)(nil), "gitaly.FindRefNameRequest") - proto.RegisterType((*RefNamesResponse)(nil), "gitaly.RefNamesResponse") + proto.RegisterType((*FindRefNamesResponse)(nil), "gitaly.FindRefNamesResponse") proto.RegisterType((*CommitIsAncestorRequest)(nil), "gitaly.CommitIsAncestorRequest") } @@ -455,7 +455,7 @@ var _Notifications_serviceDesc = grpc.ServiceDesc{ type RefClient interface { // Find a Ref matching the given constraints. Response may be empty. - FindRefName(ctx context.Context, in *FindRefNameRequest, opts ...grpc.CallOption) (*RefNamesResponse, error) + FindRefName(ctx context.Context, in *FindRefNameRequest, opts ...grpc.CallOption) (*FindRefNamesResponse, error) } type refClient struct { @@ -466,8 +466,8 @@ func NewRefClient(cc *grpc.ClientConn) RefClient { return &refClient{cc} } -func (c *refClient) FindRefName(ctx context.Context, in *FindRefNameRequest, opts ...grpc.CallOption) (*RefNamesResponse, error) { - out := new(RefNamesResponse) +func (c *refClient) FindRefName(ctx context.Context, in *FindRefNameRequest, opts ...grpc.CallOption) (*FindRefNamesResponse, error) { + out := new(FindRefNamesResponse) err := grpc.Invoke(ctx, "/gitaly.Ref/FindRefName", in, out, c.cc, opts...) if err != nil { return nil, err @@ -479,7 +479,7 @@ func (c *refClient) FindRefName(ctx context.Context, in *FindRefNameRequest, opt type RefServer interface { // Find a Ref matching the given constraints. Response may be empty. - FindRefName(context.Context, *FindRefNameRequest) (*RefNamesResponse, error) + FindRefName(context.Context, *FindRefNameRequest) (*FindRefNamesResponse, error) } func RegisterRefServer(s *grpc.Server, srv RefServer) { @@ -584,33 +584,33 @@ var _Commit_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gitaly.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 436 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x93, 0xdf, 0x6e, 0xd3, 0x30, - 0x14, 0xc6, 0x1b, 0xc2, 0xb2, 0xf6, 0xa4, 0x68, 0xd5, 0xd9, 0x60, 0x21, 0xbb, 0x68, 0xe5, 0x0b, - 0xd4, 0xab, 0x09, 0x85, 0x27, 0x00, 0xb4, 0xa9, 0x11, 0xd3, 0x14, 0x99, 0x71, 0xc1, 0x15, 0x32, - 0xb1, 0xc3, 0x2c, 0x92, 0x38, 0xc4, 0x5e, 0x45, 0x2f, 0x78, 0x00, 0x5e, 0x84, 0xe7, 0x44, 0x75, - 0x12, 0x52, 0x5a, 0xb8, 0xca, 0x5d, 0xce, 0x1f, 0xff, 0xce, 0x71, 0xbe, 0xcf, 0x30, 0xfd, 0x22, - 0x0d, 0xcb, 0x37, 0x97, 0x55, 0xad, 0x8c, 0x42, 0xaf, 0x89, 0xc8, 0x1c, 0x8e, 0xdf, 0x28, 0x95, - 0x0b, 0x56, 0xe2, 0x19, 0x1c, 0xad, 0x59, 0xfe, 0x20, 0x02, 0x67, 0xe1, 0x2c, 0xc7, 0xb4, 0x09, - 0xc8, 0x15, 0x9c, 0xc4, 0x65, 0xa6, 0xa8, 0xc8, 0x34, 0x15, 0xdf, 0x1e, 0x84, 0x36, 0x18, 0x01, - 0xd4, 0xa2, 0x52, 0x5a, 0x1a, 0x55, 0x6f, 0x6c, 0xb7, 0x1f, 0xe1, 0x65, 0x8b, 0xa7, 0x7f, 0x2a, - 0x74, 0xa7, 0x8b, 0xbc, 0x80, 0x59, 0x8f, 0xd1, 0x95, 0x2a, 0xb5, 0x40, 0x84, 0xc7, 0x9c, 0x19, - 0x66, 0x09, 0x53, 0x6a, 0xbf, 0xc9, 0x02, 0xa0, 0x27, 0x6c, 0x3b, 0x2a, 0x66, 0xee, 0x6d, 0xc7, - 0x84, 0xda, 0x6f, 0xb2, 0x02, 0x4c, 0x94, 0x36, 0x54, 0xa4, 0x42, 0xae, 0xc5, 0x90, 0x9d, 0x9e, - 0xc2, 0xe9, 0x5f, 0xa4, 0x66, 0x2d, 0xf2, 0x03, 0xf0, 0x5a, 0x96, 0x9c, 0x8a, 0xec, 0x96, 0x15, - 0x43, 0x06, 0xe0, 0x05, 0x4c, 0x52, 0x55, 0x14, 0xd2, 0x7c, 0x92, 0x3c, 0x78, 0x64, 0xef, 0x30, - 0x6e, 0x12, 0x31, 0xc7, 0x67, 0xe0, 0x55, 0xb5, 0xc8, 0xe4, 0xf7, 0xc0, 0xb5, 0xf7, 0x6f, 0x23, - 0xb2, 0x84, 0x59, 0x3b, 0xba, 0xff, 0x53, 0x67, 0x70, 0x54, 0x6e, 0x13, 0x81, 0xb3, 0x70, 0x97, - 0x53, 0xda, 0x04, 0xe4, 0xa7, 0x03, 0xe7, 0x6f, 0x1b, 0x9c, 0x7e, 0x5d, 0xa6, 0x42, 0x1b, 0x55, - 0x0f, 0x59, 0x77, 0x0e, 0x3e, 0x6b, 0x31, 0xfd, 0xc2, 0xd0, 0xa5, 0x62, 0x8e, 0xcf, 0x61, 0x9c, - 0xde, 0xcb, 0x9c, 0x6f, 0xab, 0xae, 0xad, 0x1e, 0xdb, 0x38, 0xe6, 0xd1, 0x2f, 0x07, 0x26, 0xef, - 0x0b, 0x56, 0x9b, 0xd5, 0xdd, 0x5d, 0x82, 0xef, 0x00, 0x3b, 0xb5, 0x3f, 0x54, 0xb9, 0x62, 0x3c, - 0x61, 0xe9, 0x57, 0x3c, 0xef, 0xe6, 0xef, 0x19, 0x2a, 0x0c, 0x0e, 0x0b, 0xad, 0x16, 0xa3, 0x97, - 0x0e, 0xde, 0xc0, 0x69, 0x9f, 0xb7, 0x52, 0x0d, 0xa0, 0x45, 0x1f, 0xe1, 0xc9, 0xad, 0x32, 0x32, - 0x93, 0x29, 0x33, 0x52, 0x95, 0x1a, 0x57, 0xe0, 0xef, 0xb8, 0x00, 0xc3, 0xee, 0xf4, 0xa1, 0xc9, - 0xc2, 0x8b, 0x7f, 0xd6, 0x3a, 0x78, 0x74, 0x03, 0x2e, 0x15, 0x19, 0x5e, 0x81, 0xbf, 0xe3, 0x9f, - 0x1e, 0x78, 0x68, 0xaa, 0x7e, 0xd5, 0x7d, 0xc5, 0xc9, 0x28, 0x4a, 0xc0, 0x6b, 0xc4, 0xc5, 0x6b, - 0x98, 0xed, 0xcb, 0x8c, 0xf3, 0xee, 0xe4, 0x7f, 0x0c, 0x10, 0x9e, 0x74, 0x0d, 0xed, 0xf3, 0x26, - 0xa3, 0xcf, 0x9e, 0x7d, 0xfa, 0xaf, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xe0, 0xc3, 0xc9, - 0x0a, 0x04, 0x00, 0x00, + // 433 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x94, 0xcf, 0x6e, 0xd4, 0x30, + 0x10, 0xc6, 0x1b, 0x96, 0xa6, 0xbb, 0x93, 0xa2, 0x56, 0xd3, 0x85, 0x86, 0x14, 0x69, 0x2b, 0x1f, + 0x10, 0x07, 0x54, 0xa1, 0xf0, 0x04, 0x80, 0xa8, 0x36, 0x02, 0x55, 0x91, 0x29, 0x07, 0x4e, 0xc8, + 0xc4, 0x0e, 0xb5, 0x48, 0xe2, 0x10, 0x7b, 0x57, 0xec, 0x81, 0x07, 0xe0, 0x45, 0x78, 0x4e, 0xb4, + 0x4e, 0x42, 0xb2, 0x7f, 0x7a, 0xca, 0xcd, 0x33, 0xdf, 0xf8, 0xe7, 0xb1, 0xbf, 0x49, 0xe0, 0xf8, + 0xbb, 0x34, 0x2c, 0x5b, 0x5d, 0x95, 0x95, 0x32, 0x0a, 0xdd, 0x3a, 0x22, 0x33, 0x38, 0x7a, 0xab, + 0x54, 0x26, 0x58, 0x81, 0x53, 0x38, 0x5c, 0xb2, 0x6c, 0x21, 0x7c, 0xe7, 0xd2, 0x79, 0x31, 0xa6, + 0x75, 0x40, 0xde, 0xc3, 0x49, 0x54, 0xa4, 0x8a, 0x8a, 0x54, 0x53, 0xf1, 0x73, 0x21, 0xb4, 0xc1, + 0x10, 0xa0, 0x12, 0xa5, 0xd2, 0xd2, 0xa8, 0x6a, 0x65, 0xab, 0xbd, 0x10, 0xaf, 0x1a, 0x3c, 0xfd, + 0xaf, 0xd0, 0x5e, 0x15, 0x79, 0x0e, 0xa7, 0x1d, 0x46, 0x97, 0xaa, 0xd0, 0x02, 0x11, 0x1e, 0x72, + 0x66, 0x98, 0x25, 0x1c, 0x53, 0xbb, 0x26, 0x97, 0x00, 0x1d, 0x61, 0x5d, 0x51, 0x32, 0x73, 0x67, + 0x2b, 0x26, 0xd4, 0xae, 0xc9, 0x1c, 0x30, 0x56, 0xda, 0x50, 0x91, 0x08, 0xb9, 0x14, 0x43, 0x7a, + 0x7a, 0x0c, 0x67, 0x1b, 0xa4, 0xba, 0x2d, 0xf2, 0x1b, 0xf0, 0x5a, 0x16, 0x9c, 0x8a, 0xf4, 0x86, + 0xe5, 0x43, 0x0e, 0xc0, 0x0b, 0x98, 0x24, 0x2a, 0xcf, 0xa5, 0xf9, 0x2a, 0xb9, 0xff, 0xc0, 0xde, + 0x61, 0x5c, 0x27, 0x22, 0x8e, 0x4f, 0xc0, 0x2d, 0x2b, 0x91, 0xca, 0x5f, 0xfe, 0xc8, 0xde, 0xbf, + 0x89, 0xc8, 0x4b, 0x98, 0xf6, 0x8e, 0xef, 0x5e, 0x6b, 0x0a, 0x87, 0xc5, 0x3a, 0xd1, 0x3c, 0x57, + 0x1d, 0x90, 0x3f, 0x0e, 0x9c, 0xbf, 0xab, 0x91, 0xfa, 0x4d, 0x91, 0x08, 0x6d, 0x54, 0x35, 0xa4, + 0xe5, 0x19, 0x78, 0xac, 0xc1, 0x74, 0x4d, 0x43, 0x9b, 0x8a, 0x38, 0x3e, 0x85, 0x71, 0x72, 0x27, + 0x33, 0xbe, 0x56, 0x47, 0x56, 0x3d, 0xb2, 0x71, 0xc4, 0xc3, 0xbf, 0x0e, 0x4c, 0x3e, 0xe5, 0xac, + 0x32, 0xf3, 0xdb, 0xdb, 0x18, 0x3f, 0x00, 0xb6, 0x8e, 0x7f, 0x2e, 0x33, 0xc5, 0x78, 0xcc, 0x92, + 0x1f, 0x78, 0xde, 0x9e, 0xbf, 0x35, 0x54, 0x81, 0xbf, 0x2b, 0x34, 0x7e, 0x1c, 0xbc, 0x72, 0xf0, + 0x23, 0x9c, 0x75, 0x79, 0x6b, 0xd7, 0x00, 0x5a, 0xf8, 0x05, 0x1e, 0xdd, 0x28, 0x23, 0x53, 0x99, + 0x30, 0x23, 0x55, 0xa1, 0x71, 0x0e, 0x5e, 0x6f, 0x12, 0x30, 0x68, 0x77, 0xef, 0x0e, 0x5a, 0x70, + 0xb1, 0x57, 0x6b, 0xe1, 0x61, 0x0c, 0x23, 0x2a, 0x52, 0x8c, 0xc0, 0xeb, 0x99, 0xd8, 0x01, 0x77, + 0x07, 0x2b, 0x78, 0xb6, 0x47, 0xd3, 0x1b, 0x44, 0xb7, 0x36, 0x18, 0xaf, 0xe1, 0x74, 0xdb, 0x6a, + 0x9c, 0xb5, 0xbb, 0xef, 0x19, 0x82, 0xe0, 0xa4, 0x2d, 0x68, 0x3e, 0x73, 0x72, 0xf0, 0xcd, 0xb5, + 0xbf, 0x80, 0xd7, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x0c, 0x3f, 0x90, 0x12, 0x04, 0x00, + 0x00, } diff --git a/ruby/lib/gitaly/gitaly_pb.rb b/ruby/lib/gitaly/gitaly_pb.rb index f0d5e809..eb5abf80 100644 --- a/ruby/lib/gitaly/gitaly_pb.rb +++ b/ruby/lib/gitaly/gitaly_pb.rb @@ -26,8 +26,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :commit_id, :string, 2 optional :prefix, :bytes, 3 end - add_message "gitaly.RefNamesResponse" do - repeated :names, :bytes, 1 + add_message "gitaly.FindRefNamesResponse" do + optional :names, :bytes, 1 end add_message "gitaly.CommitIsAncestorRequest" do optional :repository, :message, 1, "gitaly.Repository" @@ -44,6 +44,6 @@ module Gitaly PostReceiveRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.PostReceiveRequest").msgclass PostReceiveResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.PostReceiveResponse").msgclass FindRefNameRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindRefNameRequest").msgclass - RefNamesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.RefNamesResponse").msgclass + FindRefNamesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindRefNamesResponse").msgclass CommitIsAncestorRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CommitIsAncestorRequest").msgclass end diff --git a/ruby/lib/gitaly/gitaly_services_pb.rb b/ruby/lib/gitaly/gitaly_services_pb.rb index 295cf4b7..7662521c 100644 --- a/ruby/lib/gitaly/gitaly_services_pb.rb +++ b/ruby/lib/gitaly/gitaly_services_pb.rb @@ -47,7 +47,7 @@ module Gitaly self.service_name = 'gitaly.Ref' # Find a Ref matching the given constraints. Response may be empty. - rpc :FindRefName, FindRefNameRequest, RefNamesResponse + rpc :FindRefName, FindRefNameRequest, FindRefNamesResponse end Stub = Service.rpc_stub_class -- GitLab From 2f19b043a200d23766ee4fa7a8208eec13a05542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Fri, 24 Feb 2017 17:17:44 +0100 Subject: [PATCH 7/9] fixed names --- gitaly.proto | 10 +-- go/gitaly.pb.go | 109 +++++++++++++------------- ruby/lib/gitaly/gitaly_pb.rb | 10 +-- ruby/lib/gitaly/gitaly_services_pb.rb | 4 +- 4 files changed, 66 insertions(+), 67 deletions(-) diff --git a/gitaly.proto b/gitaly.proto index e5d2e4bb..64ae0a7f 100644 --- a/gitaly.proto +++ b/gitaly.proto @@ -17,14 +17,14 @@ service Notifications { service Ref { // Find a Ref matching the given constraints. Response may be empty. - rpc FindRefName(FindRefNameRequest) returns (FindRefNamesResponse) {} + rpc FindRefName(FindRefNameRequest) returns (FindRefNameResponse) {} } service Commit { - rpc CommitIsAncestor(CommitIsAncestorRequest) returns (Boolean) {} + rpc CommitIsAncestor(CommitIsAncestorRequest) returns (CommitIsAncestorResponse) {} } -message Boolean { +message CommitIsAncestorResponse { bool value = 1; } @@ -54,9 +54,9 @@ message FindRefNameRequest { bytes prefix = 3; } -message FindRefNamesResponse { +message FindRefNameResponse { // Example name: "refs/heads/master". Cannot assume UTF8, so the type is bytes. - bytes names = 1; + bytes name = 1; } message CommitIsAncestorRequest { diff --git a/go/gitaly.pb.go b/go/gitaly.pb.go index ef077f86..0f606eb4 100644 --- a/go/gitaly.pb.go +++ b/go/gitaly.pb.go @@ -9,14 +9,14 @@ It is generated from these files: gitaly.proto It has these top-level messages: - Boolean + CommitIsAncestorResponse InfoRefsRequest InfoRefsResponse Repository PostReceiveRequest PostReceiveResponse FindRefNameRequest - FindRefNamesResponse + FindRefNameResponse CommitIsAncestorRequest */ package gitaly @@ -41,16 +41,16 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package -type Boolean struct { +type CommitIsAncestorResponse struct { Value bool `protobuf:"varint,1,opt,name=value" json:"value,omitempty"` } -func (m *Boolean) Reset() { *m = Boolean{} } -func (m *Boolean) String() string { return proto.CompactTextString(m) } -func (*Boolean) ProtoMessage() {} -func (*Boolean) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (m *CommitIsAncestorResponse) Reset() { *m = CommitIsAncestorResponse{} } +func (m *CommitIsAncestorResponse) String() string { return proto.CompactTextString(m) } +func (*CommitIsAncestorResponse) ProtoMessage() {} +func (*CommitIsAncestorResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } -func (m *Boolean) GetValue() bool { +func (m *CommitIsAncestorResponse) GetValue() bool { if m != nil { return m.Value } @@ -163,19 +163,19 @@ func (m *FindRefNameRequest) GetPrefix() []byte { return nil } -type FindRefNamesResponse struct { +type FindRefNameResponse struct { // Example name: "refs/heads/master". Cannot assume UTF8, so the type is bytes. - Names []byte `protobuf:"bytes,1,opt,name=names,proto3" json:"names,omitempty"` + Name []byte `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` } -func (m *FindRefNamesResponse) Reset() { *m = FindRefNamesResponse{} } -func (m *FindRefNamesResponse) String() string { return proto.CompactTextString(m) } -func (*FindRefNamesResponse) ProtoMessage() {} -func (*FindRefNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } +func (m *FindRefNameResponse) Reset() { *m = FindRefNameResponse{} } +func (m *FindRefNameResponse) String() string { return proto.CompactTextString(m) } +func (*FindRefNameResponse) ProtoMessage() {} +func (*FindRefNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } -func (m *FindRefNamesResponse) GetNames() []byte { +func (m *FindRefNameResponse) GetName() []byte { if m != nil { - return m.Names + return m.Name } return nil } @@ -213,14 +213,14 @@ func (m *CommitIsAncestorRequest) GetChildId() string { } func init() { - proto.RegisterType((*Boolean)(nil), "gitaly.Boolean") + proto.RegisterType((*CommitIsAncestorResponse)(nil), "gitaly.CommitIsAncestorResponse") proto.RegisterType((*InfoRefsRequest)(nil), "gitaly.InfoRefsRequest") proto.RegisterType((*InfoRefsResponse)(nil), "gitaly.InfoRefsResponse") proto.RegisterType((*Repository)(nil), "gitaly.Repository") proto.RegisterType((*PostReceiveRequest)(nil), "gitaly.PostReceiveRequest") proto.RegisterType((*PostReceiveResponse)(nil), "gitaly.PostReceiveResponse") proto.RegisterType((*FindRefNameRequest)(nil), "gitaly.FindRefNameRequest") - proto.RegisterType((*FindRefNamesResponse)(nil), "gitaly.FindRefNamesResponse") + proto.RegisterType((*FindRefNameResponse)(nil), "gitaly.FindRefNameResponse") proto.RegisterType((*CommitIsAncestorRequest)(nil), "gitaly.CommitIsAncestorRequest") } @@ -455,7 +455,7 @@ var _Notifications_serviceDesc = grpc.ServiceDesc{ type RefClient interface { // Find a Ref matching the given constraints. Response may be empty. - FindRefName(ctx context.Context, in *FindRefNameRequest, opts ...grpc.CallOption) (*FindRefNamesResponse, error) + FindRefName(ctx context.Context, in *FindRefNameRequest, opts ...grpc.CallOption) (*FindRefNameResponse, error) } type refClient struct { @@ -466,8 +466,8 @@ func NewRefClient(cc *grpc.ClientConn) RefClient { return &refClient{cc} } -func (c *refClient) FindRefName(ctx context.Context, in *FindRefNameRequest, opts ...grpc.CallOption) (*FindRefNamesResponse, error) { - out := new(FindRefNamesResponse) +func (c *refClient) FindRefName(ctx context.Context, in *FindRefNameRequest, opts ...grpc.CallOption) (*FindRefNameResponse, error) { + out := new(FindRefNameResponse) err := grpc.Invoke(ctx, "/gitaly.Ref/FindRefName", in, out, c.cc, opts...) if err != nil { return nil, err @@ -479,7 +479,7 @@ func (c *refClient) FindRefName(ctx context.Context, in *FindRefNameRequest, opt type RefServer interface { // Find a Ref matching the given constraints. Response may be empty. - FindRefName(context.Context, *FindRefNameRequest) (*FindRefNamesResponse, error) + FindRefName(context.Context, *FindRefNameRequest) (*FindRefNameResponse, error) } func RegisterRefServer(s *grpc.Server, srv RefServer) { @@ -520,7 +520,7 @@ var _Ref_serviceDesc = grpc.ServiceDesc{ // Client API for Commit service type CommitClient interface { - CommitIsAncestor(ctx context.Context, in *CommitIsAncestorRequest, opts ...grpc.CallOption) (*Boolean, error) + CommitIsAncestor(ctx context.Context, in *CommitIsAncestorRequest, opts ...grpc.CallOption) (*CommitIsAncestorResponse, error) } type commitClient struct { @@ -531,8 +531,8 @@ func NewCommitClient(cc *grpc.ClientConn) CommitClient { return &commitClient{cc} } -func (c *commitClient) CommitIsAncestor(ctx context.Context, in *CommitIsAncestorRequest, opts ...grpc.CallOption) (*Boolean, error) { - out := new(Boolean) +func (c *commitClient) CommitIsAncestor(ctx context.Context, in *CommitIsAncestorRequest, opts ...grpc.CallOption) (*CommitIsAncestorResponse, error) { + out := new(CommitIsAncestorResponse) err := grpc.Invoke(ctx, "/gitaly.Commit/CommitIsAncestor", in, out, c.cc, opts...) if err != nil { return nil, err @@ -543,7 +543,7 @@ func (c *commitClient) CommitIsAncestor(ctx context.Context, in *CommitIsAncesto // Server API for Commit service type CommitServer interface { - CommitIsAncestor(context.Context, *CommitIsAncestorRequest) (*Boolean, error) + CommitIsAncestor(context.Context, *CommitIsAncestorRequest) (*CommitIsAncestorResponse, error) } func RegisterCommitServer(s *grpc.Server, srv CommitServer) { @@ -584,33 +584,32 @@ var _Commit_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gitaly.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 433 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x94, 0xcf, 0x6e, 0xd4, 0x30, - 0x10, 0xc6, 0x1b, 0x96, 0xa6, 0xbb, 0x93, 0xa2, 0x56, 0xd3, 0x85, 0x86, 0x14, 0x69, 0x2b, 0x1f, - 0x10, 0x07, 0x54, 0xa1, 0xf0, 0x04, 0x80, 0xa8, 0x36, 0x02, 0x55, 0x91, 0x29, 0x07, 0x4e, 0xc8, - 0xc4, 0x0e, 0xb5, 0x48, 0xe2, 0x10, 0x7b, 0x57, 0xec, 0x81, 0x07, 0xe0, 0x45, 0x78, 0x4e, 0xb4, - 0x4e, 0x42, 0xb2, 0x7f, 0x7a, 0xca, 0xcd, 0x33, 0xdf, 0xf8, 0xe7, 0xb1, 0xbf, 0x49, 0xe0, 0xf8, - 0xbb, 0x34, 0x2c, 0x5b, 0x5d, 0x95, 0x95, 0x32, 0x0a, 0xdd, 0x3a, 0x22, 0x33, 0x38, 0x7a, 0xab, - 0x54, 0x26, 0x58, 0x81, 0x53, 0x38, 0x5c, 0xb2, 0x6c, 0x21, 0x7c, 0xe7, 0xd2, 0x79, 0x31, 0xa6, - 0x75, 0x40, 0xde, 0xc3, 0x49, 0x54, 0xa4, 0x8a, 0x8a, 0x54, 0x53, 0xf1, 0x73, 0x21, 0xb4, 0xc1, - 0x10, 0xa0, 0x12, 0xa5, 0xd2, 0xd2, 0xa8, 0x6a, 0x65, 0xab, 0xbd, 0x10, 0xaf, 0x1a, 0x3c, 0xfd, - 0xaf, 0xd0, 0x5e, 0x15, 0x79, 0x0e, 0xa7, 0x1d, 0x46, 0x97, 0xaa, 0xd0, 0x02, 0x11, 0x1e, 0x72, - 0x66, 0x98, 0x25, 0x1c, 0x53, 0xbb, 0x26, 0x97, 0x00, 0x1d, 0x61, 0x5d, 0x51, 0x32, 0x73, 0x67, - 0x2b, 0x26, 0xd4, 0xae, 0xc9, 0x1c, 0x30, 0x56, 0xda, 0x50, 0x91, 0x08, 0xb9, 0x14, 0x43, 0x7a, - 0x7a, 0x0c, 0x67, 0x1b, 0xa4, 0xba, 0x2d, 0xf2, 0x1b, 0xf0, 0x5a, 0x16, 0x9c, 0x8a, 0xf4, 0x86, - 0xe5, 0x43, 0x0e, 0xc0, 0x0b, 0x98, 0x24, 0x2a, 0xcf, 0xa5, 0xf9, 0x2a, 0xb9, 0xff, 0xc0, 0xde, - 0x61, 0x5c, 0x27, 0x22, 0x8e, 0x4f, 0xc0, 0x2d, 0x2b, 0x91, 0xca, 0x5f, 0xfe, 0xc8, 0xde, 0xbf, - 0x89, 0xc8, 0x4b, 0x98, 0xf6, 0x8e, 0xef, 0x5e, 0x6b, 0x0a, 0x87, 0xc5, 0x3a, 0xd1, 0x3c, 0x57, - 0x1d, 0x90, 0x3f, 0x0e, 0x9c, 0xbf, 0xab, 0x91, 0xfa, 0x4d, 0x91, 0x08, 0x6d, 0x54, 0x35, 0xa4, - 0xe5, 0x19, 0x78, 0xac, 0xc1, 0x74, 0x4d, 0x43, 0x9b, 0x8a, 0x38, 0x3e, 0x85, 0x71, 0x72, 0x27, - 0x33, 0xbe, 0x56, 0x47, 0x56, 0x3d, 0xb2, 0x71, 0xc4, 0xc3, 0xbf, 0x0e, 0x4c, 0x3e, 0xe5, 0xac, - 0x32, 0xf3, 0xdb, 0xdb, 0x18, 0x3f, 0x00, 0xb6, 0x8e, 0x7f, 0x2e, 0x33, 0xc5, 0x78, 0xcc, 0x92, - 0x1f, 0x78, 0xde, 0x9e, 0xbf, 0x35, 0x54, 0x81, 0xbf, 0x2b, 0x34, 0x7e, 0x1c, 0xbc, 0x72, 0xf0, - 0x23, 0x9c, 0x75, 0x79, 0x6b, 0xd7, 0x00, 0x5a, 0xf8, 0x05, 0x1e, 0xdd, 0x28, 0x23, 0x53, 0x99, - 0x30, 0x23, 0x55, 0xa1, 0x71, 0x0e, 0x5e, 0x6f, 0x12, 0x30, 0x68, 0x77, 0xef, 0x0e, 0x5a, 0x70, - 0xb1, 0x57, 0x6b, 0xe1, 0x61, 0x0c, 0x23, 0x2a, 0x52, 0x8c, 0xc0, 0xeb, 0x99, 0xd8, 0x01, 0x77, - 0x07, 0x2b, 0x78, 0xb6, 0x47, 0xd3, 0x1b, 0x44, 0xb7, 0x36, 0x18, 0xaf, 0xe1, 0x74, 0xdb, 0x6a, - 0x9c, 0xb5, 0xbb, 0xef, 0x19, 0x82, 0xe0, 0xa4, 0x2d, 0x68, 0x3e, 0x73, 0x72, 0xf0, 0xcd, 0xb5, - 0xbf, 0x80, 0xd7, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x0c, 0x3f, 0x90, 0x12, 0x04, 0x00, - 0x00, + // 429 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xdd, 0x6e, 0xd3, 0x30, + 0x14, 0x5e, 0x28, 0x84, 0xf6, 0x74, 0x88, 0xe9, 0x14, 0x58, 0xc8, 0x2e, 0x56, 0xf9, 0x02, 0xc1, + 0xcd, 0x34, 0x85, 0x27, 0x40, 0x08, 0xd4, 0x08, 0x34, 0x2a, 0x33, 0x84, 0xb8, 0x42, 0x26, 0x76, + 0x98, 0x45, 0x12, 0x87, 0xd8, 0xad, 0xe8, 0x05, 0x0f, 0xc0, 0x8b, 0xf0, 0x9c, 0x28, 0x4e, 0x4c, + 0xda, 0xa6, 0xbd, 0x59, 0xef, 0xce, 0x5f, 0xbe, 0xef, 0xf8, 0x7c, 0x9f, 0x02, 0xc7, 0xdf, 0xa5, + 0x61, 0xd9, 0xea, 0xa2, 0xac, 0x94, 0x51, 0xe8, 0x37, 0x19, 0xb9, 0x84, 0xe0, 0xb5, 0xca, 0x73, + 0x69, 0x62, 0xfd, 0xaa, 0x48, 0x84, 0x36, 0xaa, 0xa2, 0x42, 0x97, 0xaa, 0xd0, 0x02, 0x1f, 0xc1, + 0xbd, 0x25, 0xcb, 0x16, 0x22, 0xf0, 0xa6, 0xde, 0xf3, 0x21, 0x6d, 0x12, 0xf2, 0x06, 0x1e, 0xc6, + 0x45, 0xaa, 0xa8, 0x48, 0x35, 0x15, 0x3f, 0x17, 0x42, 0x1b, 0x8c, 0x00, 0x2a, 0x51, 0x2a, 0x2d, + 0x8d, 0xaa, 0x56, 0x76, 0x7a, 0x1c, 0xe1, 0x45, 0xcb, 0x47, 0xff, 0x77, 0xe8, 0xda, 0x14, 0x79, + 0x06, 0x27, 0x1d, 0x4c, 0x4b, 0x88, 0x70, 0x97, 0x33, 0xc3, 0x2c, 0xc2, 0x31, 0xb5, 0x31, 0x99, + 0x02, 0x74, 0x08, 0xf5, 0x44, 0xc9, 0xcc, 0x8d, 0x9d, 0x18, 0x51, 0x1b, 0x93, 0x19, 0xe0, 0x5c, + 0x69, 0x43, 0x45, 0x22, 0xe4, 0x52, 0x1c, 0xb2, 0xd3, 0x63, 0x98, 0x6c, 0x20, 0x35, 0x6b, 0x91, + 0xdf, 0x80, 0x6f, 0x65, 0xc1, 0xa9, 0x48, 0xaf, 0x58, 0x7e, 0x08, 0x01, 0x9e, 0xc1, 0x28, 0xb1, + 0xd7, 0xfe, 0x2a, 0x79, 0x70, 0xc7, 0xbe, 0x61, 0xd8, 0x14, 0x62, 0x8e, 0x4f, 0xc0, 0x2f, 0x2b, + 0x91, 0xca, 0x5f, 0xc1, 0xc0, 0xbe, 0xbf, 0xcd, 0xc8, 0x0b, 0x98, 0x6c, 0xd0, 0x77, 0xc7, 0x2a, + 0x58, 0x2e, 0xdc, 0xb1, 0xea, 0x98, 0xfc, 0xf1, 0xe0, 0xb4, 0x2f, 0xe7, 0xed, 0xf7, 0x3d, 0x87, + 0x31, 0x6b, 0x61, 0xba, 0x8d, 0xc1, 0x95, 0x62, 0x8e, 0x4f, 0x61, 0x98, 0xdc, 0xc8, 0x8c, 0xd7, + 0xdd, 0x81, 0xed, 0xde, 0xb7, 0x79, 0xcc, 0xa3, 0xbf, 0x1e, 0x8c, 0x3e, 0xe6, 0xac, 0x32, 0xb3, + 0xeb, 0xeb, 0x39, 0xbe, 0x03, 0x74, 0x72, 0x7f, 0x2a, 0x33, 0xc5, 0xf8, 0x9c, 0x25, 0x3f, 0xf0, + 0xd4, 0xf1, 0x6f, 0x39, 0x2a, 0x0c, 0xfa, 0x8d, 0x56, 0x8c, 0xa3, 0x4b, 0x0f, 0xdf, 0xc3, 0xa4, + 0xab, 0x5b, 0xad, 0x0e, 0x40, 0x8b, 0xbe, 0xc0, 0x83, 0x2b, 0x65, 0x64, 0x2a, 0x13, 0x66, 0xa4, + 0x2a, 0x34, 0xce, 0x60, 0xbc, 0x66, 0x03, 0x0c, 0xdd, 0xd7, 0x7d, 0x97, 0x85, 0x67, 0x3b, 0x7b, + 0x0e, 0x3c, 0xfa, 0x00, 0x03, 0x2a, 0xd2, 0x1a, 0x70, 0x4d, 0xc1, 0x0e, 0xb0, 0xef, 0xaa, 0x0e, + 0x70, 0x87, 0xe4, 0xe4, 0x28, 0x62, 0xe0, 0x37, 0xfa, 0xe2, 0x67, 0x38, 0xd9, 0x56, 0x1a, 0xcf, + 0xdd, 0xc7, 0x7b, 0x3c, 0x10, 0x4e, 0xf7, 0x0f, 0x38, 0x8a, 0x6f, 0xbe, 0xfd, 0x41, 0xbc, 0xfc, + 0x17, 0x00, 0x00, 0xff, 0xff, 0x81, 0xc9, 0xdd, 0x8e, 0x30, 0x04, 0x00, 0x00, } diff --git a/ruby/lib/gitaly/gitaly_pb.rb b/ruby/lib/gitaly/gitaly_pb.rb index eb5abf80..948d11c5 100644 --- a/ruby/lib/gitaly/gitaly_pb.rb +++ b/ruby/lib/gitaly/gitaly_pb.rb @@ -4,7 +4,7 @@ require 'google/protobuf' Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "gitaly.Boolean" do + add_message "gitaly.CommitIsAncestorResponse" do optional :value, :bool, 1 end add_message "gitaly.InfoRefsRequest" do @@ -26,8 +26,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :commit_id, :string, 2 optional :prefix, :bytes, 3 end - add_message "gitaly.FindRefNamesResponse" do - optional :names, :bytes, 1 + add_message "gitaly.FindRefNameResponse" do + optional :name, :bytes, 1 end add_message "gitaly.CommitIsAncestorRequest" do optional :repository, :message, 1, "gitaly.Repository" @@ -37,13 +37,13 @@ Google::Protobuf::DescriptorPool.generated_pool.build do end module Gitaly - Boolean = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.Boolean").msgclass + CommitIsAncestorResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CommitIsAncestorResponse").msgclass InfoRefsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.InfoRefsRequest").msgclass InfoRefsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.InfoRefsResponse").msgclass Repository = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.Repository").msgclass PostReceiveRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.PostReceiveRequest").msgclass PostReceiveResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.PostReceiveResponse").msgclass FindRefNameRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindRefNameRequest").msgclass - FindRefNamesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindRefNamesResponse").msgclass + FindRefNameResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindRefNameResponse").msgclass CommitIsAncestorRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CommitIsAncestorRequest").msgclass end diff --git a/ruby/lib/gitaly/gitaly_services_pb.rb b/ruby/lib/gitaly/gitaly_services_pb.rb index 7662521c..9c19b82d 100644 --- a/ruby/lib/gitaly/gitaly_services_pb.rb +++ b/ruby/lib/gitaly/gitaly_services_pb.rb @@ -47,7 +47,7 @@ module Gitaly self.service_name = 'gitaly.Ref' # Find a Ref matching the given constraints. Response may be empty. - rpc :FindRefName, FindRefNameRequest, FindRefNamesResponse + rpc :FindRefName, FindRefNameRequest, FindRefNameResponse end Stub = Service.rpc_stub_class @@ -61,7 +61,7 @@ module Gitaly self.unmarshal_class_method = :decode self.service_name = 'gitaly.Commit' - rpc :CommitIsAncestor, CommitIsAncestorRequest, Boolean + rpc :CommitIsAncestor, CommitIsAncestorRequest, CommitIsAncestorResponse end Stub = Service.rpc_stub_class -- GitLab From ab38a295521ad7fdff3efbd93e4eb4f454b9d543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Fri, 24 Feb 2017 17:34:04 +0100 Subject: [PATCH 8/9] fixed merge fsckup --- gitaly.proto | 1 + go/gitaly.pb.go | 108 +++++++++++++++++++---------------- ruby/lib/gitaly/gitaly_pb.rb | 1 + 3 files changed, 60 insertions(+), 50 deletions(-) diff --git a/gitaly.proto b/gitaly.proto index 2577169c..8987d735 100644 --- a/gitaly.proto +++ b/gitaly.proto @@ -35,6 +35,7 @@ message InfoRefsUploadPackRequest { } message InfoRefsReceivePackRequest { + Repository repository = 1; } service Commit { diff --git a/go/gitaly.pb.go b/go/gitaly.pb.go index 4ea2ccf1..699967da 100644 --- a/go/gitaly.pb.go +++ b/go/gitaly.pb.go @@ -76,6 +76,7 @@ func (m *InfoRefsUploadPackRequest) GetRepository() *Repository { } type InfoRefsReceivePackRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` } func (m *InfoRefsReceivePackRequest) Reset() { *m = InfoRefsReceivePackRequest{} } @@ -83,6 +84,13 @@ func (m *InfoRefsReceivePackRequest) String() string { return proto.C func (*InfoRefsReceivePackRequest) ProtoMessage() {} func (*InfoRefsReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } +func (m *InfoRefsReceivePackRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + type CommitIsAncestorResponse struct { Value bool `protobuf:"varint,1,opt,name=value" json:"value,omitempty"` } @@ -1085,54 +1093,54 @@ var _Commit_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gitaly.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 775 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x52, 0xd3, 0x5a, - 0x14, 0x26, 0xf4, 0x7f, 0xb5, 0x1c, 0xce, 0x59, 0x3d, 0x40, 0x48, 0xe1, 0xd0, 0x13, 0xd1, 0xa9, - 0x37, 0x88, 0xe5, 0x09, 0x10, 0xd4, 0x76, 0x46, 0xa1, 0x13, 0x51, 0xc7, 0xab, 0xce, 0x26, 0xd9, - 0xa1, 0x19, 0xd2, 0xec, 0x9a, 0xec, 0x52, 0xb9, 0xf0, 0x01, 0x7c, 0x00, 0xdf, 0xcb, 0x97, 0xf0, - 0xde, 0x47, 0x70, 0xb2, 0x77, 0x42, 0x42, 0xd3, 0xd6, 0x19, 0x7a, 0x97, 0xf5, 0xf7, 0xad, 0xb5, - 0xd7, 0x6f, 0xa0, 0x76, 0xe5, 0x70, 0xe2, 0xde, 0x1e, 0x8c, 0x7c, 0xc6, 0x19, 0x16, 0x25, 0xa5, - 0xd5, 0x82, 0x01, 0xf1, 0xa9, 0x25, 0xb9, 0xfa, 0x39, 0x6c, 0x77, 0x3d, 0x9b, 0x19, 0xd4, 0x0e, - 0xde, 0x8f, 0x5c, 0x46, 0xac, 0x1e, 0x31, 0xaf, 0x0d, 0xfa, 0x79, 0x4c, 0x03, 0x8e, 0x6d, 0x00, - 0x9f, 0x8e, 0x58, 0xe0, 0x70, 0xe6, 0xdf, 0xaa, 0x4a, 0x53, 0x69, 0x55, 0xdb, 0x78, 0x10, 0xa1, - 0x1a, 0x77, 0x12, 0x23, 0xa5, 0xa5, 0xef, 0x80, 0x16, 0x03, 0x1a, 0xd4, 0xa4, 0xce, 0x0d, 0x4d, - 0x21, 0xea, 0x87, 0xa0, 0x9e, 0xb0, 0xe1, 0xd0, 0xe1, 0xdd, 0xe0, 0xd8, 0x33, 0x69, 0xc0, 0x99, - 0x6f, 0xd0, 0x60, 0xc4, 0xbc, 0x80, 0xe2, 0xbf, 0x50, 0xb8, 0x21, 0xee, 0x98, 0x0a, 0x47, 0x65, - 0x43, 0x12, 0xfa, 0x4b, 0x58, 0x4f, 0xf0, 0x1e, 0x1e, 0xd6, 0x61, 0x12, 0x56, 0xfa, 0x9d, 0x91, - 0x6b, 0x84, 0xbc, 0x45, 0x38, 0x11, 0x58, 0x35, 0x43, 0x7c, 0xeb, 0xcf, 0xa1, 0x31, 0xf3, 0x21, - 0x0b, 0x4c, 0x3a, 0x80, 0x3d, 0x16, 0xf0, 0x48, 0x7d, 0x99, 0x70, 0x37, 0xa0, 0x7e, 0x0f, 0x49, - 0x3a, 0xd5, 0xbf, 0x02, 0xbe, 0x72, 0x3c, 0xcb, 0xa0, 0xf6, 0x19, 0x19, 0x2e, 0xe3, 0x00, 0x1b, - 0x50, 0x31, 0x45, 0x21, 0xfa, 0x8e, 0xa5, 0xae, 0x36, 0x95, 0x56, 0xc5, 0x28, 0x4b, 0x46, 0xd7, - 0xc2, 0x4d, 0x28, 0x8e, 0x7c, 0x6a, 0x3b, 0x5f, 0xd4, 0x9c, 0x78, 0x5d, 0x44, 0xe9, 0x4f, 0xa1, - 0x7e, 0xcf, 0x7d, 0x92, 0x0a, 0x8f, 0x0c, 0x69, 0x9c, 0x8a, 0xf0, 0x5b, 0xff, 0xa6, 0xc0, 0x56, - 0xb6, 0xd2, 0x0f, 0x8f, 0x77, 0x0f, 0xaa, 0x24, 0x82, 0x49, 0x22, 0x86, 0x98, 0xd5, 0xb5, 0x70, - 0x1b, 0xca, 0xe6, 0xc0, 0x71, 0xad, 0x50, 0x9a, 0x13, 0xd2, 0x92, 0xa0, 0xbb, 0x96, 0x6e, 0xc0, - 0x4e, 0x18, 0xf6, 0x29, 0xb5, 0xc9, 0xd8, 0xe5, 0x2f, 0x7c, 0xe2, 0x99, 0x83, 0x25, 0xf3, 0x17, - 0xce, 0x4d, 0x88, 0x79, 0xec, 0xba, 0x09, 0xde, 0x52, 0x0d, 0xfa, 0x06, 0x36, 0x23, 0xc0, 0x0b, - 0x72, 0xb5, 0x34, 0xda, 0x11, 0xec, 0xce, 0x79, 0xf2, 0x82, 0x9a, 0xb5, 0x41, 0x9b, 0xf5, 0xa6, - 0x64, 0x3c, 0x43, 0xad, 0x40, 0x55, 0x9a, 0xb9, 0x56, 0xcd, 0x90, 0x84, 0xfe, 0x0c, 0xb6, 0x32, - 0x61, 0x2f, 0x34, 0xf8, 0xae, 0xc0, 0x3f, 0xb2, 0x31, 0x4e, 0x1d, 0xdb, 0x5e, 0xa6, 0x25, 0xf6, - 0xe1, 0x2f, 0x97, 0xda, 0xbc, 0x3f, 0xdd, 0xc7, 0xb5, 0x90, 0x7b, 0x12, 0xf7, 0xf2, 0x13, 0x58, - 0xf7, 0x9d, 0xab, 0x41, 0x5a, 0x4d, 0xb6, 0xc7, 0x9a, 0x60, 0xc7, 0x7a, 0xfa, 0x4f, 0x05, 0x30, - 0x1d, 0x57, 0xf4, 0x88, 0x06, 0x54, 0x6c, 0x9f, 0x0d, 0xfb, 0x23, 0xc2, 0x07, 0x51, 0xb2, 0xca, - 0x21, 0xa3, 0x47, 0xf8, 0x00, 0xb7, 0xa0, 0xc4, 0x99, 0x14, 0xad, 0xca, 0x41, 0xe1, 0x2c, 0x16, - 0x08, 0xab, 0x3b, 0x67, 0xc5, 0x90, 0xec, 0x5a, 0x58, 0x87, 0x02, 0x67, 0x21, 0x3b, 0x2f, 0xd8, - 0x79, 0xce, 0x64, 0xeb, 0x32, 0xd7, 0xea, 0x0f, 0x99, 0x45, 0xd5, 0x42, 0x53, 0x69, 0x15, 0x8c, - 0x12, 0x73, 0xad, 0xb7, 0xcc, 0xa2, 0xa1, 0xc8, 0xa3, 0x13, 0x29, 0x2a, 0x4a, 0x91, 0x47, 0x27, - 0x42, 0xb4, 0x09, 0xc5, 0x4b, 0xc7, 0x23, 0xfe, 0xad, 0x5a, 0x12, 0xfb, 0x32, 0xa2, 0x70, 0x17, - 0xc0, 0x27, 0x93, 0xbe, 0x39, 0x18, 0x7b, 0xd7, 0x81, 0x5a, 0x16, 0xb9, 0xaf, 0xf8, 0x64, 0x72, - 0x22, 0x18, 0xed, 0x1f, 0x0a, 0x54, 0xde, 0x0d, 0x89, 0xcf, 0x3b, 0x17, 0x17, 0x3d, 0xec, 0x03, - 0x66, 0xd7, 0x22, 0xfe, 0x1f, 0x67, 0x7e, 0xee, 0x69, 0xd0, 0xf4, 0x45, 0x2a, 0xd1, 0xb6, 0x5a, - 0x39, 0x54, 0xf0, 0x12, 0xea, 0x33, 0xb6, 0x28, 0x66, 0xcc, 0xb3, 0xb7, 0x42, 0x7b, 0xb4, 0x50, - 0x27, 0xf1, 0xd1, 0xfe, 0x04, 0x6b, 0x67, 0x8c, 0x3b, 0xb6, 0x63, 0x12, 0xee, 0x30, 0x2f, 0xc0, - 0x0e, 0x54, 0x53, 0xdb, 0x13, 0xb5, 0x18, 0x28, 0xbb, 0x9c, 0xb5, 0xc6, 0x4c, 0x59, 0x0c, 0xde, - 0xfe, 0xb5, 0x0a, 0x39, 0x83, 0xda, 0x68, 0xc3, 0xc6, 0xcc, 0x79, 0xc2, 0xfd, 0xd8, 0x7e, 0xd1, - 0x86, 0xd1, 0x1e, 0xff, 0x41, 0x2b, 0xf6, 0x17, 0xd6, 0x23, 0x3b, 0x82, 0x49, 0x3d, 0xe6, 0xae, - 0x9c, 0xa4, 0x1e, 0xf3, 0x27, 0x58, 0xd4, 0xe3, 0x03, 0xac, 0x4f, 0xcd, 0x2b, 0xfe, 0x37, 0x65, - 0x3a, 0xb5, 0x7f, 0xb4, 0xbd, 0xb9, 0xf2, 0x14, 0x6e, 0x07, 0xaa, 0xa9, 0xd3, 0x90, 0xa4, 0x3c, - 0x7b, 0xae, 0x92, 0x94, 0xcf, 0xb8, 0x25, 0xfa, 0x4a, 0xfb, 0x1c, 0xf2, 0xe1, 0x04, 0xe2, 0x6b, - 0x80, 0x64, 0x1e, 0x71, 0x3b, 0x36, 0xca, 0xec, 0x0e, 0x4d, 0x9b, 0x25, 0x4a, 0xb5, 0x07, 0x81, - 0xa2, 0x94, 0xe0, 0x47, 0xf8, 0x7b, 0xfa, 0x26, 0xe1, 0xde, 0x7d, 0xeb, 0xcc, 0xb5, 0xd2, 0x9a, - 0xf3, 0x15, 0x62, 0x27, 0x97, 0x45, 0xf1, 0x33, 0x75, 0xf4, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x1b, - 0x9f, 0x4a, 0xe4, 0x72, 0x09, 0x00, 0x00, + // 770 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x56, 0x5d, 0x52, 0xd3, 0x5e, + 0x14, 0x27, 0xf4, 0xfb, 0xb4, 0xfc, 0xf9, 0x7b, 0x2a, 0x10, 0x52, 0x91, 0x1a, 0xd1, 0xa9, 0x2f, + 0x88, 0x65, 0x05, 0x08, 0x6a, 0x3b, 0xa3, 0xd0, 0x89, 0xa8, 0xe3, 0x53, 0xe7, 0x92, 0xdc, 0xd0, + 0x0c, 0x69, 0x6e, 0x4d, 0x6e, 0xa9, 0x3c, 0xb8, 0x00, 0x17, 0xe0, 0xbe, 0xdc, 0x84, 0xef, 0x2e, + 0xc1, 0xc9, 0x4d, 0x42, 0x42, 0x93, 0xd6, 0x19, 0xf3, 0x96, 0xf3, 0xf5, 0x3b, 0xe7, 0x9e, 0xcf, + 0x40, 0xe3, 0xd2, 0xe2, 0xc4, 0xbe, 0xd9, 0x9f, 0xb8, 0x8c, 0x33, 0x2c, 0x07, 0x94, 0xd2, 0xf0, + 0x46, 0xc4, 0xa5, 0x46, 0xc0, 0x55, 0xcf, 0x60, 0xbb, 0xef, 0x98, 0x4c, 0xa3, 0xa6, 0xf7, 0x61, + 0x62, 0x33, 0x62, 0x0c, 0x88, 0x7e, 0xa5, 0xd1, 0x2f, 0x53, 0xea, 0x71, 0xec, 0x02, 0xb8, 0x74, + 0xc2, 0x3c, 0x8b, 0x33, 0xf7, 0x46, 0x96, 0xda, 0x52, 0xa7, 0xde, 0xc5, 0xfd, 0x10, 0x55, 0xbb, + 0x95, 0x68, 0x09, 0x2d, 0x75, 0x00, 0x4a, 0x04, 0xa8, 0x51, 0x9d, 0x5a, 0xd7, 0x34, 0x2f, 0xe2, + 0x01, 0xc8, 0xc7, 0x6c, 0x3c, 0xb6, 0x78, 0xdf, 0x3b, 0x72, 0x74, 0xea, 0x71, 0xe6, 0x6a, 0xd4, + 0x9b, 0x30, 0xc7, 0xa3, 0x78, 0x1f, 0x4a, 0xd7, 0xc4, 0x9e, 0x52, 0x01, 0x55, 0xd5, 0x02, 0x42, + 0x7d, 0x05, 0xeb, 0x71, 0x0c, 0x79, 0x1c, 0x2b, 0x59, 0xb9, 0x09, 0x5d, 0x23, 0x14, 0x0d, 0xc2, + 0x89, 0xc0, 0x6a, 0x68, 0xe2, 0x5b, 0x7d, 0x01, 0xad, 0xcc, 0xc7, 0x2f, 0x31, 0xe9, 0x01, 0x0e, + 0x98, 0xc7, 0x43, 0xf5, 0x3c, 0xe1, 0x6e, 0x40, 0xf3, 0x0e, 0x52, 0xe0, 0x54, 0xfd, 0x06, 0xf8, + 0xda, 0x72, 0x0c, 0x8d, 0x9a, 0xa7, 0x64, 0x9c, 0xc7, 0x01, 0xb6, 0xa0, 0xa6, 0x8b, 0x42, 0x0c, + 0x2d, 0x43, 0x5e, 0x6d, 0x4b, 0x9d, 0x9a, 0x56, 0x0d, 0x18, 0x7d, 0x03, 0x37, 0xa1, 0x3c, 0x71, + 0xa9, 0x69, 0x7d, 0x95, 0x0b, 0xe2, 0x75, 0x21, 0xa5, 0x3e, 0x83, 0xe6, 0x1d, 0xf7, 0x71, 0x2a, + 0x1c, 0x32, 0xa6, 0x51, 0x2a, 0xfc, 0x6f, 0xf5, 0xbb, 0x04, 0x5b, 0xe9, 0x4a, 0xff, 0x7b, 0xbc, + 0xbb, 0x50, 0x27, 0x21, 0x4c, 0x1c, 0x31, 0x44, 0xac, 0xbe, 0x81, 0xdb, 0x50, 0xd5, 0x47, 0x96, + 0x6d, 0xf8, 0xd2, 0x82, 0x90, 0x56, 0x04, 0xdd, 0x37, 0x54, 0x0d, 0x1e, 0xf8, 0x61, 0x9f, 0x50, + 0x93, 0x4c, 0x6d, 0xfe, 0xd2, 0x25, 0x8e, 0x3e, 0xca, 0x99, 0x3f, 0x7f, 0xd6, 0x7c, 0xcc, 0x23, + 0xdb, 0x8e, 0xf1, 0x72, 0x35, 0xe8, 0x5b, 0xd8, 0x0c, 0x01, 0xcf, 0xc9, 0x65, 0x6e, 0xb4, 0x43, + 0xd8, 0x59, 0xf0, 0xe4, 0x25, 0x35, 0xeb, 0x82, 0x92, 0xf5, 0xa6, 0x78, 0x3c, 0x7d, 0x2d, 0x4f, + 0x96, 0xda, 0x85, 0x4e, 0x43, 0x0b, 0x08, 0xf5, 0x39, 0x6c, 0xa5, 0xc2, 0x5e, 0x6a, 0xf0, 0x43, + 0x82, 0x7b, 0x41, 0x63, 0x9c, 0x58, 0xa6, 0x99, 0xa7, 0x25, 0xf6, 0xe0, 0x3f, 0x9b, 0x9a, 0x7c, + 0x38, 0xdf, 0xc7, 0x0d, 0x9f, 0x7b, 0x1c, 0xf5, 0xf2, 0x53, 0x58, 0x77, 0xad, 0xcb, 0x51, 0x52, + 0x2d, 0x68, 0x8f, 0x35, 0xc1, 0x8e, 0xf4, 0xd4, 0x5f, 0x12, 0x60, 0x32, 0xae, 0xf0, 0x11, 0x2d, + 0xa8, 0x99, 0x2e, 0x1b, 0x0f, 0x27, 0x84, 0x8f, 0xc2, 0x64, 0x55, 0x7d, 0xc6, 0x80, 0xf0, 0x11, + 0x6e, 0x41, 0x85, 0xb3, 0x40, 0xb4, 0x1a, 0x0c, 0x0a, 0x67, 0x91, 0x40, 0x58, 0xdd, 0x3a, 0x2b, + 0xfb, 0x64, 0xdf, 0xc0, 0x26, 0x94, 0x38, 0xf3, 0xd9, 0x45, 0xc1, 0x2e, 0x72, 0x16, 0xb4, 0x2e, + 0xb3, 0x8d, 0xe1, 0x98, 0x19, 0x54, 0x2e, 0xb5, 0xa5, 0x4e, 0x49, 0xab, 0x30, 0xdb, 0x78, 0xc7, + 0x0c, 0xea, 0x8b, 0x1c, 0x3a, 0x0b, 0x44, 0xe5, 0x40, 0xe4, 0xd0, 0x99, 0x10, 0x6d, 0x42, 0xf9, + 0xc2, 0x72, 0x88, 0x7b, 0x23, 0x57, 0xc4, 0xbe, 0x0c, 0x29, 0xdc, 0x01, 0x70, 0xc9, 0x6c, 0xa8, + 0x8f, 0xa6, 0xce, 0x95, 0x27, 0x57, 0x45, 0xee, 0x6b, 0x2e, 0x99, 0x1d, 0x0b, 0x46, 0xf7, 0xa7, + 0x04, 0xb5, 0xf7, 0x63, 0xe2, 0xf2, 0xde, 0xf9, 0xf9, 0x00, 0x87, 0x80, 0xe9, 0xb5, 0x88, 0x8f, + 0xa2, 0xcc, 0x2f, 0x3c, 0x27, 0x8a, 0xba, 0x4c, 0x25, 0xdc, 0x56, 0x2b, 0x07, 0x12, 0x5e, 0x40, + 0x33, 0x63, 0x8b, 0x62, 0xca, 0x3c, 0x7d, 0x5f, 0x94, 0xc7, 0x4b, 0x75, 0x62, 0x1f, 0xdd, 0xcf, + 0xb0, 0x76, 0xca, 0xb8, 0x65, 0x5a, 0x3a, 0xe1, 0x16, 0x73, 0x3c, 0xec, 0x41, 0x3d, 0xb1, 0x3d, + 0x51, 0x89, 0x80, 0xd2, 0xcb, 0x59, 0x69, 0x65, 0xca, 0x22, 0xf0, 0xee, 0xef, 0x55, 0x28, 0x68, + 0xd4, 0x44, 0x13, 0x36, 0x32, 0xe7, 0x09, 0xf7, 0x22, 0xfb, 0x65, 0x1b, 0x46, 0x79, 0xf2, 0x17, + 0xad, 0xc8, 0x9f, 0x5f, 0x8f, 0xf4, 0x08, 0xc6, 0xf5, 0x58, 0xb8, 0x72, 0xe2, 0x7a, 0x2c, 0x9e, + 0x60, 0x51, 0x8f, 0x8f, 0xb0, 0x3e, 0x37, 0xaf, 0xf8, 0x70, 0xce, 0x74, 0x6e, 0xff, 0x28, 0xbb, + 0x0b, 0xe5, 0x09, 0xdc, 0x1e, 0xd4, 0x13, 0xa7, 0x21, 0x4e, 0x79, 0xfa, 0x5c, 0xc5, 0x29, 0xcf, + 0xb8, 0x25, 0xea, 0x4a, 0xf7, 0x0c, 0x8a, 0xfe, 0x04, 0xe2, 0x1b, 0x80, 0x78, 0x1e, 0x71, 0x3b, + 0x32, 0x4a, 0xed, 0x0e, 0x45, 0xc9, 0x12, 0x25, 0xda, 0x83, 0x40, 0x39, 0x90, 0xe0, 0x27, 0xf8, + 0x7f, 0xfe, 0x26, 0xe1, 0xee, 0x5d, 0xeb, 0xd4, 0xb5, 0x52, 0xda, 0x8b, 0x15, 0x22, 0x27, 0x17, + 0x65, 0xf1, 0x03, 0x76, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0x13, 0xc9, 0x89, 0xf5, 0xa6, 0x09, + 0x00, 0x00, } diff --git a/ruby/lib/gitaly/gitaly_pb.rb b/ruby/lib/gitaly/gitaly_pb.rb index 6000f21b..1f2c23a2 100644 --- a/ruby/lib/gitaly/gitaly_pb.rb +++ b/ruby/lib/gitaly/gitaly_pb.rb @@ -9,6 +9,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :repository, :message, 1, "gitaly.Repository" end add_message "gitaly.InfoRefsReceivePackRequest" do + optional :repository, :message, 1, "gitaly.Repository" end add_message "gitaly.CommitIsAncestorResponse" do optional :value, :bool, 1 -- GitLab From e13050f642a003b442eda47993a7a5e69b18ab87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Fri, 24 Feb 2017 17:35:37 +0100 Subject: [PATCH 9/9] more merge issues --- gitaly.proto | 4 - go/gitaly.pb.go | 147 +++++++++++++++-------------------- ruby/lib/gitaly/gitaly_pb.rb | 4 - 3 files changed, 64 insertions(+), 91 deletions(-) diff --git a/gitaly.proto b/gitaly.proto index 8987d735..0fe89487 100644 --- a/gitaly.proto +++ b/gitaly.proto @@ -46,10 +46,6 @@ message CommitIsAncestorResponse { bool value = 1; } -message InfoRefsRequest { - Repository repository = 1; -} - message InfoRefsUploadPackResponse { bytes data = 1; } diff --git a/go/gitaly.pb.go b/go/gitaly.pb.go index 699967da..fbecd02a 100644 --- a/go/gitaly.pb.go +++ b/go/gitaly.pb.go @@ -14,7 +14,6 @@ It has these top-level messages: InfoRefsUploadPackRequest InfoRefsReceivePackRequest CommitIsAncestorResponse - InfoRefsRequest InfoRefsUploadPackResponse InfoRefsReceivePackResponse PostReceiveRequest @@ -107,22 +106,6 @@ func (m *CommitIsAncestorResponse) GetValue() bool { return false } -type InfoRefsRequest struct { - Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` -} - -func (m *InfoRefsRequest) Reset() { *m = InfoRefsRequest{} } -func (m *InfoRefsRequest) String() string { return proto.CompactTextString(m) } -func (*InfoRefsRequest) ProtoMessage() {} -func (*InfoRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } - -func (m *InfoRefsRequest) GetRepository() *Repository { - if m != nil { - return m.Repository - } - return nil -} - type InfoRefsUploadPackResponse struct { Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` } @@ -130,7 +113,7 @@ type InfoRefsUploadPackResponse struct { func (m *InfoRefsUploadPackResponse) Reset() { *m = InfoRefsUploadPackResponse{} } func (m *InfoRefsUploadPackResponse) String() string { return proto.CompactTextString(m) } func (*InfoRefsUploadPackResponse) ProtoMessage() {} -func (*InfoRefsUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } +func (*InfoRefsUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } func (m *InfoRefsUploadPackResponse) GetData() []byte { if m != nil { @@ -146,7 +129,7 @@ type InfoRefsReceivePackResponse struct { func (m *InfoRefsReceivePackResponse) Reset() { *m = InfoRefsReceivePackResponse{} } func (m *InfoRefsReceivePackResponse) String() string { return proto.CompactTextString(m) } func (*InfoRefsReceivePackResponse) ProtoMessage() {} -func (*InfoRefsReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } +func (*InfoRefsReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } func (m *InfoRefsReceivePackResponse) GetData() []byte { if m != nil { @@ -162,7 +145,7 @@ type PostReceiveRequest struct { func (m *PostReceiveRequest) Reset() { *m = PostReceiveRequest{} } func (m *PostReceiveRequest) String() string { return proto.CompactTextString(m) } func (*PostReceiveRequest) ProtoMessage() {} -func (*PostReceiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } +func (*PostReceiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } func (m *PostReceiveRequest) GetRepository() *Repository { if m != nil { @@ -177,7 +160,7 @@ type PostReceiveResponse struct { func (m *PostReceiveResponse) Reset() { *m = PostReceiveResponse{} } func (m *PostReceiveResponse) String() string { return proto.CompactTextString(m) } func (*PostReceiveResponse) ProtoMessage() {} -func (*PostReceiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } +func (*PostReceiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } type FindRefNameRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` @@ -190,7 +173,7 @@ type FindRefNameRequest struct { func (m *FindRefNameRequest) Reset() { *m = FindRefNameRequest{} } func (m *FindRefNameRequest) String() string { return proto.CompactTextString(m) } func (*FindRefNameRequest) ProtoMessage() {} -func (*FindRefNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } +func (*FindRefNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } func (m *FindRefNameRequest) GetRepository() *Repository { if m != nil { @@ -221,7 +204,7 @@ type FindRefNameResponse struct { func (m *FindRefNameResponse) Reset() { *m = FindRefNameResponse{} } func (m *FindRefNameResponse) String() string { return proto.CompactTextString(m) } func (*FindRefNameResponse) ProtoMessage() {} -func (*FindRefNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } +func (*FindRefNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } func (m *FindRefNameResponse) GetName() []byte { if m != nil { @@ -239,7 +222,7 @@ type CommitIsAncestorRequest struct { func (m *CommitIsAncestorRequest) Reset() { *m = CommitIsAncestorRequest{} } func (m *CommitIsAncestorRequest) String() string { return proto.CompactTextString(m) } func (*CommitIsAncestorRequest) ProtoMessage() {} -func (*CommitIsAncestorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } +func (*CommitIsAncestorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } func (m *CommitIsAncestorRequest) GetRepository() *Repository { if m != nil { @@ -269,7 +252,7 @@ type FindDefaultBranchNameRequest struct { func (m *FindDefaultBranchNameRequest) Reset() { *m = FindDefaultBranchNameRequest{} } func (m *FindDefaultBranchNameRequest) String() string { return proto.CompactTextString(m) } func (*FindDefaultBranchNameRequest) ProtoMessage() {} -func (*FindDefaultBranchNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } +func (*FindDefaultBranchNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } func (m *FindDefaultBranchNameRequest) GetRepository() *Repository { if m != nil { @@ -285,7 +268,7 @@ type FindAllBranchNamesRequest struct { func (m *FindAllBranchNamesRequest) Reset() { *m = FindAllBranchNamesRequest{} } func (m *FindAllBranchNamesRequest) String() string { return proto.CompactTextString(m) } func (*FindAllBranchNamesRequest) ProtoMessage() {} -func (*FindAllBranchNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} } +func (*FindAllBranchNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } func (m *FindAllBranchNamesRequest) GetRepository() *Repository { if m != nil { @@ -301,7 +284,7 @@ type FindAllTagNamesRequest struct { func (m *FindAllTagNamesRequest) Reset() { *m = FindAllTagNamesRequest{} } func (m *FindAllTagNamesRequest) String() string { return proto.CompactTextString(m) } func (*FindAllTagNamesRequest) ProtoMessage() {} -func (*FindAllTagNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } +func (*FindAllTagNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} } func (m *FindAllTagNamesRequest) GetRepository() *Repository { if m != nil { @@ -317,7 +300,7 @@ type FindDefaultBranchNameResponse struct { func (m *FindDefaultBranchNameResponse) Reset() { *m = FindDefaultBranchNameResponse{} } func (m *FindDefaultBranchNameResponse) String() string { return proto.CompactTextString(m) } func (*FindDefaultBranchNameResponse) ProtoMessage() {} -func (*FindDefaultBranchNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} } +func (*FindDefaultBranchNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } func (m *FindDefaultBranchNameResponse) GetName() []byte { if m != nil { @@ -333,7 +316,7 @@ type FindAllBranchNamesResponse struct { func (m *FindAllBranchNamesResponse) Reset() { *m = FindAllBranchNamesResponse{} } func (m *FindAllBranchNamesResponse) String() string { return proto.CompactTextString(m) } func (*FindAllBranchNamesResponse) ProtoMessage() {} -func (*FindAllBranchNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } +func (*FindAllBranchNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} } func (m *FindAllBranchNamesResponse) GetNames() [][]byte { if m != nil { @@ -349,7 +332,7 @@ type FindAllTagNamesResponse struct { func (m *FindAllTagNamesResponse) Reset() { *m = FindAllTagNamesResponse{} } func (m *FindAllTagNamesResponse) String() string { return proto.CompactTextString(m) } func (*FindAllTagNamesResponse) ProtoMessage() {} -func (*FindAllTagNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} } +func (*FindAllTagNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } func (m *FindAllTagNamesResponse) GetNames() [][]byte { if m != nil { @@ -367,7 +350,7 @@ type CommitDiffRequest struct { func (m *CommitDiffRequest) Reset() { *m = CommitDiffRequest{} } func (m *CommitDiffRequest) String() string { return proto.CompactTextString(m) } func (*CommitDiffRequest) ProtoMessage() {} -func (*CommitDiffRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} } +func (*CommitDiffRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} } func (m *CommitDiffRequest) GetRepository() *Repository { if m != nil { @@ -406,7 +389,7 @@ type CommitDiffResponse struct { func (m *CommitDiffResponse) Reset() { *m = CommitDiffResponse{} } func (m *CommitDiffResponse) String() string { return proto.CompactTextString(m) } func (*CommitDiffResponse) ProtoMessage() {} -func (*CommitDiffResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} } +func (*CommitDiffResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} } func (m *CommitDiffResponse) GetFromPath() []byte { if m != nil { @@ -468,7 +451,6 @@ func init() { proto.RegisterType((*InfoRefsUploadPackRequest)(nil), "gitaly.InfoRefsUploadPackRequest") proto.RegisterType((*InfoRefsReceivePackRequest)(nil), "gitaly.InfoRefsReceivePackRequest") proto.RegisterType((*CommitIsAncestorResponse)(nil), "gitaly.CommitIsAncestorResponse") - proto.RegisterType((*InfoRefsRequest)(nil), "gitaly.InfoRefsRequest") proto.RegisterType((*InfoRefsUploadPackResponse)(nil), "gitaly.InfoRefsUploadPackResponse") proto.RegisterType((*InfoRefsReceivePackResponse)(nil), "gitaly.InfoRefsReceivePackResponse") proto.RegisterType((*PostReceiveRequest)(nil), "gitaly.PostReceiveRequest") @@ -1093,54 +1075,53 @@ var _Commit_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gitaly.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 770 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x56, 0x5d, 0x52, 0xd3, 0x5e, - 0x14, 0x27, 0xf4, 0xfb, 0xb4, 0xfc, 0xf9, 0x7b, 0x2a, 0x10, 0x52, 0x91, 0x1a, 0xd1, 0xa9, 0x2f, - 0x88, 0x65, 0x05, 0x08, 0x6a, 0x3b, 0xa3, 0xd0, 0x89, 0xa8, 0xe3, 0x53, 0xe7, 0x92, 0xdc, 0xd0, - 0x0c, 0x69, 0x6e, 0x4d, 0x6e, 0xa9, 0x3c, 0xb8, 0x00, 0x17, 0xe0, 0xbe, 0xdc, 0x84, 0xef, 0x2e, - 0xc1, 0xc9, 0x4d, 0x42, 0x42, 0x93, 0xd6, 0x19, 0xf3, 0x96, 0xf3, 0xf5, 0x3b, 0xe7, 0x9e, 0xcf, - 0x40, 0xe3, 0xd2, 0xe2, 0xc4, 0xbe, 0xd9, 0x9f, 0xb8, 0x8c, 0x33, 0x2c, 0x07, 0x94, 0xd2, 0xf0, - 0x46, 0xc4, 0xa5, 0x46, 0xc0, 0x55, 0xcf, 0x60, 0xbb, 0xef, 0x98, 0x4c, 0xa3, 0xa6, 0xf7, 0x61, - 0x62, 0x33, 0x62, 0x0c, 0x88, 0x7e, 0xa5, 0xd1, 0x2f, 0x53, 0xea, 0x71, 0xec, 0x02, 0xb8, 0x74, - 0xc2, 0x3c, 0x8b, 0x33, 0xf7, 0x46, 0x96, 0xda, 0x52, 0xa7, 0xde, 0xc5, 0xfd, 0x10, 0x55, 0xbb, - 0x95, 0x68, 0x09, 0x2d, 0x75, 0x00, 0x4a, 0x04, 0xa8, 0x51, 0x9d, 0x5a, 0xd7, 0x34, 0x2f, 0xe2, - 0x01, 0xc8, 0xc7, 0x6c, 0x3c, 0xb6, 0x78, 0xdf, 0x3b, 0x72, 0x74, 0xea, 0x71, 0xe6, 0x6a, 0xd4, - 0x9b, 0x30, 0xc7, 0xa3, 0x78, 0x1f, 0x4a, 0xd7, 0xc4, 0x9e, 0x52, 0x01, 0x55, 0xd5, 0x02, 0x42, - 0x7d, 0x05, 0xeb, 0x71, 0x0c, 0x79, 0x1c, 0x2b, 0x59, 0xb9, 0x09, 0x5d, 0x23, 0x14, 0x0d, 0xc2, - 0x89, 0xc0, 0x6a, 0x68, 0xe2, 0x5b, 0x7d, 0x01, 0xad, 0xcc, 0xc7, 0x2f, 0x31, 0xe9, 0x01, 0x0e, - 0x98, 0xc7, 0x43, 0xf5, 0x3c, 0xe1, 0x6e, 0x40, 0xf3, 0x0e, 0x52, 0xe0, 0x54, 0xfd, 0x06, 0xf8, - 0xda, 0x72, 0x0c, 0x8d, 0x9a, 0xa7, 0x64, 0x9c, 0xc7, 0x01, 0xb6, 0xa0, 0xa6, 0x8b, 0x42, 0x0c, - 0x2d, 0x43, 0x5e, 0x6d, 0x4b, 0x9d, 0x9a, 0x56, 0x0d, 0x18, 0x7d, 0x03, 0x37, 0xa1, 0x3c, 0x71, - 0xa9, 0x69, 0x7d, 0x95, 0x0b, 0xe2, 0x75, 0x21, 0xa5, 0x3e, 0x83, 0xe6, 0x1d, 0xf7, 0x71, 0x2a, - 0x1c, 0x32, 0xa6, 0x51, 0x2a, 0xfc, 0x6f, 0xf5, 0xbb, 0x04, 0x5b, 0xe9, 0x4a, 0xff, 0x7b, 0xbc, - 0xbb, 0x50, 0x27, 0x21, 0x4c, 0x1c, 0x31, 0x44, 0xac, 0xbe, 0x81, 0xdb, 0x50, 0xd5, 0x47, 0x96, - 0x6d, 0xf8, 0xd2, 0x82, 0x90, 0x56, 0x04, 0xdd, 0x37, 0x54, 0x0d, 0x1e, 0xf8, 0x61, 0x9f, 0x50, - 0x93, 0x4c, 0x6d, 0xfe, 0xd2, 0x25, 0x8e, 0x3e, 0xca, 0x99, 0x3f, 0x7f, 0xd6, 0x7c, 0xcc, 0x23, - 0xdb, 0x8e, 0xf1, 0x72, 0x35, 0xe8, 0x5b, 0xd8, 0x0c, 0x01, 0xcf, 0xc9, 0x65, 0x6e, 0xb4, 0x43, - 0xd8, 0x59, 0xf0, 0xe4, 0x25, 0x35, 0xeb, 0x82, 0x92, 0xf5, 0xa6, 0x78, 0x3c, 0x7d, 0x2d, 0x4f, - 0x96, 0xda, 0x85, 0x4e, 0x43, 0x0b, 0x08, 0xf5, 0x39, 0x6c, 0xa5, 0xc2, 0x5e, 0x6a, 0xf0, 0x43, - 0x82, 0x7b, 0x41, 0x63, 0x9c, 0x58, 0xa6, 0x99, 0xa7, 0x25, 0xf6, 0xe0, 0x3f, 0x9b, 0x9a, 0x7c, - 0x38, 0xdf, 0xc7, 0x0d, 0x9f, 0x7b, 0x1c, 0xf5, 0xf2, 0x53, 0x58, 0x77, 0xad, 0xcb, 0x51, 0x52, - 0x2d, 0x68, 0x8f, 0x35, 0xc1, 0x8e, 0xf4, 0xd4, 0x5f, 0x12, 0x60, 0x32, 0xae, 0xf0, 0x11, 0x2d, - 0xa8, 0x99, 0x2e, 0x1b, 0x0f, 0x27, 0x84, 0x8f, 0xc2, 0x64, 0x55, 0x7d, 0xc6, 0x80, 0xf0, 0x11, - 0x6e, 0x41, 0x85, 0xb3, 0x40, 0xb4, 0x1a, 0x0c, 0x0a, 0x67, 0x91, 0x40, 0x58, 0xdd, 0x3a, 0x2b, - 0xfb, 0x64, 0xdf, 0xc0, 0x26, 0x94, 0x38, 0xf3, 0xd9, 0x45, 0xc1, 0x2e, 0x72, 0x16, 0xb4, 0x2e, - 0xb3, 0x8d, 0xe1, 0x98, 0x19, 0x54, 0x2e, 0xb5, 0xa5, 0x4e, 0x49, 0xab, 0x30, 0xdb, 0x78, 0xc7, - 0x0c, 0xea, 0x8b, 0x1c, 0x3a, 0x0b, 0x44, 0xe5, 0x40, 0xe4, 0xd0, 0x99, 0x10, 0x6d, 0x42, 0xf9, - 0xc2, 0x72, 0x88, 0x7b, 0x23, 0x57, 0xc4, 0xbe, 0x0c, 0x29, 0xdc, 0x01, 0x70, 0xc9, 0x6c, 0xa8, - 0x8f, 0xa6, 0xce, 0x95, 0x27, 0x57, 0x45, 0xee, 0x6b, 0x2e, 0x99, 0x1d, 0x0b, 0x46, 0xf7, 0xa7, - 0x04, 0xb5, 0xf7, 0x63, 0xe2, 0xf2, 0xde, 0xf9, 0xf9, 0x00, 0x87, 0x80, 0xe9, 0xb5, 0x88, 0x8f, - 0xa2, 0xcc, 0x2f, 0x3c, 0x27, 0x8a, 0xba, 0x4c, 0x25, 0xdc, 0x56, 0x2b, 0x07, 0x12, 0x5e, 0x40, - 0x33, 0x63, 0x8b, 0x62, 0xca, 0x3c, 0x7d, 0x5f, 0x94, 0xc7, 0x4b, 0x75, 0x62, 0x1f, 0xdd, 0xcf, - 0xb0, 0x76, 0xca, 0xb8, 0x65, 0x5a, 0x3a, 0xe1, 0x16, 0x73, 0x3c, 0xec, 0x41, 0x3d, 0xb1, 0x3d, - 0x51, 0x89, 0x80, 0xd2, 0xcb, 0x59, 0x69, 0x65, 0xca, 0x22, 0xf0, 0xee, 0xef, 0x55, 0x28, 0x68, - 0xd4, 0x44, 0x13, 0x36, 0x32, 0xe7, 0x09, 0xf7, 0x22, 0xfb, 0x65, 0x1b, 0x46, 0x79, 0xf2, 0x17, - 0xad, 0xc8, 0x9f, 0x5f, 0x8f, 0xf4, 0x08, 0xc6, 0xf5, 0x58, 0xb8, 0x72, 0xe2, 0x7a, 0x2c, 0x9e, - 0x60, 0x51, 0x8f, 0x8f, 0xb0, 0x3e, 0x37, 0xaf, 0xf8, 0x70, 0xce, 0x74, 0x6e, 0xff, 0x28, 0xbb, - 0x0b, 0xe5, 0x09, 0xdc, 0x1e, 0xd4, 0x13, 0xa7, 0x21, 0x4e, 0x79, 0xfa, 0x5c, 0xc5, 0x29, 0xcf, - 0xb8, 0x25, 0xea, 0x4a, 0xf7, 0x0c, 0x8a, 0xfe, 0x04, 0xe2, 0x1b, 0x80, 0x78, 0x1e, 0x71, 0x3b, - 0x32, 0x4a, 0xed, 0x0e, 0x45, 0xc9, 0x12, 0x25, 0xda, 0x83, 0x40, 0x39, 0x90, 0xe0, 0x27, 0xf8, - 0x7f, 0xfe, 0x26, 0xe1, 0xee, 0x5d, 0xeb, 0xd4, 0xb5, 0x52, 0xda, 0x8b, 0x15, 0x22, 0x27, 0x17, - 0x65, 0xf1, 0x03, 0x76, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0x13, 0xc9, 0x89, 0xf5, 0xa6, 0x09, - 0x00, 0x00, + // 767 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x56, 0xef, 0x52, 0xd3, 0x40, + 0x10, 0x27, 0xf4, 0xff, 0xb6, 0x88, 0x6e, 0x05, 0x42, 0x2a, 0x52, 0x23, 0x3a, 0xf5, 0x0b, 0x62, + 0x79, 0x02, 0x84, 0xd1, 0x76, 0x46, 0xa1, 0x13, 0x51, 0xc7, 0x4f, 0x9d, 0x23, 0xb9, 0xd0, 0x0c, + 0x69, 0xae, 0x26, 0x57, 0x2a, 0x1f, 0x7c, 0x00, 0x1f, 0xc0, 0xf7, 0xf2, 0x25, 0xfc, 0xee, 0x23, + 0x38, 0xb9, 0x4b, 0x48, 0x68, 0xda, 0x3a, 0x63, 0xbf, 0xe5, 0xf6, 0xb7, 0xfb, 0xdb, 0xbd, 0xbd, + 0xfd, 0x13, 0xa8, 0x5d, 0x3a, 0x9c, 0xb8, 0x37, 0xfb, 0x23, 0x9f, 0x71, 0x86, 0x45, 0x79, 0xd2, + 0x6a, 0xc1, 0x80, 0xf8, 0xd4, 0x92, 0x52, 0xfd, 0x0c, 0xb6, 0xbb, 0x9e, 0xcd, 0x0c, 0x6a, 0x07, + 0x1f, 0x47, 0x2e, 0x23, 0x56, 0x8f, 0x98, 0x57, 0x06, 0xfd, 0x3a, 0xa6, 0x01, 0xc7, 0x36, 0x80, + 0x4f, 0x47, 0x2c, 0x70, 0x38, 0xf3, 0x6f, 0x54, 0xa5, 0xa9, 0xb4, 0xaa, 0x6d, 0xdc, 0x8f, 0x58, + 0x8d, 0x5b, 0xc4, 0x48, 0x69, 0xe9, 0x3d, 0xd0, 0x62, 0x42, 0x83, 0x9a, 0xd4, 0xb9, 0xa6, 0xcb, + 0x32, 0x1e, 0x80, 0x7a, 0xcc, 0x86, 0x43, 0x87, 0x77, 0x83, 0x23, 0xcf, 0xa4, 0x01, 0x67, 0xbe, + 0x41, 0x83, 0x11, 0xf3, 0x02, 0x8a, 0x0f, 0xa1, 0x70, 0x4d, 0xdc, 0x31, 0x15, 0x54, 0x65, 0x43, + 0x1e, 0xf4, 0x83, 0x24, 0x86, 0xf4, 0xa5, 0x22, 0x1b, 0x84, 0xbc, 0x45, 0x38, 0x11, 0x26, 0x35, + 0x43, 0x7c, 0xeb, 0xaf, 0xa0, 0x31, 0x33, 0xea, 0x05, 0x26, 0x1d, 0xc0, 0x1e, 0x0b, 0x78, 0xa4, + 0xbe, 0xcc, 0x05, 0x37, 0xa0, 0x7e, 0x87, 0x49, 0x3a, 0xd5, 0xbf, 0x03, 0xbe, 0x71, 0x3c, 0xcb, + 0xa0, 0xf6, 0x29, 0x19, 0x2e, 0xe3, 0x00, 0x1b, 0x50, 0x31, 0x45, 0x06, 0xfb, 0x8e, 0xa5, 0xae, + 0x36, 0x95, 0x56, 0xc5, 0x28, 0x4b, 0x41, 0xd7, 0xc2, 0x4d, 0x28, 0x8e, 0x7c, 0x6a, 0x3b, 0xdf, + 0xd4, 0x9c, 0xb8, 0x5d, 0x74, 0xd2, 0x5f, 0x40, 0xfd, 0x8e, 0xfb, 0x24, 0x15, 0x1e, 0x19, 0xd2, + 0x38, 0x15, 0xe1, 0xb7, 0xfe, 0x43, 0x81, 0xad, 0xec, 0x13, 0xfd, 0x7f, 0xbc, 0xbb, 0x50, 0x25, + 0x11, 0x4d, 0x12, 0x31, 0xc4, 0xa2, 0xae, 0x85, 0xdb, 0x50, 0x36, 0x07, 0x8e, 0x6b, 0x85, 0x68, + 0x4e, 0xa0, 0x25, 0x71, 0xee, 0x5a, 0xba, 0x01, 0x8f, 0xc2, 0xb0, 0x4f, 0xa8, 0x4d, 0xc6, 0x2e, + 0x7f, 0xed, 0x13, 0xcf, 0x1c, 0x2c, 0x99, 0xbf, 0xb0, 0x49, 0x42, 0xce, 0x23, 0xd7, 0x4d, 0xf8, + 0x82, 0x65, 0x08, 0xdf, 0xc1, 0x66, 0x44, 0x78, 0x4e, 0x2e, 0x97, 0x66, 0x3b, 0x84, 0x9d, 0x39, + 0x57, 0x5e, 0xf0, 0x66, 0x6d, 0xd0, 0x66, 0xdd, 0x29, 0xe9, 0xab, 0x50, 0x2b, 0x50, 0x95, 0x66, + 0xae, 0x55, 0x33, 0xe4, 0x41, 0x7f, 0x09, 0x5b, 0x99, 0xb0, 0x17, 0x1a, 0xfc, 0x54, 0xe0, 0x81, + 0x2c, 0x8c, 0x13, 0xc7, 0xb6, 0x97, 0x29, 0x89, 0x3d, 0xb8, 0xe7, 0x52, 0x9b, 0xf7, 0xa7, 0xeb, + 0xb8, 0x16, 0x4a, 0x8f, 0xe3, 0x5a, 0x7e, 0x0e, 0xeb, 0xbe, 0x73, 0x39, 0x48, 0xab, 0xc9, 0xf2, + 0x58, 0x13, 0xe2, 0x58, 0x4f, 0xff, 0xad, 0x00, 0xa6, 0xe3, 0x8a, 0x2e, 0xd1, 0x80, 0x8a, 0xed, + 0xb3, 0x61, 0x7f, 0x44, 0xf8, 0x20, 0x4a, 0x56, 0x39, 0x14, 0xf4, 0x08, 0x1f, 0xe0, 0x16, 0x94, + 0x38, 0x93, 0xd0, 0xaa, 0x6c, 0x14, 0xce, 0x62, 0x40, 0x58, 0xdd, 0x3a, 0x2b, 0x86, 0xc7, 0xae, + 0x85, 0x75, 0x28, 0x70, 0x16, 0x8a, 0xf3, 0x42, 0x9c, 0xe7, 0x4c, 0x96, 0x2e, 0x73, 0xad, 0xfe, + 0x90, 0x59, 0x54, 0x2d, 0x34, 0x95, 0x56, 0xc1, 0x28, 0x31, 0xd7, 0x7a, 0xcf, 0x2c, 0x1a, 0x42, + 0x1e, 0x9d, 0x48, 0xa8, 0x28, 0x21, 0x8f, 0x4e, 0x04, 0xb4, 0x09, 0xc5, 0x0b, 0xc7, 0x23, 0xfe, + 0x8d, 0x5a, 0x12, 0x83, 0x2e, 0x3a, 0xe1, 0x0e, 0x80, 0x4f, 0x26, 0x7d, 0x73, 0x30, 0xf6, 0xae, + 0x02, 0xb5, 0x2c, 0x72, 0x5f, 0xf1, 0xc9, 0xe4, 0x58, 0x08, 0xda, 0xbf, 0x14, 0xa8, 0x7c, 0x18, + 0x12, 0x9f, 0x77, 0xce, 0xcf, 0x7b, 0xd8, 0x07, 0xcc, 0x8e, 0x45, 0x7c, 0x12, 0x67, 0x7e, 0xee, + 0x1e, 0xd0, 0xf4, 0x45, 0x2a, 0xd1, 0xb4, 0x5a, 0x39, 0x50, 0xf0, 0x02, 0xea, 0x33, 0xa6, 0x28, + 0x66, 0xcc, 0xb3, 0x8b, 0x41, 0x7b, 0xba, 0x50, 0x27, 0xf1, 0xd1, 0xfe, 0x02, 0x6b, 0xa7, 0x8c, + 0x3b, 0xb6, 0x63, 0x12, 0xee, 0x30, 0x2f, 0xc0, 0x0e, 0x54, 0x53, 0xd3, 0x13, 0xb5, 0x98, 0x28, + 0x3b, 0x9c, 0xb5, 0xc6, 0x4c, 0x2c, 0x26, 0x6f, 0xff, 0x59, 0x85, 0x9c, 0x41, 0x6d, 0xb4, 0x61, + 0x63, 0x66, 0x3f, 0xe1, 0x5e, 0x6c, 0xbf, 0x68, 0xc2, 0x68, 0xcf, 0xfe, 0xa1, 0x15, 0xfb, 0x0b, + 0xdf, 0x23, 0xdb, 0x82, 0xc9, 0x7b, 0xcc, 0x1d, 0x39, 0xc9, 0x7b, 0xcc, 0xef, 0x60, 0xf1, 0x1e, + 0x9f, 0x60, 0x7d, 0xaa, 0x5f, 0xf1, 0xf1, 0x94, 0xe9, 0xd4, 0xfc, 0xd1, 0x76, 0xe7, 0xe2, 0x29, + 0xde, 0x0e, 0x54, 0x53, 0xab, 0x21, 0x49, 0x79, 0x76, 0x5d, 0x25, 0x29, 0x9f, 0xb1, 0x4b, 0xf4, + 0x95, 0xf6, 0x19, 0xe4, 0xc3, 0x0e, 0xc4, 0xb7, 0x00, 0x49, 0x3f, 0xe2, 0x76, 0x6c, 0x94, 0x99, + 0x1d, 0x9a, 0x36, 0x0b, 0x4a, 0x95, 0x07, 0x81, 0xa2, 0x44, 0xf0, 0x33, 0xdc, 0x9f, 0xde, 0x49, + 0xb8, 0x7b, 0xd7, 0x3a, 0xb3, 0xad, 0xb4, 0xe6, 0x7c, 0x85, 0xd8, 0xc9, 0x45, 0x51, 0xfc, 0x39, + 0x1d, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xe0, 0x10, 0x05, 0xc3, 0x5f, 0x09, 0x00, 0x00, } diff --git a/ruby/lib/gitaly/gitaly_pb.rb b/ruby/lib/gitaly/gitaly_pb.rb index 1f2c23a2..c9c09818 100644 --- a/ruby/lib/gitaly/gitaly_pb.rb +++ b/ruby/lib/gitaly/gitaly_pb.rb @@ -14,9 +14,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "gitaly.CommitIsAncestorResponse" do optional :value, :bool, 1 end - add_message "gitaly.InfoRefsRequest" do - optional :repository, :message, 1, "gitaly.Repository" - end add_message "gitaly.InfoRefsUploadPackResponse" do optional :data, :bytes, 1 end @@ -80,7 +77,6 @@ module Gitaly InfoRefsUploadPackRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.InfoRefsUploadPackRequest").msgclass InfoRefsReceivePackRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.InfoRefsReceivePackRequest").msgclass CommitIsAncestorResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CommitIsAncestorResponse").msgclass - InfoRefsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.InfoRefsRequest").msgclass InfoRefsUploadPackResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.InfoRefsUploadPackResponse").msgclass InfoRefsReceivePackResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.InfoRefsReceivePackResponse").msgclass PostReceiveRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.PostReceiveRequest").msgclass -- GitLab