diff --git a/go/blob.pb.go b/go/blob.pb.go index 53dd1db2d4e151d6e2a03afeef89ff21228b01ce..6080661807044200982891fb9b7e46d4d8639313 100644 --- a/go/blob.pb.go +++ b/go/blob.pb.go @@ -135,6 +135,8 @@ It has these top-level messages: HasLocalBranchesResponse ChangeStorageRequest ChangeStorageResponse + ListMergedBranchesRequest + ListMergedBranchesResponse Repository GitCommit CommitAuthor diff --git a/go/repository-service.pb.go b/go/repository-service.pb.go index c4cca77916a2cf788e8c10cbf84dcc6f76464f54..31a07b912606815851a5380c6821bc84d87036f9 100644 --- a/go/repository-service.pb.go +++ b/go/repository-service.pb.go @@ -445,6 +445,62 @@ func (m *ChangeStorageResponse) String() string { return proto.Compac func (*ChangeStorageResponse) ProtoMessage() {} func (*ChangeStorageResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{21} } +type ListMergedBranchesRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + Into string `protobuf:"bytes,2,opt,name=into" json:"into,omitempty"` + Branches []string `protobuf:"bytes,3,rep,name=branches" json:"branches,omitempty"` +} + +func (m *ListMergedBranchesRequest) Reset() { *m = ListMergedBranchesRequest{} } +func (m *ListMergedBranchesRequest) String() string { return proto.CompactTextString(m) } +func (*ListMergedBranchesRequest) ProtoMessage() {} +func (*ListMergedBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{22} } + +func (m *ListMergedBranchesRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *ListMergedBranchesRequest) GetInto() string { + if m != nil { + return m.Into + } + return "" +} + +func (m *ListMergedBranchesRequest) GetBranches() []string { + if m != nil { + return m.Branches + } + return nil +} + +type ListMergedBranchesResponse struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + Branches []string `protobuf:"bytes,2,rep,name=branches" json:"branches,omitempty"` +} + +func (m *ListMergedBranchesResponse) Reset() { *m = ListMergedBranchesResponse{} } +func (m *ListMergedBranchesResponse) String() string { return proto.CompactTextString(m) } +func (*ListMergedBranchesResponse) ProtoMessage() {} +func (*ListMergedBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{23} } + +func (m *ListMergedBranchesResponse) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *ListMergedBranchesResponse) GetBranches() []string { + if m != nil { + return m.Branches + } + return nil +} + func init() { proto.RegisterType((*RepositoryExistsRequest)(nil), "gitaly.RepositoryExistsRequest") proto.RegisterType((*RepositoryExistsResponse)(nil), "gitaly.RepositoryExistsResponse") @@ -468,6 +524,8 @@ func init() { proto.RegisterType((*HasLocalBranchesResponse)(nil), "gitaly.HasLocalBranchesResponse") proto.RegisterType((*ChangeStorageRequest)(nil), "gitaly.ChangeStorageRequest") proto.RegisterType((*ChangeStorageResponse)(nil), "gitaly.ChangeStorageResponse") + proto.RegisterType((*ListMergedBranchesRequest)(nil), "gitaly.ListMergedBranchesRequest") + proto.RegisterType((*ListMergedBranchesResponse)(nil), "gitaly.ListMergedBranchesResponse") proto.RegisterEnum("gitaly.GetArchiveRequest_Format", GetArchiveRequest_Format_name, GetArchiveRequest_Format_value) } @@ -493,6 +551,7 @@ type RepositoryServiceClient interface { GetArchive(ctx context.Context, in *GetArchiveRequest, opts ...grpc.CallOption) (RepositoryService_GetArchiveClient, error) HasLocalBranches(ctx context.Context, in *HasLocalBranchesRequest, opts ...grpc.CallOption) (*HasLocalBranchesResponse, error) ChangeStorage(ctx context.Context, in *ChangeStorageRequest, opts ...grpc.CallOption) (*ChangeStorageResponse, error) + ListMergedBranches(ctx context.Context, in *ListMergedBranchesRequest, opts ...grpc.CallOption) (*ListMergedBranchesResponse, error) } type repositoryServiceClient struct { @@ -625,6 +684,15 @@ func (c *repositoryServiceClient) ChangeStorage(ctx context.Context, in *ChangeS return out, nil } +func (c *repositoryServiceClient) ListMergedBranches(ctx context.Context, in *ListMergedBranchesRequest, opts ...grpc.CallOption) (*ListMergedBranchesResponse, error) { + out := new(ListMergedBranchesResponse) + err := grpc.Invoke(ctx, "/gitaly.RepositoryService/ListMergedBranches", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // Server API for RepositoryService service type RepositoryServiceServer interface { @@ -639,6 +707,7 @@ type RepositoryServiceServer interface { GetArchive(*GetArchiveRequest, RepositoryService_GetArchiveServer) error HasLocalBranches(context.Context, *HasLocalBranchesRequest) (*HasLocalBranchesResponse, error) ChangeStorage(context.Context, *ChangeStorageRequest) (*ChangeStorageResponse, error) + ListMergedBranches(context.Context, *ListMergedBranchesRequest) (*ListMergedBranchesResponse, error) } func RegisterRepositoryServiceServer(s *grpc.Server, srv RepositoryServiceServer) { @@ -846,6 +915,24 @@ func _RepositoryService_ChangeStorage_Handler(srv interface{}, ctx context.Conte return interceptor(ctx, in, info, handler) } +func _RepositoryService_ListMergedBranches_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListMergedBranchesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RepositoryServiceServer).ListMergedBranches(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.RepositoryService/ListMergedBranches", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RepositoryServiceServer).ListMergedBranches(ctx, req.(*ListMergedBranchesRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _RepositoryService_serviceDesc = grpc.ServiceDesc{ ServiceName: "gitaly.RepositoryService", HandlerType: (*RepositoryServiceServer)(nil), @@ -890,6 +977,10 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{ MethodName: "ChangeStorage", Handler: _RepositoryService_ChangeStorage_Handler, }, + { + MethodName: "ListMergedBranches", + Handler: _RepositoryService_ListMergedBranches_Handler, + }, }, Streams: []grpc.StreamDesc{ { @@ -904,58 +995,62 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("repository-service.proto", fileDescriptor8) } var fileDescriptor8 = []byte{ - // 840 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4f, 0x6f, 0xdb, 0x36, - 0x14, 0xb7, 0x9b, 0xc6, 0x4e, 0x5e, 0xd2, 0xc0, 0xe5, 0x92, 0x58, 0x51, 0xda, 0xd5, 0xe3, 0x2e, - 0x3e, 0x6c, 0x46, 0xe1, 0x5e, 0x76, 0x75, 0x82, 0xc6, 0x09, 0xba, 0x06, 0x9b, 0x1a, 0xa0, 0x80, - 0x81, 0x41, 0xa0, 0x65, 0xc6, 0x22, 0x2c, 0x89, 0x1a, 0x49, 0x3b, 0x75, 0xbf, 0xd1, 0x3e, 0xd7, - 0x8e, 0xfb, 0x12, 0x83, 0x28, 0x59, 0x92, 0x2d, 0xa9, 0x17, 0xa1, 0x37, 0xbd, 0x47, 0xf2, 0xf7, - 0xfe, 0xff, 0x9e, 0xc0, 0x10, 0x34, 0xe4, 0x92, 0x29, 0x2e, 0xd6, 0xbf, 0x4a, 0x2a, 0x56, 0xcc, - 0xa1, 0x83, 0x50, 0x70, 0xc5, 0x51, 0x6b, 0xce, 0x14, 0xf1, 0xd6, 0xe6, 0xb1, 0x74, 0x89, 0xa0, - 0xb3, 0x58, 0x8b, 0x3f, 0x42, 0xd7, 0x4a, 0x5f, 0xbc, 0xff, 0xc2, 0xa4, 0x92, 0x16, 0xfd, 0x7b, - 0x49, 0xa5, 0x42, 0x43, 0x80, 0x0c, 0xcc, 0x68, 0xf6, 0x9a, 0xfd, 0xa3, 0x21, 0x1a, 0xc4, 0x28, - 0x83, 0xec, 0x91, 0x95, 0xbb, 0x85, 0x87, 0x60, 0x14, 0xe1, 0x64, 0xc8, 0x03, 0x49, 0xd1, 0x39, - 0xb4, 0xa8, 0xd6, 0x68, 0xac, 0x03, 0x2b, 0x91, 0xf0, 0xbd, 0x7e, 0x43, 0x9c, 0xc5, 0x5d, 0xe0, - 0x08, 0xea, 0xd3, 0x40, 0x11, 0xaf, 0x8e, 0x0f, 0x97, 0x70, 0x51, 0x82, 0x17, 0x3b, 0x81, 0x3d, - 0x78, 0x19, 0x1f, 0xde, 0x2c, 0xbd, 0x3a, 0x56, 0xd0, 0xcf, 0xf0, 0xc2, 0x11, 0x94, 0x28, 0x6a, - 0x4f, 0x99, 0xf2, 0x49, 0x68, 0x3c, 0xd3, 0x41, 0x1d, 0xc7, 0xca, 0x2b, 0xad, 0xc3, 0xa7, 0x80, - 0xf2, 0xd6, 0x12, 0x1f, 0x42, 0x38, 0x1b, 0x13, 0x31, 0x25, 0x73, 0x7a, 0xcd, 0x3d, 0x8f, 0x3a, - 0xea, 0xbb, 0xfb, 0x61, 0xc0, 0xf9, 0xae, 0xc5, 0xc4, 0x97, 0x0f, 0x70, 0x96, 0x01, 0x7f, 0x62, - 0x5f, 0x69, 0x9d, 0xcc, 0xff, 0x02, 0xe7, 0xbb, 0x60, 0x49, 0xed, 0x11, 0x3c, 0x97, 0xec, 0x2b, - 0xd5, 0x38, 0x7b, 0x96, 0xfe, 0xc6, 0x0b, 0xb8, 0x18, 0x85, 0xa1, 0xb7, 0x1e, 0x33, 0x45, 0x94, - 0x12, 0x6c, 0xba, 0x54, 0xb4, 0x4e, 0xf3, 0x21, 0x13, 0x0e, 0x04, 0x5d, 0x31, 0xc9, 0x78, 0xa0, - 0xb3, 0x70, 0x6c, 0xa5, 0x32, 0x7e, 0x05, 0x66, 0x99, 0xb1, 0x24, 0x0b, 0xff, 0x36, 0x01, 0xdd, - 0x50, 0xe5, 0xb8, 0x16, 0xf5, 0xb9, 0xaa, 0x93, 0x83, 0xa8, 0xcb, 0x85, 0x06, 0xd1, 0x2e, 0x1c, - 0x5a, 0x89, 0x84, 0x4e, 0x61, 0xff, 0x91, 0x0b, 0x87, 0x1a, 0x7b, 0xba, 0x3e, 0xb1, 0x80, 0xba, - 0xd0, 0x0e, 0xb8, 0xad, 0xc8, 0x5c, 0x1a, 0xcf, 0xe3, 0xa1, 0x08, 0xf8, 0x03, 0x99, 0x4b, 0x64, - 0x40, 0x5b, 0x31, 0x9f, 0xf2, 0xa5, 0x32, 0xf6, 0x7b, 0xcd, 0xfe, 0xbe, 0xb5, 0x11, 0xa3, 0x27, - 0x52, 0xba, 0xf6, 0x82, 0xae, 0x8d, 0x56, 0x6c, 0x41, 0x4a, 0xf7, 0x03, 0x5d, 0xa3, 0x37, 0x70, - 0xb4, 0x08, 0xf8, 0x53, 0x60, 0xbb, 0x3c, 0x1a, 0xb2, 0xb6, 0x3e, 0x04, 0xad, 0xba, 0x8d, 0x34, - 0xf8, 0x0c, 0x7e, 0xd8, 0x0a, 0x32, 0x09, 0xfe, 0x23, 0x74, 0xaf, 0x75, 0xb3, 0xe4, 0x22, 0xaa, - 0xd1, 0x04, 0x26, 0x18, 0x45, 0xb8, 0xc4, 0xd4, 0x7f, 0x4d, 0x78, 0x39, 0xa6, 0x6a, 0x24, 0x1c, - 0x97, 0xad, 0x6a, 0xa5, 0xf9, 0x12, 0x0e, 0x1d, 0xee, 0xfb, 0x4c, 0xd9, 0x6c, 0x96, 0x64, 0xfa, - 0x20, 0x56, 0xdc, 0xcd, 0xa2, 0x1a, 0x84, 0x82, 0x3e, 0xb2, 0x2f, 0x3a, 0xd9, 0x87, 0x56, 0x22, - 0xa1, 0xdf, 0xa0, 0xf5, 0xc8, 0x85, 0x4f, 0x94, 0x4e, 0xf6, 0xc9, 0xb0, 0xb7, 0x31, 0x52, 0xf0, - 0x69, 0x70, 0xa3, 0xef, 0x59, 0xc9, 0x7d, 0xfc, 0x0e, 0x5a, 0xb1, 0x06, 0xb5, 0x61, 0x6f, 0x72, - 0xf7, 0x47, 0xa7, 0x11, 0x7d, 0x3c, 0x8c, 0xac, 0x4e, 0x13, 0x01, 0xb4, 0x1e, 0x46, 0x96, 0x3d, - 0x9e, 0x74, 0x9e, 0xa1, 0x23, 0x68, 0x47, 0xdf, 0x57, 0x93, 0x61, 0x67, 0x0f, 0xf7, 0x01, 0xe5, - 0x81, 0xb3, 0x51, 0x98, 0x11, 0x45, 0x74, 0x9c, 0xc7, 0x96, 0xfe, 0x8e, 0x4a, 0x70, 0x4b, 0xe4, - 0xef, 0xdc, 0x21, 0xde, 0x95, 0x20, 0x81, 0xe3, 0xd6, 0x1a, 0x04, 0xfc, 0x16, 0x8c, 0x22, 0x5c, - 0x62, 0xfe, 0x14, 0xf6, 0x57, 0xc4, 0x5b, 0xd2, 0x84, 0x84, 0x63, 0x01, 0x2b, 0x38, 0xbd, 0x76, - 0x49, 0x30, 0xa7, 0x9f, 0x14, 0x17, 0x64, 0x5e, 0xab, 0x34, 0x7d, 0xe8, 0x04, 0xf4, 0xc9, 0x96, - 0x31, 0x92, 0x1d, 0x10, 0x7f, 0x33, 0x0b, 0x27, 0x01, 0x7d, 0x4a, 0x0c, 0xdc, 0x13, 0x9f, 0xe2, - 0x2e, 0x9c, 0xed, 0x58, 0x8d, 0x9d, 0x1c, 0xfe, 0xd3, 0xd6, 0x34, 0xbd, 0x61, 0x92, 0x78, 0x8f, - 0xa1, 0xcf, 0xd0, 0xd9, 0x5d, 0x2e, 0xe8, 0x4d, 0xd1, 0x99, 0xad, 0x2d, 0x66, 0xf6, 0xaa, 0x2f, - 0x24, 0x4d, 0xd9, 0x40, 0x93, 0xcd, 0x52, 0xc8, 0x6d, 0x0c, 0x94, 0x7f, 0x58, 0xba, 0x9c, 0xcc, - 0x9f, 0xbe, 0x71, 0x23, 0xc5, 0x7e, 0x0f, 0x90, 0xad, 0x00, 0x74, 0xb1, 0xfd, 0x24, 0xb7, 0x84, - 0x4c, 0xb3, 0xec, 0x28, 0x85, 0xf9, 0x13, 0x4e, 0xb6, 0x19, 0x1c, 0xbd, 0x4e, 0x9b, 0xb7, 0x6c, - 0x97, 0x98, 0x3f, 0x56, 0x1d, 0xe7, 0x21, 0xb7, 0xd9, 0x3a, 0x83, 0x2c, 0x5d, 0x09, 0x19, 0x64, - 0x39, 0xc9, 0xe3, 0x06, 0xfa, 0x0b, 0x50, 0x91, 0x65, 0x51, 0x9a, 0xa7, 0x4a, 0xba, 0x37, 0xf1, - 0xb7, 0xae, 0xa4, 0xf0, 0xb7, 0x70, 0x94, 0x23, 0x30, 0x94, 0x66, 0xac, 0x48, 0xdd, 0xe6, 0x65, - 0xe9, 0x59, 0x8a, 0xf4, 0x19, 0x3a, 0xbb, 0x24, 0x95, 0xb5, 0x52, 0x05, 0x1b, 0x66, 0xad, 0x54, - 0xc9, 0x6f, 0x0d, 0x34, 0x06, 0xc8, 0x66, 0x3e, 0x2b, 0x77, 0x81, 0x60, 0xb2, 0x72, 0x17, 0x29, - 0x02, 0x37, 0xde, 0x36, 0x23, 0x0f, 0x77, 0x67, 0x38, 0xf3, 0xb0, 0x82, 0x2c, 0x32, 0x0f, 0xab, - 0xc6, 0x1f, 0x37, 0xd0, 0x3d, 0xbc, 0xd8, 0x1a, 0x3a, 0xf4, 0x2a, 0x0d, 0xab, 0x84, 0x01, 0xcc, - 0xd7, 0x15, 0xa7, 0x1b, 0xbc, 0x69, 0x4b, 0xff, 0x48, 0xbe, 0xfb, 0x3f, 0x00, 0x00, 0xff, 0xff, - 0xf3, 0x91, 0x30, 0x11, 0x7a, 0x0a, 0x00, 0x00, + // 907 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0xdb, 0x36, + 0x14, 0xb6, 0xe3, 0xc6, 0x4e, 0x5e, 0xd2, 0xc0, 0xe5, 0xf2, 0x43, 0x51, 0xda, 0xd5, 0xe3, 0x2e, + 0x39, 0x6c, 0x41, 0xe1, 0x5e, 0x76, 0x4d, 0x82, 0xc6, 0x09, 0xda, 0x04, 0x9b, 0x1a, 0xa0, 0x40, + 0x80, 0xc1, 0xa0, 0xe5, 0x17, 0x9b, 0x88, 0x2c, 0x7a, 0x24, 0x9d, 0xd4, 0xbd, 0xec, 0xba, 0xff, + 0x73, 0xc7, 0xfd, 0x13, 0x83, 0x28, 0x5a, 0x92, 0x2d, 0xa9, 0x87, 0x69, 0xbd, 0xe9, 0x3d, 0x92, + 0xdf, 0x7b, 0x7c, 0xef, 0xf1, 0xfb, 0x04, 0x8e, 0xc4, 0xa9, 0x50, 0x5c, 0x0b, 0x39, 0xff, 0x59, + 0xa1, 0x7c, 0xe4, 0x3e, 0x9e, 0x4c, 0xa5, 0xd0, 0x82, 0x34, 0x47, 0x5c, 0xb3, 0x60, 0xee, 0x6e, + 0xab, 0x31, 0x93, 0x38, 0x8c, 0xbd, 0xf4, 0x1a, 0x0e, 0xbc, 0xe4, 0xc4, 0xbb, 0xcf, 0x5c, 0x69, + 0xe5, 0xe1, 0x1f, 0x33, 0x54, 0x9a, 0x74, 0x01, 0x52, 0x30, 0xa7, 0xde, 0xa9, 0x1f, 0x6f, 0x75, + 0xc9, 0x49, 0x8c, 0x72, 0x92, 0x1e, 0xf2, 0x32, 0xbb, 0x68, 0x17, 0x9c, 0x3c, 0x9c, 0x9a, 0x8a, + 0x50, 0x21, 0xd9, 0x87, 0x26, 0x1a, 0x8f, 0xc1, 0xda, 0xf0, 0xac, 0x45, 0x6f, 0xcc, 0x19, 0xe6, + 0x3f, 0x5c, 0x85, 0xbe, 0xc4, 0x09, 0x86, 0x9a, 0x05, 0x55, 0x72, 0x38, 0x82, 0xc3, 0x02, 0xbc, + 0x38, 0x09, 0x1a, 0xc0, 0x8b, 0x78, 0xf1, 0x62, 0x16, 0x54, 0x89, 0x42, 0x7e, 0x84, 0xe7, 0xbe, + 0x44, 0xa6, 0xb1, 0x3f, 0xe0, 0x7a, 0xc2, 0xa6, 0xce, 0x9a, 0xb9, 0xd4, 0x76, 0xec, 0x3c, 0x33, + 0x3e, 0xba, 0x0b, 0x24, 0x1b, 0xcd, 0xe6, 0x30, 0x85, 0xbd, 0x1e, 0x93, 0x03, 0x36, 0xc2, 0x73, + 0x11, 0x04, 0xe8, 0xeb, 0x6f, 0x9e, 0x87, 0x03, 0xfb, 0xab, 0x11, 0x6d, 0x2e, 0xef, 0x61, 0x2f, + 0x05, 0xfe, 0xc8, 0xbf, 0x60, 0x95, 0xca, 0xff, 0x04, 0xfb, 0xab, 0x60, 0xb6, 0xf7, 0x04, 0x9e, + 0x29, 0xfe, 0x05, 0x0d, 0x4e, 0xc3, 0x33, 0xdf, 0xf4, 0x01, 0x0e, 0x4f, 0xa7, 0xd3, 0x60, 0xde, + 0xe3, 0x9a, 0x69, 0x2d, 0xf9, 0x60, 0xa6, 0xb1, 0xca, 0xf0, 0x11, 0x17, 0x36, 0x24, 0x3e, 0x72, + 0xc5, 0x45, 0x68, 0xaa, 0xb0, 0xed, 0x25, 0x36, 0x7d, 0x09, 0x6e, 0x51, 0x30, 0x5b, 0x85, 0xbf, + 0xeb, 0x40, 0x2e, 0x50, 0xfb, 0x63, 0x0f, 0x27, 0x42, 0x57, 0xa9, 0x41, 0x34, 0xe5, 0xd2, 0x80, + 0x98, 0x14, 0x36, 0x3d, 0x6b, 0x91, 0x5d, 0x58, 0xbf, 0x17, 0xd2, 0x47, 0xa7, 0x61, 0xfa, 0x13, + 0x1b, 0xe4, 0x00, 0x5a, 0xa1, 0xe8, 0x6b, 0x36, 0x52, 0xce, 0xb3, 0xf8, 0x51, 0x84, 0xe2, 0x96, + 0x8d, 0x14, 0x71, 0xa0, 0xa5, 0xf9, 0x04, 0xc5, 0x4c, 0x3b, 0xeb, 0x9d, 0xfa, 0xf1, 0xba, 0xb7, + 0x30, 0xa3, 0x23, 0x4a, 0x8d, 0xfb, 0x0f, 0x38, 0x77, 0x9a, 0x71, 0x04, 0xa5, 0xc6, 0xef, 0x71, + 0x4e, 0x5e, 0xc3, 0xd6, 0x43, 0x28, 0x9e, 0xc2, 0xfe, 0x58, 0x44, 0x8f, 0xac, 0x65, 0x16, 0xc1, + 0xb8, 0x2e, 0x23, 0x0f, 0xdd, 0x83, 0xef, 0x96, 0x2e, 0x69, 0x2f, 0x7f, 0x0d, 0x07, 0xe7, 0x66, + 0x58, 0x32, 0x37, 0xaa, 0x30, 0x04, 0x2e, 0x38, 0x79, 0x38, 0x1b, 0xea, 0x9f, 0x3a, 0xbc, 0xe8, + 0xa1, 0x3e, 0x95, 0xfe, 0x98, 0x3f, 0x56, 0x2a, 0xf3, 0x11, 0x6c, 0xfa, 0x62, 0x32, 0xe1, 0xba, + 0xcf, 0x87, 0xb6, 0xd2, 0x1b, 0xb1, 0xe3, 0x6a, 0x18, 0xf5, 0x60, 0x2a, 0xf1, 0x9e, 0x7f, 0x36, + 0xc5, 0xde, 0xf4, 0xac, 0x45, 0x7e, 0x81, 0xe6, 0xbd, 0x90, 0x13, 0xa6, 0x4d, 0xb1, 0x77, 0xba, + 0x9d, 0x45, 0x90, 0x5c, 0x4e, 0x27, 0x17, 0x66, 0x9f, 0x67, 0xf7, 0xd3, 0xb7, 0xd0, 0x8c, 0x3d, + 0xa4, 0x05, 0x8d, 0xbb, 0xab, 0x5f, 0xdb, 0xb5, 0xe8, 0xe3, 0xf6, 0xd4, 0x6b, 0xd7, 0x09, 0x40, + 0xf3, 0xf6, 0xd4, 0xeb, 0xf7, 0xee, 0xda, 0x6b, 0x64, 0x0b, 0x5a, 0xd1, 0xf7, 0xd9, 0x5d, 0xb7, + 0xdd, 0xa0, 0xc7, 0x40, 0xb2, 0xc0, 0xe9, 0x53, 0x18, 0x32, 0xcd, 0xcc, 0x3d, 0xb7, 0x3d, 0xf3, + 0x1d, 0xb5, 0xe0, 0x92, 0xa9, 0x0f, 0xc2, 0x67, 0xc1, 0x99, 0x64, 0xa1, 0x3f, 0xae, 0xf4, 0x10, + 0xe8, 0x1b, 0x70, 0xf2, 0x70, 0x36, 0xfc, 0x2e, 0xac, 0x3f, 0xb2, 0x60, 0x86, 0x96, 0x84, 0x63, + 0x83, 0x6a, 0xd8, 0x3d, 0x1f, 0xb3, 0x70, 0x84, 0x1f, 0xb5, 0x90, 0x6c, 0x54, 0xa9, 0x35, 0xc7, + 0xd0, 0x0e, 0xf1, 0xa9, 0xaf, 0x62, 0xa4, 0x7e, 0xc8, 0x26, 0x8b, 0xb7, 0xb0, 0x13, 0xe2, 0x93, + 0x0d, 0x70, 0xc3, 0x26, 0x48, 0x0f, 0x60, 0x6f, 0x25, 0xaa, 0x9d, 0x93, 0x3f, 0xe1, 0xf0, 0x03, + 0x57, 0xfa, 0x1a, 0xe5, 0x08, 0x87, 0xff, 0x43, 0x45, 0xa2, 0xa2, 0xf3, 0x50, 0x0b, 0x9b, 0x87, + 0xf9, 0x8e, 0xe8, 0x62, 0x60, 0xa1, 0x9d, 0x46, 0xa7, 0x11, 0x4d, 0xd0, 0xc2, 0xa6, 0x01, 0xb8, + 0x45, 0x09, 0xd8, 0x1a, 0xfe, 0x47, 0x72, 0x4a, 0xa2, 0xad, 0x2d, 0x47, 0xeb, 0xfe, 0xb5, 0x61, + 0x54, 0x69, 0x41, 0x9c, 0xb1, 0x6c, 0x93, 0x4f, 0xd0, 0x5e, 0xd5, 0x52, 0xf2, 0x3a, 0x1f, 0x65, + 0x49, 0xb4, 0xdd, 0x4e, 0xf9, 0x06, 0x5b, 0xdb, 0x1a, 0xb9, 0x5b, 0x68, 0x60, 0x46, 0x20, 0x49, + 0xf6, 0x60, 0xa1, 0x16, 0xbb, 0x3f, 0x7c, 0x65, 0x47, 0x82, 0xfd, 0x0e, 0x20, 0x55, 0x3c, 0x72, + 0xb8, 0x7c, 0x24, 0xa3, 0xb9, 0xae, 0x5b, 0xb4, 0x94, 0xc0, 0xfc, 0x06, 0x3b, 0xcb, 0x82, 0x45, + 0x5e, 0x25, 0x6f, 0xb5, 0x48, 0x3a, 0xdd, 0xef, 0xcb, 0x96, 0xb3, 0x90, 0xcb, 0xe2, 0x94, 0x42, + 0x16, 0x2a, 0x60, 0x0a, 0x59, 0xac, 0x69, 0xb4, 0x46, 0x7e, 0x07, 0x92, 0x17, 0x15, 0x92, 0xd4, + 0xa9, 0x54, 0xdd, 0x5c, 0xfa, 0xb5, 0x2d, 0x09, 0xfc, 0x25, 0x6c, 0x65, 0xf8, 0x9a, 0x24, 0x15, + 0xcb, 0x2b, 0x95, 0x7b, 0x54, 0xb8, 0x96, 0x20, 0x7d, 0x82, 0xf6, 0x2a, 0x27, 0xa7, 0xa3, 0x54, + 0x42, 0xfe, 0xe9, 0x28, 0x95, 0xd2, 0x79, 0x8d, 0xf4, 0x00, 0x52, 0x8a, 0x4b, 0xdb, 0x9d, 0xe3, + 0xd3, 0xb4, 0xdd, 0x79, 0x46, 0xa4, 0xb5, 0x37, 0xf5, 0x28, 0xc3, 0x55, 0xca, 0x4a, 0x33, 0x2c, + 0xe1, 0xc6, 0x34, 0xc3, 0x32, 0xb6, 0xa3, 0x35, 0x72, 0x03, 0xcf, 0x97, 0x38, 0x86, 0xbc, 0x4c, + 0xae, 0x55, 0x40, 0x78, 0xee, 0xab, 0x92, 0xd5, 0x6c, 0xcf, 0xf3, 0xcc, 0x90, 0xf6, 0xbc, 0x94, + 0xb6, 0xd2, 0x9e, 0x97, 0x13, 0x0b, 0xad, 0x0d, 0x9a, 0xe6, 0xb7, 0xfc, 0xed, 0xbf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x62, 0x0f, 0x63, 0x66, 0xc8, 0x0b, 0x00, 0x00, } diff --git a/repository-service.proto b/repository-service.proto index 9c94e9d9a37af0e1b5dad1ecc43fbe9405cbdbc7..c72fbd69755a11e08638dee64b48b0cb4376dff5 100644 --- a/repository-service.proto +++ b/repository-service.proto @@ -16,6 +16,7 @@ service RepositoryService { rpc GetArchive(GetArchiveRequest) returns (stream GetArchiveResponse) {} rpc HasLocalBranches(HasLocalBranchesRequest) returns (HasLocalBranchesResponse) {} rpc ChangeStorage(ChangeStorageRequest) returns (ChangeStorageResponse) {} + rpc ListMergedBranches(ListMergedBranchesRequest) returns (ListMergedBranchesResponse) {} } message RepositoryExistsRequest { @@ -112,3 +113,14 @@ message ChangeStorageRequest { } message ChangeStorageResponse {} + +message ListMergedBranchesRequest { + Repository repository = 1; + string into = 2; + repeated string branches = 3; +} + +message ListMergedBranchesResponse { + Repository repository = 1; + repeated string branches = 2; +} diff --git a/ruby/lib/gitaly/repository-service_pb.rb b/ruby/lib/gitaly/repository-service_pb.rb index bb5478715d4b582fd5636a2dbce1909808094d91..046c384a2320273938de9b1232c7aa80a82424d7 100644 --- a/ruby/lib/gitaly/repository-service_pb.rb +++ b/ruby/lib/gitaly/repository-service_pb.rb @@ -83,6 +83,15 @@ Google::Protobuf::DescriptorPool.generated_pool.build do end add_message "gitaly.ChangeStorageResponse" do end + add_message "gitaly.ListMergedBranchesRequest" do + optional :repository, :message, 1, "gitaly.Repository" + optional :into, :string, 2 + repeated :branches, :string, 3 + end + add_message "gitaly.ListMergedBranchesResponse" do + optional :repository, :message, 1, "gitaly.Repository" + repeated :branches, :string, 2 + end end module Gitaly @@ -109,4 +118,6 @@ module Gitaly HasLocalBranchesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.HasLocalBranchesResponse").msgclass ChangeStorageRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ChangeStorageRequest").msgclass ChangeStorageResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ChangeStorageResponse").msgclass + ListMergedBranchesRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListMergedBranchesRequest").msgclass + ListMergedBranchesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListMergedBranchesResponse").msgclass end diff --git a/ruby/lib/gitaly/repository-service_services_pb.rb b/ruby/lib/gitaly/repository-service_services_pb.rb index 10ba8d42b5e45037049e98208da9e8f8da0c116c..6f3f668bdd70abc3d7d346b562b7c01a8e6154c4 100644 --- a/ruby/lib/gitaly/repository-service_services_pb.rb +++ b/ruby/lib/gitaly/repository-service_services_pb.rb @@ -25,6 +25,7 @@ module Gitaly rpc :GetArchive, GetArchiveRequest, stream(GetArchiveResponse) rpc :HasLocalBranches, HasLocalBranchesRequest, HasLocalBranchesResponse rpc :ChangeStorage, ChangeStorageRequest, ChangeStorageResponse + rpc :ListMergedBranches, ListMergedBranchesRequest, ListMergedBranchesResponse end Stub = Service.rpc_stub_class