diff --git a/go/gitalypb/blob.pb.go b/go/gitalypb/blob.pb.go index 20085a3f86b727b80469bf803fda93e068c3a9f9..c086379fbf19451fe62f23e3faf52784bbb7d9a8 100644 --- a/go/gitalypb/blob.pb.go +++ b/go/gitalypb/blob.pb.go @@ -136,6 +136,8 @@ It has these top-level messages: UserCreateTagResponse UserMergeBranchRequest UserMergeBranchResponse + UserMergeToRefRequest + UserMergeToRefResponse OperationBranchUpdate UserFFBranchRequest UserFFBranchResponse diff --git a/go/gitalypb/operations.pb.go b/go/gitalypb/operations.pb.go index cdfbba8974ab154f7f940a206187fe7450e02d22..45f93c3ba8c4981d5da46fac01a524dcf74f2d6a 100644 --- a/go/gitalypb/operations.pb.go +++ b/go/gitalypb/operations.pb.go @@ -49,7 +49,7 @@ func (x UserCommitFilesActionHeader_ActionType) String() string { return proto.EnumName(UserCommitFilesActionHeader_ActionType_name, int32(x)) } func (UserCommitFilesActionHeader_ActionType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor8, []int{19, 0} + return fileDescriptor8, []int{21, 0} } type UserCreateBranchRequest struct { @@ -453,6 +453,92 @@ func (m *UserMergeBranchResponse) GetPreReceiveError() string { return "" } +type UserMergeToRefRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + User *User `protobuf:"bytes,2,opt,name=user" json:"user,omitempty"` + SourceSha string `protobuf:"bytes,3,opt,name=source_sha,json=sourceSha" json:"source_sha,omitempty"` + Branch []byte `protobuf:"bytes,4,opt,name=branch,proto3" json:"branch,omitempty"` + // The merge of source_sha and branch has target_ref as target. + // + // The target_ref is _always_ overwritten when merging source_sha + // and branch. That is, if a second request comes in, target_ref + // will lose its previous state and be updated to the latest merge + // between source_sha and branch. + TargetRef []byte `protobuf:"bytes,5,opt,name=target_ref,json=targetRef,proto3" json:"target_ref,omitempty"` + Message []byte `protobuf:"bytes,6,opt,name=message,proto3" json:"message,omitempty"` +} + +func (m *UserMergeToRefRequest) Reset() { *m = UserMergeToRefRequest{} } +func (m *UserMergeToRefRequest) String() string { return proto.CompactTextString(m) } +func (*UserMergeToRefRequest) ProtoMessage() {} +func (*UserMergeToRefRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{12} } + +func (m *UserMergeToRefRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *UserMergeToRefRequest) GetUser() *User { + if m != nil { + return m.User + } + return nil +} + +func (m *UserMergeToRefRequest) GetSourceSha() string { + if m != nil { + return m.SourceSha + } + return "" +} + +func (m *UserMergeToRefRequest) GetBranch() []byte { + if m != nil { + return m.Branch + } + return nil +} + +func (m *UserMergeToRefRequest) GetTargetRef() []byte { + if m != nil { + return m.TargetRef + } + return nil +} + +func (m *UserMergeToRefRequest) GetMessage() []byte { + if m != nil { + return m.Message + } + return nil +} + +type UserMergeToRefResponse struct { + CommitId string `protobuf:"bytes,1,opt,name=commit_id,json=commitId" json:"commit_id,omitempty"` + PreReceiveError string `protobuf:"bytes,2,opt,name=pre_receive_error,json=preReceiveError" json:"pre_receive_error,omitempty"` +} + +func (m *UserMergeToRefResponse) Reset() { *m = UserMergeToRefResponse{} } +func (m *UserMergeToRefResponse) String() string { return proto.CompactTextString(m) } +func (*UserMergeToRefResponse) ProtoMessage() {} +func (*UserMergeToRefResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{13} } + +func (m *UserMergeToRefResponse) GetCommitId() string { + if m != nil { + return m.CommitId + } + return "" +} + +func (m *UserMergeToRefResponse) GetPreReceiveError() string { + if m != nil { + return m.PreReceiveError + } + return "" +} + type OperationBranchUpdate struct { // If this string is non-empty the branch has been updated. CommitId string `protobuf:"bytes,1,opt,name=commit_id,json=commitId" json:"commit_id,omitempty"` @@ -465,7 +551,7 @@ type OperationBranchUpdate struct { func (m *OperationBranchUpdate) Reset() { *m = OperationBranchUpdate{} } func (m *OperationBranchUpdate) String() string { return proto.CompactTextString(m) } func (*OperationBranchUpdate) ProtoMessage() {} -func (*OperationBranchUpdate) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{12} } +func (*OperationBranchUpdate) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{14} } func (m *OperationBranchUpdate) GetCommitId() string { if m != nil { @@ -498,7 +584,7 @@ type UserFFBranchRequest struct { func (m *UserFFBranchRequest) Reset() { *m = UserFFBranchRequest{} } func (m *UserFFBranchRequest) String() string { return proto.CompactTextString(m) } func (*UserFFBranchRequest) ProtoMessage() {} -func (*UserFFBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{13} } +func (*UserFFBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{15} } func (m *UserFFBranchRequest) GetRepository() *Repository { if m != nil { @@ -536,7 +622,7 @@ type UserFFBranchResponse struct { func (m *UserFFBranchResponse) Reset() { *m = UserFFBranchResponse{} } func (m *UserFFBranchResponse) String() string { return proto.CompactTextString(m) } func (*UserFFBranchResponse) ProtoMessage() {} -func (*UserFFBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{14} } +func (*UserFFBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{16} } func (m *UserFFBranchResponse) GetBranchUpdate() *OperationBranchUpdate { if m != nil { @@ -565,7 +651,7 @@ type UserCherryPickRequest struct { func (m *UserCherryPickRequest) Reset() { *m = UserCherryPickRequest{} } func (m *UserCherryPickRequest) String() string { return proto.CompactTextString(m) } func (*UserCherryPickRequest) ProtoMessage() {} -func (*UserCherryPickRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{15} } +func (*UserCherryPickRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{17} } func (m *UserCherryPickRequest) GetRepository() *Repository { if m != nil { @@ -626,7 +712,7 @@ type UserCherryPickResponse struct { func (m *UserCherryPickResponse) Reset() { *m = UserCherryPickResponse{} } func (m *UserCherryPickResponse) String() string { return proto.CompactTextString(m) } func (*UserCherryPickResponse) ProtoMessage() {} -func (*UserCherryPickResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{16} } +func (*UserCherryPickResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{18} } func (m *UserCherryPickResponse) GetBranchUpdate() *OperationBranchUpdate { if m != nil { @@ -669,7 +755,7 @@ type UserRevertRequest struct { func (m *UserRevertRequest) Reset() { *m = UserRevertRequest{} } func (m *UserRevertRequest) String() string { return proto.CompactTextString(m) } func (*UserRevertRequest) ProtoMessage() {} -func (*UserRevertRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{17} } +func (*UserRevertRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{19} } func (m *UserRevertRequest) GetRepository() *Repository { if m != nil { @@ -730,7 +816,7 @@ type UserRevertResponse struct { func (m *UserRevertResponse) Reset() { *m = UserRevertResponse{} } func (m *UserRevertResponse) String() string { return proto.CompactTextString(m) } func (*UserRevertResponse) ProtoMessage() {} -func (*UserRevertResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{18} } +func (*UserRevertResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{20} } func (m *UserRevertResponse) GetBranchUpdate() *OperationBranchUpdate { if m != nil { @@ -775,7 +861,7 @@ type UserCommitFilesActionHeader struct { func (m *UserCommitFilesActionHeader) Reset() { *m = UserCommitFilesActionHeader{} } func (m *UserCommitFilesActionHeader) String() string { return proto.CompactTextString(m) } func (*UserCommitFilesActionHeader) ProtoMessage() {} -func (*UserCommitFilesActionHeader) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{19} } +func (*UserCommitFilesActionHeader) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{21} } func (m *UserCommitFilesActionHeader) GetAction() UserCommitFilesActionHeader_ActionType { if m != nil { @@ -829,7 +915,7 @@ type UserCommitFilesAction struct { func (m *UserCommitFilesAction) Reset() { *m = UserCommitFilesAction{} } func (m *UserCommitFilesAction) String() string { return proto.CompactTextString(m) } func (*UserCommitFilesAction) ProtoMessage() {} -func (*UserCommitFilesAction) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{20} } +func (*UserCommitFilesAction) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{22} } type isUserCommitFilesAction_UserCommitFilesActionPayload interface{ isUserCommitFilesAction_UserCommitFilesActionPayload() } @@ -948,7 +1034,7 @@ type UserCommitFilesRequestHeader struct { func (m *UserCommitFilesRequestHeader) Reset() { *m = UserCommitFilesRequestHeader{} } func (m *UserCommitFilesRequestHeader) String() string { return proto.CompactTextString(m) } func (*UserCommitFilesRequestHeader) ProtoMessage() {} -func (*UserCommitFilesRequestHeader) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{21} } +func (*UserCommitFilesRequestHeader) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{23} } func (m *UserCommitFilesRequestHeader) GetRepository() *Repository { if m != nil { @@ -1016,7 +1102,7 @@ type UserCommitFilesRequest struct { func (m *UserCommitFilesRequest) Reset() { *m = UserCommitFilesRequest{} } func (m *UserCommitFilesRequest) String() string { return proto.CompactTextString(m) } func (*UserCommitFilesRequest) ProtoMessage() {} -func (*UserCommitFilesRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{22} } +func (*UserCommitFilesRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{24} } type isUserCommitFilesRequest_UserCommitFilesRequestPayload interface{ isUserCommitFilesRequest_UserCommitFilesRequestPayload() } @@ -1134,7 +1220,7 @@ type UserCommitFilesResponse struct { func (m *UserCommitFilesResponse) Reset() { *m = UserCommitFilesResponse{} } func (m *UserCommitFilesResponse) String() string { return proto.CompactTextString(m) } func (*UserCommitFilesResponse) ProtoMessage() {} -func (*UserCommitFilesResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{23} } +func (*UserCommitFilesResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{25} } func (m *UserCommitFilesResponse) GetBranchUpdate() *OperationBranchUpdate { if m != nil { @@ -1170,7 +1256,7 @@ type UserRebaseRequest struct { func (m *UserRebaseRequest) Reset() { *m = UserRebaseRequest{} } func (m *UserRebaseRequest) String() string { return proto.CompactTextString(m) } func (*UserRebaseRequest) ProtoMessage() {} -func (*UserRebaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{24} } +func (*UserRebaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{26} } func (m *UserRebaseRequest) GetRepository() *Repository { if m != nil { @@ -1230,7 +1316,7 @@ type UserRebaseResponse struct { func (m *UserRebaseResponse) Reset() { *m = UserRebaseResponse{} } func (m *UserRebaseResponse) String() string { return proto.CompactTextString(m) } func (*UserRebaseResponse) ProtoMessage() {} -func (*UserRebaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{25} } +func (*UserRebaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{27} } func (m *UserRebaseResponse) GetRebaseSha() string { if m != nil { @@ -1267,7 +1353,7 @@ type UserSquashRequest struct { func (m *UserSquashRequest) Reset() { *m = UserSquashRequest{} } func (m *UserSquashRequest) String() string { return proto.CompactTextString(m) } func (*UserSquashRequest) ProtoMessage() {} -func (*UserSquashRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{26} } +func (*UserSquashRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{28} } func (m *UserSquashRequest) GetRepository() *Repository { if m != nil { @@ -1333,7 +1419,7 @@ type UserSquashResponse struct { func (m *UserSquashResponse) Reset() { *m = UserSquashResponse{} } func (m *UserSquashResponse) String() string { return proto.CompactTextString(m) } func (*UserSquashResponse) ProtoMessage() {} -func (*UserSquashResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{27} } +func (*UserSquashResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{29} } func (m *UserSquashResponse) GetSquashSha() string { if m != nil { @@ -1359,7 +1445,7 @@ type UserApplyPatchRequest struct { func (m *UserApplyPatchRequest) Reset() { *m = UserApplyPatchRequest{} } func (m *UserApplyPatchRequest) String() string { return proto.CompactTextString(m) } func (*UserApplyPatchRequest) ProtoMessage() {} -func (*UserApplyPatchRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{28} } +func (*UserApplyPatchRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{30} } type isUserApplyPatchRequest_UserApplyPatchRequestPayload interface{ isUserApplyPatchRequest_UserApplyPatchRequestPayload() } @@ -1474,7 +1560,7 @@ func (m *UserApplyPatchRequest_Header) Reset() { *m = UserApplyPatchRequ func (m *UserApplyPatchRequest_Header) String() string { return proto.CompactTextString(m) } func (*UserApplyPatchRequest_Header) ProtoMessage() {} func (*UserApplyPatchRequest_Header) Descriptor() ([]byte, []int) { - return fileDescriptor8, []int{28, 0} + return fileDescriptor8, []int{30, 0} } func (m *UserApplyPatchRequest_Header) GetRepository() *Repository { @@ -1505,7 +1591,7 @@ type UserApplyPatchResponse struct { func (m *UserApplyPatchResponse) Reset() { *m = UserApplyPatchResponse{} } func (m *UserApplyPatchResponse) String() string { return proto.CompactTextString(m) } func (*UserApplyPatchResponse) ProtoMessage() {} -func (*UserApplyPatchResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{29} } +func (*UserApplyPatchResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{31} } func (m *UserApplyPatchResponse) GetBranchUpdate() *OperationBranchUpdate { if m != nil { @@ -1526,7 +1612,7 @@ type UserUpdateSubmoduleRequest struct { func (m *UserUpdateSubmoduleRequest) Reset() { *m = UserUpdateSubmoduleRequest{} } func (m *UserUpdateSubmoduleRequest) String() string { return proto.CompactTextString(m) } func (*UserUpdateSubmoduleRequest) ProtoMessage() {} -func (*UserUpdateSubmoduleRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{30} } +func (*UserUpdateSubmoduleRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{32} } func (m *UserUpdateSubmoduleRequest) GetRepository() *Repository { if m != nil { @@ -1579,7 +1665,7 @@ type UserUpdateSubmoduleResponse struct { func (m *UserUpdateSubmoduleResponse) Reset() { *m = UserUpdateSubmoduleResponse{} } func (m *UserUpdateSubmoduleResponse) String() string { return proto.CompactTextString(m) } func (*UserUpdateSubmoduleResponse) ProtoMessage() {} -func (*UserUpdateSubmoduleResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{31} } +func (*UserUpdateSubmoduleResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{33} } func (m *UserUpdateSubmoduleResponse) GetBranchUpdate() *OperationBranchUpdate { if m != nil { @@ -1615,6 +1701,8 @@ func init() { proto.RegisterType((*UserCreateTagResponse)(nil), "gitaly.UserCreateTagResponse") proto.RegisterType((*UserMergeBranchRequest)(nil), "gitaly.UserMergeBranchRequest") proto.RegisterType((*UserMergeBranchResponse)(nil), "gitaly.UserMergeBranchResponse") + proto.RegisterType((*UserMergeToRefRequest)(nil), "gitaly.UserMergeToRefRequest") + proto.RegisterType((*UserMergeToRefResponse)(nil), "gitaly.UserMergeToRefResponse") proto.RegisterType((*OperationBranchUpdate)(nil), "gitaly.OperationBranchUpdate") proto.RegisterType((*UserFFBranchRequest)(nil), "gitaly.UserFFBranchRequest") proto.RegisterType((*UserFFBranchResponse)(nil), "gitaly.UserFFBranchResponse") @@ -1655,6 +1743,7 @@ type OperationServiceClient interface { UserDeleteBranch(ctx context.Context, in *UserDeleteBranchRequest, opts ...grpc.CallOption) (*UserDeleteBranchResponse, error) UserCreateTag(ctx context.Context, in *UserCreateTagRequest, opts ...grpc.CallOption) (*UserCreateTagResponse, error) UserDeleteTag(ctx context.Context, in *UserDeleteTagRequest, opts ...grpc.CallOption) (*UserDeleteTagResponse, error) + UserMergeToRef(ctx context.Context, in *UserMergeToRefRequest, opts ...grpc.CallOption) (*UserMergeToRefResponse, error) UserMergeBranch(ctx context.Context, opts ...grpc.CallOption) (OperationService_UserMergeBranchClient, error) UserFFBranch(ctx context.Context, in *UserFFBranchRequest, opts ...grpc.CallOption) (*UserFFBranchResponse, error) UserCherryPick(ctx context.Context, in *UserCherryPickRequest, opts ...grpc.CallOption) (*UserCherryPickResponse, error) @@ -1719,6 +1808,15 @@ func (c *operationServiceClient) UserDeleteTag(ctx context.Context, in *UserDele return out, nil } +func (c *operationServiceClient) UserMergeToRef(ctx context.Context, in *UserMergeToRefRequest, opts ...grpc.CallOption) (*UserMergeToRefResponse, error) { + out := new(UserMergeToRefResponse) + err := grpc.Invoke(ctx, "/gitaly.OperationService/UserMergeToRef", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *operationServiceClient) UserMergeBranch(ctx context.Context, opts ...grpc.CallOption) (OperationService_UserMergeBranchClient, error) { stream, err := grpc.NewClientStream(ctx, &_OperationService_serviceDesc.Streams[0], c.cc, "/gitaly.OperationService/UserMergeBranch", opts...) if err != nil { @@ -1880,6 +1978,7 @@ type OperationServiceServer interface { UserDeleteBranch(context.Context, *UserDeleteBranchRequest) (*UserDeleteBranchResponse, error) UserCreateTag(context.Context, *UserCreateTagRequest) (*UserCreateTagResponse, error) UserDeleteTag(context.Context, *UserDeleteTagRequest) (*UserDeleteTagResponse, error) + UserMergeToRef(context.Context, *UserMergeToRefRequest) (*UserMergeToRefResponse, error) UserMergeBranch(OperationService_UserMergeBranchServer) error UserFFBranch(context.Context, *UserFFBranchRequest) (*UserFFBranchResponse, error) UserCherryPick(context.Context, *UserCherryPickRequest) (*UserCherryPickResponse, error) @@ -1985,6 +2084,24 @@ func _OperationService_UserDeleteTag_Handler(srv interface{}, ctx context.Contex return interceptor(ctx, in, info, handler) } +func _OperationService_UserMergeToRef_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UserMergeToRefRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OperationServiceServer).UserMergeToRef(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.OperationService/UserMergeToRef", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OperationServiceServer).UserMergeToRef(ctx, req.(*UserMergeToRefRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _OperationService_UserMergeBranch_Handler(srv interface{}, stream grpc.ServerStream) error { return srv.(OperationServiceServer).UserMergeBranch(&operationServiceUserMergeBranchServer{stream}) } @@ -2195,6 +2312,10 @@ var _OperationService_serviceDesc = grpc.ServiceDesc{ MethodName: "UserDeleteTag", Handler: _OperationService_UserDeleteTag_Handler, }, + { + MethodName: "UserMergeToRef", + Handler: _OperationService_UserMergeToRef_Handler, + }, { MethodName: "UserFFBranch", Handler: _OperationService_UserFFBranch_Handler, @@ -2244,114 +2365,119 @@ var _OperationService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("operations.proto", fileDescriptor8) } var fileDescriptor8 = []byte{ - // 1740 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcf, 0x6f, 0x1b, 0xd5, - 0x13, 0xf7, 0xda, 0xce, 0xc6, 0x99, 0x38, 0x89, 0xf3, 0xfa, 0x2b, 0x75, 0x93, 0x26, 0xdd, 0xb4, - 0xdf, 0x6f, 0x5b, 0x7d, 0x15, 0x7d, 0x15, 0x10, 0x9c, 0x0a, 0xca, 0x0f, 0x87, 0xb4, 0x90, 0x36, - 0x6c, 0x92, 0xc2, 0x01, 0x69, 0xd9, 0xd8, 0xaf, 0xf6, 0x0a, 0xdb, 0xeb, 0xbe, 0x5d, 0x87, 0x06, - 0x21, 0x2e, 0x08, 0xb8, 0x72, 0xe2, 0x82, 0x90, 0x40, 0xdc, 0x10, 0x17, 0x2e, 0x1c, 0x38, 0x20, - 0xae, 0x70, 0xed, 0x81, 0xff, 0x82, 0x1b, 0x77, 0xf4, 0xde, 0xcc, 0x7a, 0x7f, 0x3a, 0x4a, 0x4b, - 0xa2, 0x56, 0x88, 0x5b, 0x3c, 0x33, 0x3b, 0x6f, 0xe6, 0x33, 0xf3, 0x66, 0xe6, 0x4d, 0xa0, 0xe2, - 0xf6, 0xb8, 0xb0, 0x7d, 0xc7, 0xed, 0x7a, 0x4b, 0x3d, 0xe1, 0xfa, 0x2e, 0xd3, 0x9b, 0x8e, 0x6f, - 0xb7, 0x0f, 0xab, 0x65, 0xaf, 0x65, 0x0b, 0xde, 0x40, 0xaa, 0xf1, 0x83, 0x06, 0x17, 0xf6, 0x3c, - 0x2e, 0xd6, 0x04, 0xb7, 0x7d, 0xbe, 0x2a, 0xec, 0x6e, 0xbd, 0x65, 0xf2, 0x87, 0x7d, 0xee, 0xf9, - 0x6c, 0x19, 0x40, 0xf0, 0x9e, 0xeb, 0x39, 0xbe, 0x2b, 0x0e, 0x67, 0xb4, 0x05, 0xed, 0xfa, 0xf8, - 0x32, 0x5b, 0x42, 0x35, 0x4b, 0xe6, 0x80, 0x63, 0x46, 0xa4, 0xd8, 0x3c, 0x8c, 0xef, 0x2b, 0x25, - 0x56, 0xd7, 0xee, 0xf0, 0x99, 0xfc, 0x82, 0x76, 0xbd, 0x6c, 0x02, 0x92, 0xee, 0xda, 0x1d, 0xce, - 0x16, 0xa0, 0xd8, 0xf7, 0xb8, 0x98, 0x29, 0x28, 0x75, 0xe5, 0x40, 0x9d, 0xb4, 0xc1, 0x54, 0x1c, - 0xa9, 0xc2, 0xf3, 0x6d, 0xe1, 0x5b, 0x3d, 0xd7, 0xe9, 0xfa, 0x33, 0x45, 0x54, 0xa1, 0x48, 0xdb, - 0x92, 0x62, 0x74, 0x61, 0x26, 0x6d, 0xb2, 0xd7, 0x73, 0xbb, 0x1e, 0x67, 0xff, 0x01, 0x1d, 0x0f, - 0x23, 0x7b, 0x27, 0x83, 0x03, 0x48, 0x8e, 0xb8, 0xec, 0x26, 0x4c, 0xf7, 0x04, 0xb7, 0x04, 0xaf, - 0x73, 0xe7, 0x80, 0x5b, 0x5c, 0x08, 0x57, 0x28, 0x6b, 0xc7, 0xcc, 0xa9, 0x9e, 0xe0, 0x26, 0xd2, - 0x6b, 0x92, 0x6c, 0xfc, 0x42, 0x18, 0xed, 0xf5, 0x1a, 0xcf, 0x0b, 0x46, 0xe7, 0x41, 0xef, 0xf2, - 0xf7, 0x05, 0x3f, 0x20, 0x78, 0xe8, 0x97, 0xa4, 0xbb, 0xed, 0x86, 0xa4, 0x8f, 0x20, 0x1d, 0x7f, - 0x19, 0x1b, 0x08, 0x59, 0xdc, 0x03, 0x82, 0x2c, 0x13, 0x0a, 0x2d, 0x1b, 0x8a, 0xcf, 0x09, 0x8a, - 0x75, 0xde, 0xe6, 0xcf, 0x07, 0x14, 0x81, 0x6b, 0x71, 0x8b, 0x9e, 0xc2, 0xb5, 0xcf, 0x34, 0x38, - 0x1b, 0x2a, 0xda, 0xb5, 0x9b, 0x7f, 0xc7, 0xaf, 0x8b, 0x50, 0xf2, 0xed, 0x66, 0xd4, 0xa9, 0x51, - 0xdf, 0x6e, 0x1e, 0xd3, 0xa3, 0x35, 0x38, 0x97, 0x30, 0xe4, 0x29, 0xdc, 0xf9, 0x8d, 0xdc, 0xc1, - 0x5b, 0xf2, 0x0c, 0xdd, 0x61, 0xff, 0x85, 0x29, 0xdf, 0x16, 0x4d, 0xee, 0x5b, 0x82, 0x1f, 0x38, - 0x9e, 0xe3, 0x76, 0x29, 0x69, 0x27, 0x91, 0x6c, 0x12, 0x95, 0xcd, 0xc0, 0x68, 0x87, 0x7b, 0x9e, - 0xdd, 0xe4, 0x94, 0xbd, 0xc1, 0x4f, 0xe3, 0x03, 0x44, 0x24, 0xe2, 0x0b, 0x21, 0x32, 0x07, 0x05, - 0xdf, 0x6e, 0x92, 0x17, 0xe3, 0xc1, 0xe1, 0x52, 0x42, 0xd2, 0xe5, 0x75, 0xe0, 0x8f, 0x1c, 0xcf, - 0xf7, 0x94, 0xd5, 0x25, 0x93, 0x7e, 0x65, 0x03, 0x59, 0xc8, 0x06, 0xf2, 0xb1, 0x06, 0xe7, 0xe5, - 0xe1, 0x5b, 0x5c, 0x34, 0x4f, 0x20, 0xe3, 0x03, 0xbc, 0xf2, 0x43, 0xf1, 0xba, 0x04, 0x63, 0x75, - 0xb7, 0xd3, 0x71, 0x7c, 0xcb, 0x69, 0x90, 0x51, 0x25, 0x24, 0xdc, 0x6e, 0x48, 0x8f, 0xa8, 0xbe, - 0xd1, 0xc5, 0xa7, 0x7a, 0x36, 0x14, 0x3b, 0x76, 0x16, 0x46, 0xec, 0x5e, 0xaf, 0x7d, 0x38, 0xa3, - 0x2b, 0x08, 0xf0, 0x87, 0xf1, 0x3d, 0x5d, 0xe4, 0x98, 0x57, 0x04, 0x6a, 0xcc, 0x00, 0x2d, 0x61, - 0xc0, 0x2a, 0x4c, 0xd0, 0x8d, 0xed, 0xab, 0x62, 0x42, 0x81, 0x9f, 0x0b, 0x1c, 0xb9, 0x17, 0xf4, - 0x1d, 0x54, 0x8a, 0x15, 0xc7, 0x2c, 0xef, 0x47, 0x7e, 0x65, 0xc3, 0x5f, 0xcc, 0x84, 0xff, 0x4e, - 0xb1, 0x94, 0xaf, 0x14, 0x8c, 0x8f, 0xe0, 0x5c, 0xa6, 0xe2, 0xa3, 0x6d, 0xbd, 0x02, 0x65, 0x89, - 0xbc, 0x55, 0x57, 0x79, 0xd3, 0xa0, 0x24, 0x18, 0x97, 0x34, 0x4c, 0xa5, 0x06, 0xbb, 0x06, 0x93, - 0xe4, 0x4e, 0x20, 0x54, 0x50, 0x42, 0xe4, 0x24, 0x89, 0x19, 0x5f, 0x6b, 0x70, 0x46, 0xc2, 0xb5, - 0xb1, 0xf1, 0xbc, 0x66, 0x80, 0xf1, 0x29, 0x5d, 0xf8, 0xd0, 0x44, 0x0a, 0x67, 0x2a, 0x62, 0xda, - 0x09, 0x45, 0x6c, 0x48, 0xbb, 0xfc, 0x39, 0x4f, 0xb7, 0xb5, 0xc5, 0x85, 0x38, 0xdc, 0x76, 0xea, - 0xef, 0x9d, 0x2e, 0x5a, 0x37, 0x40, 0x47, 0x70, 0x28, 0x15, 0xa7, 0x03, 0x99, 0xd7, 0x1c, 0x7f, - 0x4d, 0x31, 0x4c, 0x12, 0x48, 0xb6, 0x9b, 0x62, 0xaa, 0xdd, 0x0c, 0xbf, 0x46, 0x37, 0x61, 0x1a, - 0xa7, 0x92, 0xa8, 0x02, 0x5d, 0xc9, 0x4c, 0x29, 0xc6, 0x6a, 0xa8, 0xe5, 0x16, 0x54, 0x50, 0x36, - 0xe2, 0xed, 0xe8, 0x50, 0x6f, 0xf1, 0xf3, 0x90, 0x60, 0xfc, 0x4e, 0x15, 0x27, 0x0a, 0xe0, 0xc9, - 0xc6, 0x12, 0x73, 0xdd, 0xf2, 0x05, 0x4f, 0xc4, 0x12, 0x19, 0xbb, 0x82, 0x63, 0x2c, 0xe5, 0x0d, - 0xa2, 0x4c, 0x8c, 0xd6, 0xc8, 0x71, 0xa4, 0xa1, 0xc8, 0x13, 0x5c, 0x66, 0xe3, 0xa7, 0x3c, 0x4c, - 0xab, 0xc8, 0xf1, 0x03, 0x2e, 0x5d, 0xfe, 0x37, 0x2d, 0x9e, 0x20, 0x2d, 0x1e, 0x6b, 0xc0, 0xa2, - 0xe0, 0xfd, 0x33, 0x52, 0xe2, 0xcf, 0x3c, 0x5c, 0x52, 0xc9, 0xae, 0xbe, 0xdf, 0x70, 0xda, 0xdc, - 0x5b, 0xa9, 0x4b, 0x73, 0x37, 0xb9, 0xdd, 0xe0, 0x82, 0x6d, 0x80, 0x6e, 0xab, 0xdf, 0xca, 0xaf, - 0xc9, 0xe5, 0xa5, 0x68, 0xa8, 0x87, 0x7c, 0xb4, 0x84, 0x3f, 0x76, 0x0f, 0x7b, 0xdc, 0xa4, 0xaf, - 0x65, 0x4d, 0x7d, 0xe0, 0xb4, 0xb9, 0xd5, 0xb3, 0xfd, 0x16, 0xcd, 0x30, 0x25, 0x49, 0xd8, 0xb6, - 0xfd, 0x16, 0x5b, 0x84, 0x89, 0x9e, 0x1c, 0x4e, 0xdc, 0xbe, 0x87, 0x02, 0x05, 0x25, 0x50, 0x0e, - 0x88, 0x4a, 0x48, 0xb6, 0x0a, 0xdb, 0xe3, 0x2f, 0xbd, 0x68, 0xd5, 0xdd, 0xae, 0xcf, 0xe9, 0x69, - 0x22, 0x5b, 0x85, 0xa2, 0xae, 0x21, 0x91, 0xdd, 0x80, 0x0a, 0x7f, 0xc4, 0xeb, 0x7d, 0x9f, 0x5b, - 0x52, 0x7f, 0xc7, 0x6d, 0x60, 0xd2, 0x94, 0xcc, 0x29, 0xa2, 0x6f, 0x10, 0x59, 0x1e, 0xeb, 0x74, - 0x1f, 0x70, 0x31, 0x50, 0x88, 0x2d, 0xba, 0xac, 0x88, 0xa4, 0xcf, 0xd8, 0x03, 0x08, 0xdd, 0x61, - 0x00, 0xfa, 0x9a, 0x59, 0x5b, 0xd9, 0xad, 0x55, 0x72, 0x6c, 0x12, 0x00, 0xff, 0xb6, 0xd6, 0x6f, - 0x9b, 0x15, 0x4d, 0xf2, 0xf6, 0xb6, 0xd7, 0x25, 0x2f, 0xcf, 0x4a, 0x50, 0xdc, 0xba, 0x77, 0xbf, - 0x56, 0x29, 0x48, 0xea, 0x7a, 0xed, 0x8d, 0xda, 0x6e, 0xad, 0x52, 0x64, 0x63, 0x30, 0xb2, 0xb6, - 0xb9, 0x75, 0x6f, 0xbd, 0x32, 0x62, 0x7c, 0xa1, 0x51, 0x95, 0x4e, 0x42, 0xc8, 0x6e, 0x81, 0xde, - 0x52, 0x30, 0x52, 0x26, 0x2d, 0x1e, 0x03, 0xf1, 0xcd, 0x9c, 0x49, 0x1f, 0xb1, 0x2a, 0x8c, 0x06, - 0xee, 0x28, 0x98, 0x37, 0x73, 0x66, 0x40, 0x58, 0x35, 0x60, 0x41, 0xde, 0x4d, 0x8b, 0x12, 0x48, - 0xe2, 0xe3, 0x59, 0x18, 0x20, 0xab, 0x67, 0x1f, 0xb6, 0x5d, 0xbb, 0x61, 0x7c, 0x52, 0x80, 0xd9, - 0xc4, 0x49, 0x54, 0x28, 0x28, 0x23, 0x4e, 0xa7, 0x5c, 0x24, 0x6a, 0x40, 0x21, 0x55, 0x03, 0xae, - 0xc1, 0x24, 0x99, 0x1d, 0x94, 0x02, 0xac, 0x13, 0x13, 0x48, 0xdd, 0xa2, 0x82, 0xf0, 0x3f, 0x60, - 0x24, 0x66, 0xf7, 0xfd, 0x96, 0x2b, 0x50, 0x1d, 0x56, 0x8d, 0x0a, 0x72, 0x56, 0x14, 0x43, 0x29, - 0x5d, 0x82, 0x33, 0x71, 0x69, 0xde, 0xb1, 0x9d, 0x36, 0x15, 0x90, 0xe9, 0xa8, 0x78, 0x4d, 0x32, - 0xb2, 0xcb, 0xcd, 0xe8, 0xf1, 0xcb, 0x4d, 0xe9, 0xf8, 0xe5, 0xe6, 0xc7, 0xa0, 0x0b, 0xa5, 0xe2, - 0xc0, 0x5e, 0x49, 0x64, 0xc8, 0xd5, 0x21, 0x19, 0x12, 0x8b, 0x5b, 0x24, 0x45, 0x5e, 0x1e, 0xdc, - 0xe9, 0x7c, 0xbc, 0x56, 0x65, 0x67, 0x58, 0x2e, 0xb8, 0xc4, 0xab, 0x8b, 0x70, 0x25, 0x9d, 0x3f, - 0x02, 0x4f, 0x19, 0x24, 0xd0, 0x77, 0xc1, 0x4a, 0x23, 0x6a, 0xc8, 0x09, 0x16, 0xcb, 0x79, 0x18, - 0x77, 0xba, 0x0d, 0xfe, 0x28, 0x56, 0x26, 0x41, 0x91, 0x8e, 0x28, 0x7f, 0x43, 0x5e, 0x17, 0xdf, - 0x0e, 0x3a, 0xa2, 0xac, 0x22, 0xa7, 0x3e, 0x56, 0x0a, 0x75, 0x4c, 0x64, 0xac, 0x44, 0xc2, 0x11, - 0x0f, 0x8b, 0x39, 0xa0, 0x4b, 0x60, 0x79, 0x2d, 0x5b, 0xe5, 0xf1, 0x98, 0x39, 0x86, 0x94, 0x9d, - 0x96, 0xcd, 0x5e, 0x85, 0x69, 0xc1, 0x3b, 0xae, 0xcf, 0xa3, 0x59, 0xa6, 0x0f, 0x35, 0xb8, 0x82, - 0xc2, 0x21, 0x45, 0xd6, 0x40, 0x52, 0x40, 0xc7, 0x63, 0x36, 0x97, 0x91, 0x88, 0x61, 0x30, 0x3e, - 0x0c, 0x3a, 0x1f, 0x82, 0x34, 0x78, 0xfc, 0x01, 0xf9, 0x23, 0x4d, 0xc3, 0xe1, 0x9f, 0x3c, 0x94, - 0xa6, 0x3d, 0xc1, 0xcc, 0x2a, 0xa1, 0x69, 0x26, 0x3a, 0x5a, 0xa9, 0x49, 0xed, 0xcc, 0xf8, 0x86, - 0x62, 0xb4, 0xf3, 0xb0, 0x6f, 0x7b, 0xa7, 0x3f, 0xfa, 0x7b, 0xea, 0x98, 0x48, 0x8c, 0x90, 0x70, - 0x44, 0x8c, 0xe4, 0x47, 0xea, 0xa6, 0x87, 0x21, 0x2a, 0x29, 0x82, 0x84, 0xe1, 0x02, 0x8c, 0xf2, - 0x6e, 0x43, 0xb1, 0x74, 0xc5, 0xd2, 0x79, 0xb7, 0x21, 0x19, 0x57, 0x41, 0xc7, 0xa2, 0x43, 0x43, - 0x48, 0xdc, 0x1c, 0xe2, 0x65, 0x94, 0xbd, 0x52, 0x46, 0xd9, 0x33, 0x1c, 0x8c, 0x50, 0x00, 0x51, - 0x18, 0x21, 0xf2, 0x26, 0x12, 0x21, 0xa4, 0x48, 0x0b, 0x8e, 0x42, 0x1d, 0x1f, 0x7e, 0x66, 0x3a, - 0x84, 0xc6, 0x57, 0xf4, 0xbe, 0x58, 0x91, 0x0f, 0xd9, 0x6d, 0xdb, 0x0f, 0x5f, 0x63, 0x47, 0xd6, - 0xa5, 0x94, 0xf8, 0x52, 0x56, 0xeb, 0xea, 0x49, 0x01, 0xee, 0x85, 0xad, 0x8b, 0x08, 0xd5, 0x8f, - 0x35, 0xd0, 0x4f, 0xb5, 0x01, 0x2d, 0xc2, 0x04, 0xad, 0x49, 0x28, 0xc6, 0x34, 0x83, 0x20, 0x11, - 0x2f, 0xc2, 0xa0, 0x81, 0xaa, 0x47, 0xbc, 0xa5, 0x6c, 0x4b, 0xd5, 0xbf, 0x77, 0xb0, 0x6e, 0x47, - 0xfd, 0x3d, 0xb9, 0xea, 0x67, 0xfc, 0xa1, 0x41, 0x35, 0x5c, 0x25, 0xee, 0xf4, 0xf7, 0x3b, 0x6e, - 0xa3, 0xdf, 0x3e, 0xe5, 0xca, 0x35, 0x07, 0x40, 0x49, 0x28, 0xf3, 0x08, 0x33, 0x85, 0x9e, 0xc8, - 0x32, 0x8f, 0x86, 0xdd, 0x8b, 0x59, 0x18, 0xf3, 0x02, 0x03, 0xa9, 0x05, 0x87, 0x84, 0x8c, 0xcc, - 0xd6, 0xb3, 0x32, 0xfb, 0x57, 0x0d, 0x07, 0xd4, 0x94, 0xc3, 0xcf, 0xe6, 0x79, 0x9d, 0x9a, 0xbf, - 0x8b, 0xa9, 0xf9, 0xfb, 0x4e, 0xb1, 0x54, 0xa8, 0x14, 0xcd, 0xf4, 0x48, 0xbf, 0xfc, 0xe5, 0x18, - 0x54, 0x06, 0xf6, 0xec, 0x70, 0x71, 0xe0, 0xd4, 0x39, 0x7b, 0x0b, 0x2a, 0xc9, 0x75, 0x3a, 0x9b, - 0x8f, 0x75, 0xe4, 0xf4, 0xff, 0x06, 0xaa, 0x0b, 0xc3, 0x05, 0x10, 0x17, 0x23, 0x17, 0x28, 0x8e, - 0x2e, 0x9d, 0xe3, 0x8a, 0x33, 0x16, 0xea, 0x71, 0xc5, 0x59, 0xfb, 0xea, 0x50, 0x71, 0x74, 0xe5, - 0x1b, 0x57, 0x9c, 0xb1, 0x9e, 0x8e, 0x2b, 0xce, 0xda, 0x16, 0x1b, 0x39, 0x76, 0x17, 0x26, 0x62, - 0x7b, 0x46, 0x36, 0x9b, 0x76, 0x33, 0x5c, 0xa5, 0x56, 0xe7, 0x86, 0x70, 0x93, 0xfa, 0x06, 0x9b, - 0xdc, 0xb8, 0xbe, 0xe4, 0xa6, 0x39, 0xae, 0x2f, 0xb5, 0xfe, 0x35, 0x72, 0xec, 0x6d, 0x98, 0x4a, - 0x2c, 0xed, 0xd8, 0xe5, 0xe8, 0x37, 0xe9, 0x1d, 0x65, 0x75, 0x7e, 0x28, 0x3f, 0xd0, 0x7a, 0x5d, - 0xfb, 0xbf, 0xc6, 0x5e, 0x87, 0x72, 0x74, 0x79, 0xc4, 0x2e, 0x45, 0x3f, 0x4b, 0x6c, 0xbd, 0xaa, - 0xb3, 0xd9, 0xcc, 0x81, 0x99, 0x6f, 0xc2, 0x64, 0x7c, 0x7f, 0xc1, 0xe2, 0x48, 0x25, 0x17, 0x43, - 0xd5, 0xcb, 0xc3, 0xd8, 0x03, 0x95, 0x35, 0x80, 0xf0, 0xed, 0xcb, 0x2e, 0xc6, 0x6a, 0x44, 0x74, - 0x99, 0x50, 0xad, 0x66, 0xb1, 0x06, 0x6a, 0xee, 0x23, 0x80, 0x91, 0xd1, 0x30, 0x0e, 0x60, 0x7a, - 0x78, 0x8d, 0x03, 0x98, 0x31, 0x53, 0x4a, 0x00, 0x43, 0xf3, 0xe4, 0xf0, 0x91, 0x34, 0x2f, 0x32, - 0xd9, 0x25, 0xcd, 0x8b, 0xce, 0x33, 0xa1, 0x97, 0xd8, 0x45, 0xe3, 0x6a, 0x62, 0xc3, 0x47, 0x5c, - 0x4d, 0xbc, 0xe9, 0x1a, 0x39, 0xb6, 0x83, 0xf8, 0x87, 0x1d, 0x20, 0x8e, 0x7f, 0xaa, 0x13, 0xc6, - 0xf1, 0x4f, 0x37, 0x0e, 0xe5, 0xe2, 0xbb, 0xb8, 0x01, 0x4d, 0x94, 0x41, 0x66, 0xa4, 0xef, 0x6b, - 0xb2, 0x29, 0x54, 0x17, 0x8f, 0x94, 0x09, 0xce, 0xd8, 0xd7, 0xd5, 0xbf, 0x24, 0x5f, 0xf8, 0x2b, - 0x00, 0x00, 0xff, 0xff, 0x35, 0x0f, 0xad, 0x07, 0xbc, 0x1c, 0x00, 0x00, + // 1809 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcd, 0x6f, 0x23, 0x4b, + 0x11, 0xf7, 0xd8, 0xce, 0xc4, 0xa9, 0x38, 0x89, 0xd3, 0xef, 0x2b, 0xcf, 0x9b, 0x90, 0xbc, 0xc9, + 0x7b, 0xb0, 0xbb, 0x42, 0x11, 0x0a, 0x08, 0x4e, 0x0b, 0xca, 0x87, 0x43, 0x76, 0x21, 0xbb, 0x61, + 0x92, 0x2c, 0x1c, 0x90, 0x86, 0x89, 0xdd, 0xb1, 0x47, 0xd8, 0x9e, 0xd9, 0x9e, 0x71, 0xd8, 0x20, + 0xc4, 0x05, 0x01, 0x57, 0x4e, 0xdc, 0x90, 0x40, 0xdc, 0x10, 0x17, 0x2e, 0x1c, 0x38, 0x20, 0xae, + 0x70, 0xdd, 0x03, 0x27, 0xfe, 0x85, 0xbd, 0x71, 0x47, 0xdd, 0x55, 0xe3, 0x99, 0x9e, 0x19, 0x5b, + 0xc9, 0x92, 0x68, 0x57, 0x88, 0x9b, 0xa7, 0xba, 0xba, 0xba, 0xea, 0x57, 0xd5, 0x55, 0xd5, 0x65, + 0x68, 0xf8, 0x01, 0x17, 0x6e, 0xe4, 0xf9, 0xc3, 0x70, 0x2b, 0x10, 0x7e, 0xe4, 0x33, 0xb3, 0xeb, + 0x45, 0x6e, 0xff, 0xaa, 0x59, 0x0f, 0x7b, 0xae, 0xe0, 0x1d, 0xa4, 0x5a, 0x7f, 0x32, 0xe0, 0xa3, + 0xb3, 0x90, 0x8b, 0x3d, 0xc1, 0xdd, 0x88, 0xef, 0x0a, 0x77, 0xd8, 0xee, 0xd9, 0xfc, 0xc5, 0x88, + 0x87, 0x11, 0xdb, 0x06, 0x10, 0x3c, 0xf0, 0x43, 0x2f, 0xf2, 0xc5, 0xd5, 0x8a, 0xb1, 0x61, 0xdc, + 0x9f, 0xdf, 0x66, 0x5b, 0x28, 0x66, 0xcb, 0x1e, 0xaf, 0xd8, 0x29, 0x2e, 0xb6, 0x0e, 0xf3, 0xe7, + 0x4a, 0x88, 0x33, 0x74, 0x07, 0x7c, 0xa5, 0xbc, 0x61, 0xdc, 0xaf, 0xdb, 0x80, 0xa4, 0xa7, 0xee, + 0x80, 0xb3, 0x0d, 0xa8, 0x8e, 0x42, 0x2e, 0x56, 0x2a, 0x4a, 0x5c, 0x3d, 0x16, 0x27, 0x75, 0xb0, + 0xd5, 0x8a, 0x14, 0x11, 0x46, 0xae, 0x88, 0x9c, 0xc0, 0xf7, 0x86, 0xd1, 0x4a, 0x15, 0x45, 0x28, + 0xd2, 0xb1, 0xa4, 0x58, 0x43, 0x58, 0xc9, 0xab, 0x1c, 0x06, 0xfe, 0x30, 0xe4, 0xec, 0xf3, 0x60, + 0xe2, 0x61, 0xa4, 0xef, 0x62, 0x7c, 0x00, 0xf1, 0xd1, 0x2a, 0x7b, 0x08, 0xcb, 0x81, 0xe0, 0x8e, + 0xe0, 0x6d, 0xee, 0x5d, 0x72, 0x87, 0x0b, 0xe1, 0x0b, 0xa5, 0xed, 0x9c, 0xbd, 0x14, 0x08, 0x6e, + 0x23, 0xbd, 0x25, 0xc9, 0xd6, 0xdf, 0x08, 0xa3, 0xb3, 0xa0, 0xf3, 0xae, 0x60, 0xf4, 0x21, 0x98, + 0x43, 0xfe, 0x23, 0xc1, 0x2f, 0x09, 0x1e, 0xfa, 0x92, 0x74, 0xbf, 0xdf, 0x91, 0xf4, 0x19, 0xa4, + 0xe3, 0x97, 0x75, 0x80, 0x90, 0xe9, 0x16, 0x10, 0x64, 0x85, 0x50, 0x18, 0xc5, 0x50, 0xfc, 0x8a, + 0xa0, 0xd8, 0xe7, 0x7d, 0xfe, 0x6e, 0x40, 0x11, 0x9b, 0xa6, 0x6b, 0xf4, 0x06, 0xa6, 0xfd, 0xd2, + 0x80, 0xf7, 0x13, 0x41, 0xa7, 0x6e, 0xf7, 0xbf, 0xb1, 0xeb, 0x63, 0xa8, 0x45, 0x6e, 0x37, 0x6d, + 0xd4, 0x6c, 0xe4, 0x76, 0xaf, 0x69, 0xd1, 0x1e, 0x7c, 0x90, 0x51, 0xe4, 0x0d, 0xcc, 0xf9, 0x07, + 0x99, 0x83, 0xb7, 0xe4, 0x2d, 0x9a, 0xc3, 0xbe, 0x00, 0x4b, 0x91, 0x2b, 0xba, 0x3c, 0x72, 0x04, + 0xbf, 0xf4, 0x42, 0xcf, 0x1f, 0x52, 0xd0, 0x2e, 0x22, 0xd9, 0x26, 0x2a, 0x5b, 0x81, 0xd9, 0x01, + 0x0f, 0x43, 0xb7, 0xcb, 0x29, 0x7a, 0xe3, 0x4f, 0xeb, 0xc7, 0x88, 0x48, 0xca, 0x16, 0x42, 0x64, + 0x0d, 0x2a, 0x91, 0xdb, 0x25, 0x2b, 0xe6, 0xe3, 0xc3, 0x25, 0x87, 0xa4, 0xcb, 0xeb, 0xc0, 0x5f, + 0x7a, 0x61, 0x14, 0x2a, 0xad, 0x6b, 0x36, 0x7d, 0x15, 0x03, 0x59, 0x29, 0x06, 0xf2, 0x95, 0x01, + 0x1f, 0xca, 0xc3, 0x8f, 0xb8, 0xe8, 0xde, 0x42, 0xc4, 0xc7, 0x78, 0x95, 0x27, 0xe2, 0x75, 0x0f, + 0xe6, 0xda, 0xfe, 0x60, 0xe0, 0x45, 0x8e, 0xd7, 0x21, 0xa5, 0x6a, 0x48, 0x78, 0xdc, 0x91, 0x16, + 0x51, 0x7e, 0xa3, 0x8b, 0x4f, 0xf9, 0x6c, 0x22, 0x76, 0xec, 0x7d, 0x98, 0x71, 0x83, 0xa0, 0x7f, + 0xb5, 0x62, 0x2a, 0x08, 0xf0, 0xc3, 0xfa, 0x23, 0x5d, 0x64, 0xcd, 0x2a, 0x02, 0x55, 0x53, 0xc0, + 0xc8, 0x28, 0xb0, 0x0b, 0x0b, 0x74, 0x63, 0x47, 0x2a, 0x99, 0x90, 0xe3, 0xd7, 0x62, 0x43, 0x9e, + 0xc5, 0x75, 0x07, 0x85, 0x62, 0xc6, 0xb1, 0xeb, 0xe7, 0xa9, 0xaf, 0x62, 0xf8, 0xab, 0x85, 0xf0, + 0x3f, 0xa9, 0xd6, 0xca, 0x8d, 0x8a, 0xf5, 0x2f, 0x03, 0x23, 0x40, 0xa9, 0x7b, 0xea, 0xdb, 0xfc, + 0xe2, 0x6e, 0x7d, 0xb0, 0x06, 0x10, 0xfa, 0x23, 0xd1, 0xe6, 0x4e, 0xd8, 0x73, 0xc9, 0x09, 0x73, + 0x48, 0x39, 0xe9, 0xb9, 0x13, 0xbd, 0xb0, 0x06, 0x30, 0x0e, 0xf5, 0x0b, 0x72, 0xc4, 0x5c, 0x1c, + 0xe5, 0x17, 0x69, 0x27, 0x99, 0x7a, 0x80, 0xbb, 0xa9, 0x18, 0x23, 0xf3, 0xae, 0xe3, 0x8c, 0x9b, + 0x54, 0xb1, 0x9f, 0xc2, 0x07, 0x85, 0xbe, 0x99, 0x7e, 0xc2, 0x27, 0x50, 0x97, 0xc0, 0x39, 0x6d, + 0x75, 0xf5, 0x3a, 0x74, 0x8f, 0xe6, 0x25, 0x0d, 0x6f, 0x63, 0x87, 0x7d, 0x06, 0x8b, 0x14, 0x11, + 0x31, 0x53, 0x45, 0x31, 0x51, 0x9c, 0x10, 0x9b, 0xf5, 0x5b, 0x03, 0xde, 0x93, 0x36, 0x1e, 0x1c, + 0xbc, 0xab, 0x97, 0xc8, 0xfa, 0x05, 0xe5, 0xcc, 0x44, 0x45, 0x72, 0x42, 0x2e, 0xe8, 0x8d, 0x5b, + 0x0a, 0xfa, 0x09, 0xbe, 0xfa, 0x6b, 0x99, 0x12, 0x5e, 0x8f, 0x0b, 0x71, 0x75, 0xec, 0xb5, 0x7f, + 0x78, 0xb7, 0x68, 0x3d, 0x00, 0x13, 0xc1, 0xa1, 0xdb, 0xbc, 0x1c, 0xf3, 0x7c, 0xd3, 0x8b, 0xf6, + 0xd4, 0x82, 0x4d, 0x0c, 0xd9, 0x8a, 0x5d, 0xcd, 0x55, 0xec, 0xc9, 0x99, 0xe8, 0x21, 0x2c, 0x63, + 0x63, 0x97, 0x16, 0x80, 0x17, 0x61, 0x49, 0x2d, 0xec, 0x26, 0x52, 0x1e, 0x41, 0x03, 0x79, 0x53, + 0xd6, 0xce, 0x4e, 0xb4, 0x16, 0xb7, 0x27, 0x04, 0xeb, 0x9f, 0x94, 0xb4, 0xd3, 0x00, 0xde, 0xae, + 0x2f, 0x31, 0xd6, 0x9d, 0x48, 0xf0, 0x8c, 0x2f, 0x71, 0xe1, 0x54, 0x70, 0xf4, 0xa5, 0xbc, 0x41, + 0x14, 0x89, 0xe9, 0x32, 0x33, 0x8f, 0x34, 0x64, 0xb9, 0x41, 0x3e, 0xb4, 0xfe, 0x52, 0x86, 0x65, + 0xe5, 0x39, 0x7e, 0xc9, 0xa5, 0xc9, 0xff, 0x0f, 0x8b, 0x1b, 0x84, 0xc5, 0x2b, 0x03, 0x58, 0x1a, + 0xbc, 0xff, 0x8d, 0x90, 0xf8, 0x77, 0x19, 0xee, 0xa9, 0x60, 0x57, 0xfb, 0x0f, 0xbc, 0x3e, 0x0f, + 0x77, 0xda, 0x52, 0xdd, 0x43, 0xee, 0x76, 0xb8, 0x60, 0x07, 0x60, 0xba, 0xea, 0x5b, 0xd9, 0xb5, + 0xb8, 0xbd, 0x95, 0x76, 0xf5, 0x84, 0x4d, 0x5b, 0xf8, 0x71, 0x7a, 0x15, 0x70, 0x9b, 0x76, 0xcb, + 0x9c, 0x7a, 0xe1, 0xf5, 0xb9, 0x13, 0xb8, 0x51, 0x8f, 0xda, 0xc0, 0x9a, 0x24, 0x1c, 0xbb, 0x51, + 0x8f, 0x6d, 0xc2, 0x42, 0x20, 0xfb, 0x3b, 0x7f, 0x14, 0x22, 0x43, 0x45, 0x31, 0xd4, 0x63, 0xa2, + 0x62, 0x92, 0xa5, 0xc2, 0x0d, 0xf9, 0x57, 0xbf, 0xe2, 0xb4, 0xfd, 0x61, 0xc4, 0xe9, 0x75, 0x27, + 0x4b, 0x85, 0xa2, 0xee, 0x21, 0x91, 0x3d, 0x80, 0x06, 0x7f, 0xc9, 0xdb, 0xa3, 0x88, 0x3b, 0x52, + 0xfe, 0xc0, 0xef, 0x60, 0xd0, 0xd4, 0xec, 0x25, 0xa2, 0x1f, 0x10, 0x59, 0x1e, 0xeb, 0x0d, 0x2f, + 0xb8, 0x18, 0x0b, 0xc4, 0x2e, 0xa7, 0xae, 0x88, 0x24, 0xcf, 0x3a, 0x03, 0x48, 0xcc, 0x61, 0x00, + 0xe6, 0x9e, 0xdd, 0xda, 0x39, 0x6d, 0x35, 0x4a, 0x6c, 0x11, 0x00, 0x7f, 0x3b, 0xfb, 0x8f, 0xed, + 0x86, 0x21, 0xd7, 0xce, 0x8e, 0xf7, 0xe5, 0x5a, 0x99, 0xd5, 0xa0, 0x7a, 0xf4, 0xec, 0x79, 0xab, + 0x51, 0x91, 0xd4, 0xfd, 0xd6, 0xb7, 0x5b, 0xa7, 0xad, 0x46, 0x95, 0xcd, 0xc1, 0xcc, 0xde, 0xe1, + 0xd1, 0xb3, 0xfd, 0xc6, 0x8c, 0xf5, 0x6b, 0x6a, 0x4a, 0x72, 0x10, 0xb2, 0x47, 0x60, 0xf6, 0x14, + 0x8c, 0x14, 0x49, 0x9b, 0xd7, 0x40, 0xfc, 0xb0, 0x64, 0xd3, 0x26, 0xd6, 0x84, 0xd9, 0xd8, 0x1c, + 0x05, 0xf3, 0x61, 0xc9, 0x8e, 0x09, 0xbb, 0x16, 0x6c, 0xc8, 0xbb, 0xe9, 0x50, 0x00, 0x49, 0x7c, + 0x42, 0x07, 0x1d, 0xe4, 0x04, 0xee, 0x55, 0xdf, 0x77, 0x3b, 0xd6, 0xcf, 0x2b, 0xb0, 0x9a, 0x39, + 0x89, 0x12, 0x05, 0x45, 0xc4, 0xdd, 0xa4, 0x8b, 0x4c, 0x0e, 0xa8, 0xe4, 0x72, 0xc0, 0x67, 0xb0, + 0x48, 0x6a, 0xc7, 0xa9, 0x00, 0xf3, 0xc4, 0x02, 0x52, 0x8f, 0x28, 0x21, 0x7c, 0x11, 0x18, 0xb1, + 0xb9, 0xa3, 0xa8, 0xe7, 0x0b, 0x14, 0x87, 0x59, 0xa3, 0x81, 0x2b, 0x3b, 0x6a, 0x41, 0x09, 0xdd, + 0x82, 0xf7, 0x74, 0x6e, 0x3e, 0x70, 0xbd, 0x3e, 0x25, 0x90, 0xe5, 0x34, 0x7b, 0x4b, 0x2e, 0x14, + 0xa7, 0x9b, 0xd9, 0xeb, 0xa7, 0x9b, 0xda, 0xf5, 0xd3, 0xcd, 0x9f, 0xe3, 0x2a, 0x94, 0xf3, 0x03, + 0xfb, 0x7a, 0x26, 0x42, 0x3e, 0x9d, 0x10, 0x21, 0x9a, 0xdf, 0x52, 0x21, 0xf2, 0xb5, 0xf1, 0x9d, + 0x2e, 0xeb, 0xb9, 0xaa, 0x38, 0xc2, 0x4a, 0xf1, 0x25, 0xde, 0xdd, 0x84, 0x4f, 0xf2, 0xf1, 0x23, + 0xf0, 0x94, 0x71, 0x00, 0xfd, 0x21, 0x9e, 0x0a, 0xa5, 0x15, 0xb9, 0xc5, 0x64, 0xb9, 0x0e, 0xf3, + 0xde, 0xb0, 0xc3, 0x5f, 0x6a, 0x69, 0x12, 0x14, 0x69, 0x4a, 0xfa, 0x9b, 0xf0, 0x40, 0xfb, 0xfd, + 0xb8, 0x22, 0xca, 0x2c, 0x72, 0xe7, 0x6d, 0xa5, 0x50, 0xc7, 0xa4, 0xda, 0x4a, 0x24, 0x4c, 0x79, + 0x9b, 0xad, 0x01, 0x5d, 0x02, 0xf5, 0x98, 0x98, 0xc1, 0xc7, 0x04, 0x52, 0xe4, 0x63, 0xe2, 0x1b, + 0xb0, 0x2c, 0xf8, 0xc0, 0x8f, 0x78, 0x3a, 0xca, 0xcc, 0x89, 0x0a, 0x37, 0x90, 0x39, 0xa1, 0xc8, + 0x1c, 0x48, 0x02, 0xe8, 0x78, 0x8c, 0xe6, 0x3a, 0x12, 0xd1, 0x0d, 0xd6, 0x4f, 0xe2, 0xca, 0x87, + 0x20, 0x8d, 0xdf, 0xcf, 0x40, 0xf6, 0x48, 0xd5, 0xb0, 0xf9, 0x27, 0x0b, 0xa5, 0x6a, 0x37, 0xe8, + 0x59, 0x25, 0x34, 0xdd, 0x4c, 0x45, 0xab, 0x75, 0xa9, 0x9c, 0x59, 0xbf, 0x23, 0x1f, 0x9d, 0xbc, + 0x18, 0xb9, 0xe1, 0xdd, 0xb7, 0xfe, 0xa1, 0x3a, 0x26, 0xe5, 0x23, 0x24, 0x4c, 0xf1, 0x91, 0xdc, + 0xa4, 0x6e, 0x7a, 0xe2, 0xa2, 0x9a, 0x22, 0x48, 0x18, 0x3e, 0x82, 0x59, 0x3e, 0xec, 0xa8, 0x25, + 0x53, 0x2d, 0x99, 0x7c, 0xd8, 0x91, 0x0b, 0x9f, 0x82, 0x89, 0x49, 0x87, 0x9a, 0x10, 0x5d, 0x1d, + 0x5a, 0x2b, 0x48, 0x7b, 0xb5, 0x82, 0xb4, 0x67, 0x79, 0xe8, 0xa1, 0x18, 0xa2, 0xc4, 0x43, 0x64, + 0x4d, 0xca, 0x43, 0x48, 0x91, 0x1a, 0x4c, 0x43, 0x1d, 0xdf, 0xce, 0x76, 0xde, 0x85, 0xd6, 0x6f, + 0xe8, 0x7d, 0xb1, 0x13, 0x04, 0xfd, 0xab, 0x63, 0x37, 0x4a, 0x5e, 0x63, 0x53, 0xf3, 0x52, 0x8e, + 0x7d, 0xab, 0xa8, 0x74, 0x05, 0x92, 0x81, 0x87, 0x49, 0xe9, 0x22, 0x42, 0xf3, 0x67, 0x06, 0x98, + 0x77, 0x5a, 0x80, 0x36, 0x61, 0x81, 0x9e, 0xdf, 0xe4, 0x63, 0xea, 0x41, 0x90, 0x88, 0x17, 0x61, + 0x5c, 0x40, 0xd5, 0x1c, 0xc4, 0x51, 0xba, 0xe5, 0xf2, 0xdf, 0xf7, 0x31, 0x6f, 0xa7, 0xed, 0xbd, + 0xbd, 0xec, 0x67, 0xbd, 0x36, 0xa0, 0x99, 0x4c, 0x63, 0x4f, 0x46, 0xe7, 0x03, 0xbf, 0x33, 0xea, + 0xf3, 0x3b, 0x9f, 0x68, 0x50, 0x10, 0xa6, 0x26, 0x1a, 0x48, 0x99, 0x36, 0xd1, 0x58, 0x85, 0xb9, + 0x30, 0x56, 0x30, 0x1e, 0x68, 0x8c, 0x09, 0x05, 0x91, 0x6d, 0x16, 0x45, 0xf6, 0xdf, 0x0d, 0x6c, + 0x50, 0x73, 0x06, 0xbf, 0x9d, 0xe7, 0x75, 0xae, 0xff, 0xae, 0xe6, 0xfa, 0xef, 0x27, 0xd5, 0x5a, + 0xa5, 0x51, 0xb5, 0xf3, 0x2d, 0xfd, 0xf6, 0xeb, 0x39, 0x68, 0x8c, 0xf5, 0x39, 0xe1, 0xe2, 0xd2, + 0x6b, 0x73, 0xf6, 0x5d, 0x68, 0x64, 0xff, 0x91, 0x60, 0xeb, 0x5a, 0x45, 0xce, 0xff, 0xbd, 0xd2, + 0xdc, 0x98, 0xcc, 0x80, 0xb8, 0x58, 0xa5, 0x58, 0x70, 0x7a, 0x6e, 0xaf, 0x0b, 0x2e, 0xf8, 0x4f, + 0x42, 0x17, 0x5c, 0x34, 0xf2, 0x4f, 0x04, 0xa7, 0xa7, 0xe6, 0xba, 0xe0, 0x82, 0x09, 0xbf, 0x2e, + 0xb8, 0x68, 0xe0, 0x6e, 0x95, 0xd8, 0x53, 0x58, 0xd0, 0x46, 0xb5, 0x6c, 0x35, 0x6f, 0x66, 0x32, + 0x8d, 0x6e, 0xae, 0x4d, 0x58, 0xcd, 0xca, 0x1b, 0x0f, 0xc3, 0x75, 0x79, 0xd9, 0x61, 0xbd, 0x2e, + 0x2f, 0x37, 0x41, 0xb7, 0x4a, 0xec, 0x3b, 0xb0, 0xa8, 0x4f, 0xda, 0x98, 0xb6, 0x25, 0x37, 0x60, + 0x6c, 0x7e, 0x6e, 0xd2, 0xf2, 0x58, 0xe4, 0xf7, 0x60, 0x29, 0x33, 0x4a, 0x65, 0xf9, 0x4d, 0x3a, + 0x92, 0xeb, 0x13, 0xd7, 0x63, 0xa9, 0xf7, 0x8d, 0x2f, 0x19, 0xec, 0x5b, 0x50, 0x4f, 0xcf, 0xa3, + 0xd8, 0xbd, 0xf4, 0xb6, 0xcc, 0x20, 0xad, 0xb9, 0x5a, 0xbc, 0x98, 0xb5, 0x3c, 0x19, 0x89, 0xe8, + 0x96, 0xe7, 0x66, 0x4d, 0xba, 0xe5, 0xf9, 0x49, 0x8a, 0x55, 0x62, 0x2d, 0x80, 0xe4, 0x39, 0xcd, + 0x3e, 0xd6, 0xd2, 0x4e, 0x7a, 0x3e, 0xd1, 0x6c, 0x16, 0x2d, 0x8d, 0xc5, 0x3c, 0x47, 0x00, 0x53, + 0xdd, 0xa6, 0x0e, 0x60, 0xbe, 0x1f, 0xd6, 0x01, 0x2c, 0x68, 0x53, 0x25, 0x80, 0x89, 0x7a, 0xb2, + 0x9f, 0xc9, 0xaa, 0x97, 0x6a, 0x16, 0xb3, 0xea, 0xa5, 0x5b, 0xa4, 0xc4, 0x4a, 0x2c, 0xcc, 0xba, + 0x18, 0xad, 0x9f, 0xd1, 0xc5, 0xe8, 0x75, 0xdc, 0x2a, 0xb1, 0x13, 0xc4, 0x3f, 0x29, 0x2a, 0x3a, + 0xfe, 0xb9, 0xe2, 0xaa, 0xe3, 0x9f, 0xaf, 0x45, 0xca, 0xc4, 0x1f, 0xe0, 0x50, 0x35, 0x93, 0x59, + 0x99, 0x95, 0x4f, 0x01, 0xd9, 0x3a, 0xd3, 0xdc, 0x9c, 0xca, 0x13, 0x9f, 0x71, 0x6e, 0xaa, 0x3f, + 0x8a, 0xbf, 0xfc, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0x59, 0x6f, 0x01, 0x52, 0x1e, 0x00, + 0x00, } diff --git a/operations.proto b/operations.proto index 8efc9b3f5f3650a9de9aa9c7c83e9d65abe7500d..c14edc9ca4b37e76ed27f4316b7b8dbeedfd0c4e 100644 --- a/operations.proto +++ b/operations.proto @@ -10,6 +10,7 @@ service OperationService { rpc UserDeleteBranch(UserDeleteBranchRequest) returns (UserDeleteBranchResponse) {} rpc UserCreateTag(UserCreateTagRequest) returns (UserCreateTagResponse) {} rpc UserDeleteTag(UserDeleteTagRequest) returns (UserDeleteTagResponse) {} + rpc UserMergeToRef(UserMergeToRefRequest) returns (UserMergeToRefResponse) {} rpc UserMergeBranch(stream UserMergeBranchRequest) returns (stream UserMergeBranchResponse) {} rpc UserFFBranch(UserFFBranchRequest) returns (UserFFBranchResponse) {} rpc UserCherryPick(UserCherryPickRequest) returns (UserCherryPickResponse) {} @@ -106,6 +107,27 @@ message UserMergeBranchResponse { string pre_receive_error = 4; } +message UserMergeToRefRequest { + Repository repository = 1; + User user = 2; + string source_sha = 3; + bytes branch = 4; + + // The merge of source_sha and branch has target_ref as target. + // + // The target_ref is _always_ overwritten when merging source_sha + // and branch. That is, if a second request comes in, target_ref + // will lose its previous state and be updated to the latest merge + // between source_sha and branch. + bytes target_ref = 5; + bytes message = 6; +} + +message UserMergeToRefResponse { + string commit_id = 1; + string pre_receive_error = 2; +} + message OperationBranchUpdate { // If this string is non-empty the branch has been updated. string commit_id = 1; diff --git a/ruby/lib/gitaly/operations_pb.rb b/ruby/lib/gitaly/operations_pb.rb index c1fb5612349600e161a6e6176ec3be78b75d43b4..a000e5de30e49e112815390a48b670cfc0cbdeb4 100644 --- a/ruby/lib/gitaly/operations_pb.rb +++ b/ruby/lib/gitaly/operations_pb.rb @@ -66,6 +66,18 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :branch_update, :message, 3, "gitaly.OperationBranchUpdate" optional :pre_receive_error, :string, 4 end + add_message "gitaly.UserMergeToRefRequest" do + optional :repository, :message, 1, "gitaly.Repository" + optional :user, :message, 2, "gitaly.User" + optional :source_sha, :string, 3 + optional :branch, :bytes, 4 + optional :target_ref, :bytes, 5 + optional :message, :bytes, 6 + end + add_message "gitaly.UserMergeToRefResponse" do + optional :commit_id, :string, 1 + optional :pre_receive_error, :string, 2 + end add_message "gitaly.OperationBranchUpdate" do optional :commit_id, :string, 1 optional :repo_created, :bool, 2 @@ -224,6 +236,8 @@ module Gitaly UserCreateTagResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCreateTagResponse").msgclass UserMergeBranchRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserMergeBranchRequest").msgclass UserMergeBranchResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserMergeBranchResponse").msgclass + UserMergeToRefRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserMergeToRefRequest").msgclass + UserMergeToRefResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserMergeToRefResponse").msgclass OperationBranchUpdate = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.OperationBranchUpdate").msgclass UserFFBranchRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserFFBranchRequest").msgclass UserFFBranchResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserFFBranchResponse").msgclass diff --git a/ruby/lib/gitaly/operations_services_pb.rb b/ruby/lib/gitaly/operations_services_pb.rb index 8dd70dcc38c0a88f2d9e5a61d51194682b442410..188cdde6634ffe1cdc42a8eaa7d7e59e41b1992d 100644 --- a/ruby/lib/gitaly/operations_services_pb.rb +++ b/ruby/lib/gitaly/operations_services_pb.rb @@ -19,6 +19,7 @@ module Gitaly rpc :UserDeleteBranch, UserDeleteBranchRequest, UserDeleteBranchResponse rpc :UserCreateTag, UserCreateTagRequest, UserCreateTagResponse rpc :UserDeleteTag, UserDeleteTagRequest, UserDeleteTagResponse + rpc :UserMergeToRef, UserMergeToRefRequest, UserMergeToRefResponse rpc :UserMergeBranch, stream(UserMergeBranchRequest), stream(UserMergeBranchResponse) rpc :UserFFBranch, UserFFBranchRequest, UserFFBranchResponse rpc :UserCherryPick, UserCherryPickRequest, UserCherryPickResponse