diff options
20 files changed, 1608 insertions, 266 deletions
@@ -1,3 +1,12 @@ +v5.5.0 + - Support unhiding of all references for Geo nodes + +v5.4.0 + - Update Gitaly vendoring to use new RPC calls instead of old deprecated ones + +v5.3.1 + - Gracefully handle internal API errors when getting merge request URLs + v5.3.0 - Add ability to have git-receive-pack and git-upload-pack to go over Gitaly @@ -1 +1 @@ -5.3.0 +5.5.0 diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION index a803cc2..5a03fb7 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION +++ b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION @@ -1 +1 @@ -0.14.0 +0.20.0 diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go index a2ce5b1..2d7224e 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go @@ -19,6 +19,8 @@ It is generated from these files: It has these top-level messages: GetBlobRequest GetBlobResponse + CommitStatsRequest + CommitStatsResponse CommitIsAncestorRequest CommitIsAncestorResponse TreeEntryRequest @@ -27,6 +29,17 @@ It has these top-level messages: CommitsBetweenResponse CountCommitsRequest CountCommitsResponse + TreeEntry + GetTreeEntriesRequest + GetTreeEntriesResponse + ListFilesRequest + ListFilesResponse + FindCommitRequest + FindCommitResponse + FindAllCommitsRequest + FindAllCommitsResponse + CommitLanguagesRequest + CommitLanguagesResponse CommitDiffRequest CommitDiffResponse CommitDeltaRequest @@ -46,8 +59,16 @@ It has these top-level messages: FindLocalBranchesResponse FindLocalBranchResponse FindLocalBranchCommitAuthor + FindAllBranchesRequest + FindAllBranchesResponse RepositoryExistsRequest RepositoryExistsResponse + RepackIncrementalRequest + RepackIncrementalResponse + RepackFullRequest + RepackFullResponse + GarbageCollectRequest + GarbageCollectResponse Repository GitCommit CommitAuthor diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go index bbce88f..69e2eb9 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go @@ -43,7 +43,114 @@ func (x TreeEntryResponse_ObjectType) String() string { return proto.EnumName(TreeEntryResponse_ObjectType_name, int32(x)) } func (TreeEntryResponse_ObjectType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor1, []int{3, 0} + return fileDescriptor1, []int{5, 0} +} + +type TreeEntry_EntryType int32 + +const ( + TreeEntry_BLOB TreeEntry_EntryType = 0 + TreeEntry_TREE TreeEntry_EntryType = 1 + TreeEntry_COMMIT TreeEntry_EntryType = 3 +) + +var TreeEntry_EntryType_name = map[int32]string{ + 0: "BLOB", + 1: "TREE", + 3: "COMMIT", +} +var TreeEntry_EntryType_value = map[string]int32{ + "BLOB": 0, + "TREE": 1, + "COMMIT": 3, +} + +func (x TreeEntry_EntryType) String() string { + return proto.EnumName(TreeEntry_EntryType_name, int32(x)) +} +func (TreeEntry_EntryType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{10, 0} } + +type FindAllCommitsRequest_Order int32 + +const ( + FindAllCommitsRequest_NONE FindAllCommitsRequest_Order = 0 + FindAllCommitsRequest_TOPO FindAllCommitsRequest_Order = 1 + FindAllCommitsRequest_DATE FindAllCommitsRequest_Order = 2 +) + +var FindAllCommitsRequest_Order_name = map[int32]string{ + 0: "NONE", + 1: "TOPO", + 2: "DATE", +} +var FindAllCommitsRequest_Order_value = map[string]int32{ + "NONE": 0, + "TOPO": 1, + "DATE": 2, +} + +func (x FindAllCommitsRequest_Order) String() string { + return proto.EnumName(FindAllCommitsRequest_Order_name, int32(x)) +} +func (FindAllCommitsRequest_Order) EnumDescriptor() ([]byte, []int) { + return fileDescriptor1, []int{17, 0} +} + +type CommitStatsRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + Revision []byte `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"` +} + +func (m *CommitStatsRequest) Reset() { *m = CommitStatsRequest{} } +func (m *CommitStatsRequest) String() string { return proto.CompactTextString(m) } +func (*CommitStatsRequest) ProtoMessage() {} +func (*CommitStatsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } + +func (m *CommitStatsRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *CommitStatsRequest) GetRevision() []byte { + if m != nil { + return m.Revision + } + return nil +} + +type CommitStatsResponse struct { + // OID is the commit. Empty means not found + Oid string `protobuf:"bytes,1,opt,name=oid" json:"oid,omitempty"` + Additions int32 `protobuf:"varint,2,opt,name=additions" json:"additions,omitempty"` + Deletions int32 `protobuf:"varint,3,opt,name=deletions" json:"deletions,omitempty"` +} + +func (m *CommitStatsResponse) Reset() { *m = CommitStatsResponse{} } +func (m *CommitStatsResponse) String() string { return proto.CompactTextString(m) } +func (*CommitStatsResponse) ProtoMessage() {} +func (*CommitStatsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } + +func (m *CommitStatsResponse) GetOid() string { + if m != nil { + return m.Oid + } + return "" +} + +func (m *CommitStatsResponse) GetAdditions() int32 { + if m != nil { + return m.Additions + } + return 0 +} + +func (m *CommitStatsResponse) GetDeletions() int32 { + if m != nil { + return m.Deletions + } + return 0 } type CommitIsAncestorRequest struct { @@ -55,7 +162,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 fileDescriptor1, []int{0} } +func (*CommitIsAncestorRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } func (m *CommitIsAncestorRequest) GetRepository() *Repository { if m != nil { @@ -85,7 +192,7 @@ type CommitIsAncestorResponse struct { func (m *CommitIsAncestorResponse) Reset() { *m = CommitIsAncestorResponse{} } func (m *CommitIsAncestorResponse) String() string { return proto.CompactTextString(m) } func (*CommitIsAncestorResponse) ProtoMessage() {} -func (*CommitIsAncestorResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } +func (*CommitIsAncestorResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} } func (m *CommitIsAncestorResponse) GetValue() bool { if m != nil { @@ -106,7 +213,7 @@ type TreeEntryRequest struct { func (m *TreeEntryRequest) Reset() { *m = TreeEntryRequest{} } func (m *TreeEntryRequest) String() string { return proto.CompactTextString(m) } func (*TreeEntryRequest) ProtoMessage() {} -func (*TreeEntryRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } +func (*TreeEntryRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} } func (m *TreeEntryRequest) GetRepository() *Repository { if m != nil { @@ -150,7 +257,7 @@ type TreeEntryResponse struct { func (m *TreeEntryResponse) Reset() { *m = TreeEntryResponse{} } func (m *TreeEntryResponse) String() string { return proto.CompactTextString(m) } func (*TreeEntryResponse) ProtoMessage() {} -func (*TreeEntryResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} } +func (*TreeEntryResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} } func (m *TreeEntryResponse) GetType() TreeEntryResponse_ObjectType { if m != nil { @@ -196,7 +303,7 @@ type CommitsBetweenRequest struct { func (m *CommitsBetweenRequest) Reset() { *m = CommitsBetweenRequest{} } func (m *CommitsBetweenRequest) String() string { return proto.CompactTextString(m) } func (*CommitsBetweenRequest) ProtoMessage() {} -func (*CommitsBetweenRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} } +func (*CommitsBetweenRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} } func (m *CommitsBetweenRequest) GetRepository() *Repository { if m != nil { @@ -226,7 +333,7 @@ type CommitsBetweenResponse struct { func (m *CommitsBetweenResponse) Reset() { *m = CommitsBetweenResponse{} } func (m *CommitsBetweenResponse) String() string { return proto.CompactTextString(m) } func (*CommitsBetweenResponse) ProtoMessage() {} -func (*CommitsBetweenResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} } +func (*CommitsBetweenResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} } func (m *CommitsBetweenResponse) GetCommits() []*GitCommit { if m != nil { @@ -243,7 +350,7 @@ type CountCommitsRequest struct { func (m *CountCommitsRequest) Reset() { *m = CountCommitsRequest{} } func (m *CountCommitsRequest) String() string { return proto.CompactTextString(m) } func (*CountCommitsRequest) ProtoMessage() {} -func (*CountCommitsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} } +func (*CountCommitsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} } func (m *CountCommitsRequest) GetRepository() *Repository { if m != nil { @@ -266,7 +373,7 @@ type CountCommitsResponse struct { func (m *CountCommitsResponse) Reset() { *m = CountCommitsResponse{} } func (m *CountCommitsResponse) String() string { return proto.CompactTextString(m) } func (*CountCommitsResponse) ProtoMessage() {} -func (*CountCommitsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} } +func (*CountCommitsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} } func (m *CountCommitsResponse) GetCount() int32 { if m != nil { @@ -275,7 +382,341 @@ func (m *CountCommitsResponse) GetCount() int32 { return 0 } +type TreeEntry struct { + // OID of the object this tree entry points to + Oid string `protobuf:"bytes,1,opt,name=oid" json:"oid,omitempty"` + // OID of the tree attached to commit_oid + RootOid string `protobuf:"bytes,2,opt,name=root_oid,json=rootOid" json:"root_oid,omitempty"` + // Path relative to repository root + Path []byte `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` + Type TreeEntry_EntryType `protobuf:"varint,4,opt,name=type,enum=gitaly.TreeEntry_EntryType" json:"type,omitempty"` + // File mode e.g. 0644 + Mode int32 `protobuf:"varint,5,opt,name=mode" json:"mode,omitempty"` + // The commit object via which this entry was retrieved + CommitOid string `protobuf:"bytes,6,opt,name=commit_oid,json=commitOid" json:"commit_oid,omitempty"` +} + +func (m *TreeEntry) Reset() { *m = TreeEntry{} } +func (m *TreeEntry) String() string { return proto.CompactTextString(m) } +func (*TreeEntry) ProtoMessage() {} +func (*TreeEntry) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} } + +func (m *TreeEntry) GetOid() string { + if m != nil { + return m.Oid + } + return "" +} + +func (m *TreeEntry) GetRootOid() string { + if m != nil { + return m.RootOid + } + return "" +} + +func (m *TreeEntry) GetPath() []byte { + if m != nil { + return m.Path + } + return nil +} + +func (m *TreeEntry) GetType() TreeEntry_EntryType { + if m != nil { + return m.Type + } + return TreeEntry_BLOB +} + +func (m *TreeEntry) GetMode() int32 { + if m != nil { + return m.Mode + } + return 0 +} + +func (m *TreeEntry) GetCommitOid() string { + if m != nil { + return m.CommitOid + } + return "" +} + +type GetTreeEntriesRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + Revision []byte `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"` + Path []byte `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` +} + +func (m *GetTreeEntriesRequest) Reset() { *m = GetTreeEntriesRequest{} } +func (m *GetTreeEntriesRequest) String() string { return proto.CompactTextString(m) } +func (*GetTreeEntriesRequest) ProtoMessage() {} +func (*GetTreeEntriesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} } + +func (m *GetTreeEntriesRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *GetTreeEntriesRequest) GetRevision() []byte { + if m != nil { + return m.Revision + } + return nil +} + +func (m *GetTreeEntriesRequest) GetPath() []byte { + if m != nil { + return m.Path + } + return nil +} + +type GetTreeEntriesResponse struct { + Entries []*TreeEntry `protobuf:"bytes,1,rep,name=entries" json:"entries,omitempty"` +} + +func (m *GetTreeEntriesResponse) Reset() { *m = GetTreeEntriesResponse{} } +func (m *GetTreeEntriesResponse) String() string { return proto.CompactTextString(m) } +func (*GetTreeEntriesResponse) ProtoMessage() {} +func (*GetTreeEntriesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} } + +func (m *GetTreeEntriesResponse) GetEntries() []*TreeEntry { + if m != nil { + return m.Entries + } + return nil +} + +type ListFilesRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + Revision []byte `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"` +} + +func (m *ListFilesRequest) Reset() { *m = ListFilesRequest{} } +func (m *ListFilesRequest) String() string { return proto.CompactTextString(m) } +func (*ListFilesRequest) ProtoMessage() {} +func (*ListFilesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} } + +func (m *ListFilesRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *ListFilesRequest) GetRevision() []byte { + if m != nil { + return m.Revision + } + return nil +} + +// A single 'page' of the paginated response +type ListFilesResponse struct { + // Remember to force encoding utf-8 on the client side + Paths [][]byte `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"` +} + +func (m *ListFilesResponse) Reset() { *m = ListFilesResponse{} } +func (m *ListFilesResponse) String() string { return proto.CompactTextString(m) } +func (*ListFilesResponse) ProtoMessage() {} +func (*ListFilesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} } + +func (m *ListFilesResponse) GetPaths() [][]byte { + if m != nil { + return m.Paths + } + return nil +} + +type FindCommitRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + Revision []byte `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"` +} + +func (m *FindCommitRequest) Reset() { *m = FindCommitRequest{} } +func (m *FindCommitRequest) String() string { return proto.CompactTextString(m) } +func (*FindCommitRequest) ProtoMessage() {} +func (*FindCommitRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} } + +func (m *FindCommitRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *FindCommitRequest) GetRevision() []byte { + if m != nil { + return m.Revision + } + return nil +} + +type FindCommitResponse struct { + // commit is nil when the commit was not found + Commit *GitCommit `protobuf:"bytes,1,opt,name=commit" json:"commit,omitempty"` +} + +func (m *FindCommitResponse) Reset() { *m = FindCommitResponse{} } +func (m *FindCommitResponse) String() string { return proto.CompactTextString(m) } +func (*FindCommitResponse) ProtoMessage() {} +func (*FindCommitResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} } + +func (m *FindCommitResponse) GetCommit() *GitCommit { + if m != nil { + return m.Commit + } + return nil +} + +type FindAllCommitsRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + // When nil, return all commits reachable by any branch in the repo + Revision []byte `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"` + MaxCount int32 `protobuf:"varint,3,opt,name=max_count,json=maxCount" json:"max_count,omitempty"` + Skip int32 `protobuf:"varint,4,opt,name=skip" json:"skip,omitempty"` + Order FindAllCommitsRequest_Order `protobuf:"varint,5,opt,name=order,enum=gitaly.FindAllCommitsRequest_Order" json:"order,omitempty"` +} + +func (m *FindAllCommitsRequest) Reset() { *m = FindAllCommitsRequest{} } +func (m *FindAllCommitsRequest) String() string { return proto.CompactTextString(m) } +func (*FindAllCommitsRequest) ProtoMessage() {} +func (*FindAllCommitsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{17} } + +func (m *FindAllCommitsRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *FindAllCommitsRequest) GetRevision() []byte { + if m != nil { + return m.Revision + } + return nil +} + +func (m *FindAllCommitsRequest) GetMaxCount() int32 { + if m != nil { + return m.MaxCount + } + return 0 +} + +func (m *FindAllCommitsRequest) GetSkip() int32 { + if m != nil { + return m.Skip + } + return 0 +} + +func (m *FindAllCommitsRequest) GetOrder() FindAllCommitsRequest_Order { + if m != nil { + return m.Order + } + return FindAllCommitsRequest_NONE +} + +// A single 'page' of the result set +type FindAllCommitsResponse struct { + Commits []*GitCommit `protobuf:"bytes,1,rep,name=commits" json:"commits,omitempty"` +} + +func (m *FindAllCommitsResponse) Reset() { *m = FindAllCommitsResponse{} } +func (m *FindAllCommitsResponse) String() string { return proto.CompactTextString(m) } +func (*FindAllCommitsResponse) ProtoMessage() {} +func (*FindAllCommitsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{18} } + +func (m *FindAllCommitsResponse) GetCommits() []*GitCommit { + if m != nil { + return m.Commits + } + return nil +} + +type CommitLanguagesRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + Revision []byte `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"` +} + +func (m *CommitLanguagesRequest) Reset() { *m = CommitLanguagesRequest{} } +func (m *CommitLanguagesRequest) String() string { return proto.CompactTextString(m) } +func (*CommitLanguagesRequest) ProtoMessage() {} +func (*CommitLanguagesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{19} } + +func (m *CommitLanguagesRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *CommitLanguagesRequest) GetRevision() []byte { + if m != nil { + return m.Revision + } + return nil +} + +type CommitLanguagesResponse struct { + Languages []*CommitLanguagesResponse_Language `protobuf:"bytes,1,rep,name=languages" json:"languages,omitempty"` +} + +func (m *CommitLanguagesResponse) Reset() { *m = CommitLanguagesResponse{} } +func (m *CommitLanguagesResponse) String() string { return proto.CompactTextString(m) } +func (*CommitLanguagesResponse) ProtoMessage() {} +func (*CommitLanguagesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{20} } + +func (m *CommitLanguagesResponse) GetLanguages() []*CommitLanguagesResponse_Language { + if m != nil { + return m.Languages + } + return nil +} + +type CommitLanguagesResponse_Language struct { + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Share float32 `protobuf:"fixed32,2,opt,name=share" json:"share,omitempty"` + Color string `protobuf:"bytes,3,opt,name=color" json:"color,omitempty"` +} + +func (m *CommitLanguagesResponse_Language) Reset() { *m = CommitLanguagesResponse_Language{} } +func (m *CommitLanguagesResponse_Language) String() string { return proto.CompactTextString(m) } +func (*CommitLanguagesResponse_Language) ProtoMessage() {} +func (*CommitLanguagesResponse_Language) Descriptor() ([]byte, []int) { + return fileDescriptor1, []int{20, 0} +} + +func (m *CommitLanguagesResponse_Language) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *CommitLanguagesResponse_Language) GetShare() float32 { + if m != nil { + return m.Share + } + return 0 +} + +func (m *CommitLanguagesResponse_Language) GetColor() string { + if m != nil { + return m.Color + } + return "" +} + func init() { + proto.RegisterType((*CommitStatsRequest)(nil), "gitaly.CommitStatsRequest") + proto.RegisterType((*CommitStatsResponse)(nil), "gitaly.CommitStatsResponse") proto.RegisterType((*CommitIsAncestorRequest)(nil), "gitaly.CommitIsAncestorRequest") proto.RegisterType((*CommitIsAncestorResponse)(nil), "gitaly.CommitIsAncestorResponse") proto.RegisterType((*TreeEntryRequest)(nil), "gitaly.TreeEntryRequest") @@ -284,7 +725,21 @@ func init() { proto.RegisterType((*CommitsBetweenResponse)(nil), "gitaly.CommitsBetweenResponse") proto.RegisterType((*CountCommitsRequest)(nil), "gitaly.CountCommitsRequest") proto.RegisterType((*CountCommitsResponse)(nil), "gitaly.CountCommitsResponse") + proto.RegisterType((*TreeEntry)(nil), "gitaly.TreeEntry") + proto.RegisterType((*GetTreeEntriesRequest)(nil), "gitaly.GetTreeEntriesRequest") + proto.RegisterType((*GetTreeEntriesResponse)(nil), "gitaly.GetTreeEntriesResponse") + proto.RegisterType((*ListFilesRequest)(nil), "gitaly.ListFilesRequest") + proto.RegisterType((*ListFilesResponse)(nil), "gitaly.ListFilesResponse") + proto.RegisterType((*FindCommitRequest)(nil), "gitaly.FindCommitRequest") + proto.RegisterType((*FindCommitResponse)(nil), "gitaly.FindCommitResponse") + proto.RegisterType((*FindAllCommitsRequest)(nil), "gitaly.FindAllCommitsRequest") + proto.RegisterType((*FindAllCommitsResponse)(nil), "gitaly.FindAllCommitsResponse") + proto.RegisterType((*CommitLanguagesRequest)(nil), "gitaly.CommitLanguagesRequest") + proto.RegisterType((*CommitLanguagesResponse)(nil), "gitaly.CommitLanguagesResponse") + proto.RegisterType((*CommitLanguagesResponse_Language)(nil), "gitaly.CommitLanguagesResponse.Language") proto.RegisterEnum("gitaly.TreeEntryResponse_ObjectType", TreeEntryResponse_ObjectType_name, TreeEntryResponse_ObjectType_value) + proto.RegisterEnum("gitaly.TreeEntry_EntryType", TreeEntry_EntryType_name, TreeEntry_EntryType_value) + proto.RegisterEnum("gitaly.FindAllCommitsRequest_Order", FindAllCommitsRequest_Order_name, FindAllCommitsRequest_Order_value) } // Reference imports to suppress errors if they are not otherwise used. @@ -302,6 +757,13 @@ type CommitServiceClient interface { TreeEntry(ctx context.Context, in *TreeEntryRequest, opts ...grpc.CallOption) (CommitService_TreeEntryClient, error) CommitsBetween(ctx context.Context, in *CommitsBetweenRequest, opts ...grpc.CallOption) (CommitService_CommitsBetweenClient, error) CountCommits(ctx context.Context, in *CountCommitsRequest, opts ...grpc.CallOption) (*CountCommitsResponse, error) + GetTreeEntries(ctx context.Context, in *GetTreeEntriesRequest, opts ...grpc.CallOption) (CommitService_GetTreeEntriesClient, error) + ListFiles(ctx context.Context, in *ListFilesRequest, opts ...grpc.CallOption) (CommitService_ListFilesClient, error) + FindCommit(ctx context.Context, in *FindCommitRequest, opts ...grpc.CallOption) (*FindCommitResponse, error) + CommitStats(ctx context.Context, in *CommitStatsRequest, opts ...grpc.CallOption) (*CommitStatsResponse, error) + // Use a stream to paginate the result set + FindAllCommits(ctx context.Context, in *FindAllCommitsRequest, opts ...grpc.CallOption) (CommitService_FindAllCommitsClient, error) + CommitLanguages(ctx context.Context, in *CommitLanguagesRequest, opts ...grpc.CallOption) (*CommitLanguagesResponse, error) } type commitServiceClient struct { @@ -394,6 +856,129 @@ func (c *commitServiceClient) CountCommits(ctx context.Context, in *CountCommits return out, nil } +func (c *commitServiceClient) GetTreeEntries(ctx context.Context, in *GetTreeEntriesRequest, opts ...grpc.CallOption) (CommitService_GetTreeEntriesClient, error) { + stream, err := grpc.NewClientStream(ctx, &_CommitService_serviceDesc.Streams[2], c.cc, "/gitaly.CommitService/GetTreeEntries", opts...) + if err != nil { + return nil, err + } + x := &commitServiceGetTreeEntriesClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type CommitService_GetTreeEntriesClient interface { + Recv() (*GetTreeEntriesResponse, error) + grpc.ClientStream +} + +type commitServiceGetTreeEntriesClient struct { + grpc.ClientStream +} + +func (x *commitServiceGetTreeEntriesClient) Recv() (*GetTreeEntriesResponse, error) { + m := new(GetTreeEntriesResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +func (c *commitServiceClient) ListFiles(ctx context.Context, in *ListFilesRequest, opts ...grpc.CallOption) (CommitService_ListFilesClient, error) { + stream, err := grpc.NewClientStream(ctx, &_CommitService_serviceDesc.Streams[3], c.cc, "/gitaly.CommitService/ListFiles", opts...) + if err != nil { + return nil, err + } + x := &commitServiceListFilesClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type CommitService_ListFilesClient interface { + Recv() (*ListFilesResponse, error) + grpc.ClientStream +} + +type commitServiceListFilesClient struct { + grpc.ClientStream +} + +func (x *commitServiceListFilesClient) Recv() (*ListFilesResponse, error) { + m := new(ListFilesResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +func (c *commitServiceClient) FindCommit(ctx context.Context, in *FindCommitRequest, opts ...grpc.CallOption) (*FindCommitResponse, error) { + out := new(FindCommitResponse) + err := grpc.Invoke(ctx, "/gitaly.CommitService/FindCommit", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *commitServiceClient) CommitStats(ctx context.Context, in *CommitStatsRequest, opts ...grpc.CallOption) (*CommitStatsResponse, error) { + out := new(CommitStatsResponse) + err := grpc.Invoke(ctx, "/gitaly.CommitService/CommitStats", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *commitServiceClient) FindAllCommits(ctx context.Context, in *FindAllCommitsRequest, opts ...grpc.CallOption) (CommitService_FindAllCommitsClient, error) { + stream, err := grpc.NewClientStream(ctx, &_CommitService_serviceDesc.Streams[4], c.cc, "/gitaly.CommitService/FindAllCommits", opts...) + if err != nil { + return nil, err + } + x := &commitServiceFindAllCommitsClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type CommitService_FindAllCommitsClient interface { + Recv() (*FindAllCommitsResponse, error) + grpc.ClientStream +} + +type commitServiceFindAllCommitsClient struct { + grpc.ClientStream +} + +func (x *commitServiceFindAllCommitsClient) Recv() (*FindAllCommitsResponse, error) { + m := new(FindAllCommitsResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +func (c *commitServiceClient) CommitLanguages(ctx context.Context, in *CommitLanguagesRequest, opts ...grpc.CallOption) (*CommitLanguagesResponse, error) { + out := new(CommitLanguagesResponse) + err := grpc.Invoke(ctx, "/gitaly.CommitService/CommitLanguages", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // Server API for CommitService service type CommitServiceServer interface { @@ -401,6 +986,13 @@ type CommitServiceServer interface { TreeEntry(*TreeEntryRequest, CommitService_TreeEntryServer) error CommitsBetween(*CommitsBetweenRequest, CommitService_CommitsBetweenServer) error CountCommits(context.Context, *CountCommitsRequest) (*CountCommitsResponse, error) + GetTreeEntries(*GetTreeEntriesRequest, CommitService_GetTreeEntriesServer) error + ListFiles(*ListFilesRequest, CommitService_ListFilesServer) error + FindCommit(context.Context, *FindCommitRequest) (*FindCommitResponse, error) + CommitStats(context.Context, *CommitStatsRequest) (*CommitStatsResponse, error) + // Use a stream to paginate the result set + FindAllCommits(*FindAllCommitsRequest, CommitService_FindAllCommitsServer) error + CommitLanguages(context.Context, *CommitLanguagesRequest) (*CommitLanguagesResponse, error) } func RegisterCommitServiceServer(s *grpc.Server, srv CommitServiceServer) { @@ -485,6 +1077,123 @@ func _CommitService_CountCommits_Handler(srv interface{}, ctx context.Context, d return interceptor(ctx, in, info, handler) } +func _CommitService_GetTreeEntries_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(GetTreeEntriesRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(CommitServiceServer).GetTreeEntries(m, &commitServiceGetTreeEntriesServer{stream}) +} + +type CommitService_GetTreeEntriesServer interface { + Send(*GetTreeEntriesResponse) error + grpc.ServerStream +} + +type commitServiceGetTreeEntriesServer struct { + grpc.ServerStream +} + +func (x *commitServiceGetTreeEntriesServer) Send(m *GetTreeEntriesResponse) error { + return x.ServerStream.SendMsg(m) +} + +func _CommitService_ListFiles_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(ListFilesRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(CommitServiceServer).ListFiles(m, &commitServiceListFilesServer{stream}) +} + +type CommitService_ListFilesServer interface { + Send(*ListFilesResponse) error + grpc.ServerStream +} + +type commitServiceListFilesServer struct { + grpc.ServerStream +} + +func (x *commitServiceListFilesServer) Send(m *ListFilesResponse) error { + return x.ServerStream.SendMsg(m) +} + +func _CommitService_FindCommit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindCommitRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(CommitServiceServer).FindCommit(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.CommitService/FindCommit", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(CommitServiceServer).FindCommit(ctx, req.(*FindCommitRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _CommitService_CommitStats_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CommitStatsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(CommitServiceServer).CommitStats(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.CommitService/CommitStats", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(CommitServiceServer).CommitStats(ctx, req.(*CommitStatsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _CommitService_FindAllCommits_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(FindAllCommitsRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(CommitServiceServer).FindAllCommits(m, &commitServiceFindAllCommitsServer{stream}) +} + +type CommitService_FindAllCommitsServer interface { + Send(*FindAllCommitsResponse) error + grpc.ServerStream +} + +type commitServiceFindAllCommitsServer struct { + grpc.ServerStream +} + +func (x *commitServiceFindAllCommitsServer) Send(m *FindAllCommitsResponse) error { + return x.ServerStream.SendMsg(m) +} + +func _CommitService_CommitLanguages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CommitLanguagesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(CommitServiceServer).CommitLanguages(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.CommitService/CommitLanguages", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(CommitServiceServer).CommitLanguages(ctx, req.(*CommitLanguagesRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _CommitService_serviceDesc = grpc.ServiceDesc{ ServiceName: "gitaly.CommitService", HandlerType: (*CommitServiceServer)(nil), @@ -497,6 +1206,18 @@ var _CommitService_serviceDesc = grpc.ServiceDesc{ MethodName: "CountCommits", Handler: _CommitService_CountCommits_Handler, }, + { + MethodName: "FindCommit", + Handler: _CommitService_FindCommit_Handler, + }, + { + MethodName: "CommitStats", + Handler: _CommitService_CommitStats_Handler, + }, + { + MethodName: "CommitLanguages", + Handler: _CommitService_CommitLanguages_Handler, + }, }, Streams: []grpc.StreamDesc{ { @@ -509,6 +1230,21 @@ var _CommitService_serviceDesc = grpc.ServiceDesc{ Handler: _CommitService_CommitsBetween_Handler, ServerStreams: true, }, + { + StreamName: "GetTreeEntries", + Handler: _CommitService_GetTreeEntries_Handler, + ServerStreams: true, + }, + { + StreamName: "ListFiles", + Handler: _CommitService_ListFiles_Handler, + ServerStreams: true, + }, + { + StreamName: "FindAllCommits", + Handler: _CommitService_FindAllCommits_Handler, + ServerStreams: true, + }, }, Metadata: "commit.proto", } @@ -516,39 +1252,68 @@ var _CommitService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("commit.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 532 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x5b, 0x6b, 0x13, 0x41, - 0x14, 0xc7, 0xbb, 0xd9, 0xdc, 0x7a, 0x12, 0xc3, 0xf6, 0x58, 0x75, 0x1b, 0x2f, 0x0d, 0x83, 0x0f, - 0x01, 0x25, 0x94, 0x88, 0xe0, 0x6b, 0x13, 0x43, 0x09, 0x5a, 0x02, 0xd3, 0x80, 0x8f, 0xb2, 0xdd, - 0x1d, 0xcd, 0x48, 0xb2, 0xb3, 0xce, 0x4c, 0x22, 0xf1, 0x1b, 0x08, 0x7e, 0x38, 0xf1, 0x13, 0xc9, - 0xce, 0xec, 0xe6, 0xda, 0x3c, 0x15, 0xdf, 0xce, 0x6d, 0xce, 0xf9, 0x71, 0xce, 0x7f, 0x17, 0xea, - 0xa1, 0x98, 0xcd, 0xb8, 0xee, 0x24, 0x52, 0x68, 0x81, 0xe5, 0xaf, 0x5c, 0x07, 0xd3, 0x65, 0xb3, - 0xae, 0x26, 0x81, 0x64, 0x91, 0x8d, 0x92, 0x5f, 0x0e, 0x3c, 0xe9, 0x9b, 0xb2, 0xa1, 0xba, 0x8c, - 0x43, 0xa6, 0xb4, 0x90, 0x94, 0x7d, 0x9f, 0x33, 0xa5, 0xb1, 0x0b, 0x20, 0x59, 0x22, 0x14, 0xd7, - 0x42, 0x2e, 0x7d, 0xa7, 0xe5, 0xb4, 0x6b, 0x5d, 0xec, 0xd8, 0x36, 0x1d, 0xba, 0xca, 0xd0, 0x8d, - 0x2a, 0x3c, 0x87, 0x5a, 0x90, 0xb5, 0xf9, 0xcc, 0x23, 0xbf, 0xd0, 0x72, 0xda, 0xc7, 0x14, 0xf2, - 0xd0, 0x30, 0xc2, 0x33, 0xa8, 0x86, 0x13, 0x3e, 0x8d, 0xd2, 0xac, 0x6b, 0xb2, 0x15, 0xe3, 0x0f, - 0x23, 0x72, 0x01, 0xfe, 0x3e, 0x8a, 0x4a, 0x44, 0xac, 0x18, 0x9e, 0x42, 0x69, 0x11, 0x4c, 0xe7, - 0xcc, 0x60, 0x54, 0xa9, 0x75, 0xc8, 0x6f, 0x07, 0xbc, 0xb1, 0x64, 0x6c, 0x10, 0x6b, 0xb9, 0xbc, - 0x0f, 0x76, 0x13, 0xaa, 0x92, 0x2d, 0xb8, 0xe2, 0x22, 0x36, 0xcc, 0x75, 0xba, 0xf2, 0x11, 0xa1, - 0x98, 0x04, 0x7a, 0x62, 0x68, 0xeb, 0xd4, 0xd8, 0x29, 0xce, 0x94, 0xcf, 0xb8, 0xf6, 0x8b, 0x2d, - 0xa7, 0xed, 0x52, 0xeb, 0x90, 0xbf, 0x0e, 0x9c, 0x6c, 0xe0, 0x64, 0xe8, 0xef, 0xa0, 0xa8, 0x97, - 0x89, 0x25, 0x6f, 0x74, 0x5f, 0xe6, 0x24, 0x7b, 0x85, 0x9d, 0xd1, 0xed, 0x37, 0x16, 0xea, 0xf1, - 0x32, 0x61, 0xd4, 0xbc, 0x40, 0x0f, 0x5c, 0xb1, 0x5a, 0x62, 0x6a, 0xa6, 0x2c, 0x8a, 0xff, 0x64, - 0x86, 0xc5, 0xa5, 0xc6, 0x4e, 0x63, 0x33, 0x11, 0x31, 0x83, 0x52, 0xa2, 0xc6, 0x4e, 0x63, 0x51, - 0xa0, 0x03, 0xbf, 0x64, 0x99, 0x53, 0x9b, 0xbc, 0x05, 0x58, 0x4f, 0x40, 0x80, 0x72, 0x7f, 0x74, - 0x7d, 0x3d, 0x1c, 0x7b, 0x47, 0x58, 0x85, 0x62, 0xef, 0xe3, 0xa8, 0xe7, 0x39, 0xa9, 0x35, 0xa6, - 0x83, 0x81, 0x57, 0xc0, 0x0a, 0xb8, 0xe3, 0xcb, 0x2b, 0xcf, 0x25, 0x02, 0x1e, 0xd9, 0xab, 0xa8, - 0x1e, 0xd3, 0x3f, 0x18, 0x8b, 0xef, 0xb3, 0x67, 0x84, 0xe2, 0x17, 0x29, 0x66, 0xd9, 0x8e, 0x8d, - 0x8d, 0x0d, 0x28, 0x68, 0x91, 0x6d, 0xb7, 0xa0, 0x05, 0x19, 0xc0, 0xe3, 0xdd, 0x81, 0xd9, 0x26, - 0x5f, 0x41, 0xc5, 0x4a, 0x5a, 0xf9, 0x4e, 0xcb, 0x6d, 0xd7, 0xba, 0x27, 0xf9, 0xb8, 0x2b, 0xae, - 0xed, 0x1b, 0x9a, 0x57, 0x10, 0x06, 0x0f, 0xfb, 0x62, 0x1e, 0x67, 0x71, 0xf5, 0x9f, 0xd4, 0x41, - 0x5e, 0xc3, 0xe9, 0xf6, 0x98, 0xb5, 0x60, 0xc3, 0x34, 0x6e, 0x46, 0x94, 0xa8, 0x75, 0xba, 0x7f, - 0x0a, 0xf0, 0xc0, 0x56, 0xde, 0x30, 0xb9, 0xe0, 0x21, 0xc3, 0x4f, 0xe0, 0xed, 0x8a, 0x1e, 0xcf, - 0x73, 0x9e, 0x03, 0x5f, 0x66, 0xb3, 0x75, 0xb8, 0xc0, 0x8e, 0x27, 0x47, 0xf8, 0x1e, 0x8e, 0x57, - 0x12, 0x43, 0xff, 0x0e, 0xd5, 0xd9, 0x56, 0x67, 0x07, 0xf5, 0x48, 0x8e, 0x2e, 0x1c, 0xbc, 0x81, - 0xc6, 0xf6, 0x31, 0xf0, 0xf9, 0xf6, 0xec, 0x1d, 0x55, 0x34, 0x5f, 0x1c, 0x4a, 0x6f, 0x34, 0xfd, - 0x00, 0xf5, 0xcd, 0x9d, 0xe1, 0xd3, 0xf5, 0x9b, 0xbd, 0x83, 0x35, 0x9f, 0xdd, 0x9d, 0xcc, 0xdb, - 0xdd, 0x96, 0xcd, 0x8f, 0xec, 0xcd, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x64, 0xef, 0x2c, 0x85, - 0xee, 0x04, 0x00, 0x00, + // 1008 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xdd, 0x6e, 0xe3, 0x44, + 0x14, 0x8e, 0xf3, 0xd7, 0xf8, 0x34, 0x04, 0x77, 0xd8, 0x85, 0xd4, 0xdd, 0xdd, 0x46, 0x03, 0x48, + 0x59, 0x2d, 0x0a, 0xab, 0x20, 0x24, 0xb8, 0x42, 0xed, 0x36, 0x2d, 0x85, 0xee, 0x1a, 0x4d, 0x23, + 0x71, 0x59, 0xb9, 0xf1, 0xd0, 0x0e, 0x38, 0x9e, 0x60, 0x4f, 0xcb, 0x06, 0x9e, 0x00, 0x89, 0xf7, + 0xe0, 0x8a, 0x97, 0xe1, 0x9e, 0x17, 0xe1, 0x0a, 0xcd, 0x8f, 0xff, 0x12, 0x47, 0x48, 0xac, 0xc2, + 0x4d, 0x74, 0x7e, 0xc6, 0xe7, 0x7c, 0x73, 0xe6, 0x3b, 0x67, 0x26, 0xd0, 0x9d, 0xf1, 0xf9, 0x9c, + 0x89, 0xd1, 0x22, 0xe6, 0x82, 0xa3, 0xf6, 0x0d, 0x13, 0x7e, 0xb8, 0x74, 0xbb, 0xc9, 0xad, 0x1f, + 0xd3, 0x40, 0x5b, 0x71, 0x00, 0xe8, 0x85, 0x5a, 0x75, 0x29, 0x7c, 0x91, 0x10, 0xfa, 0xe3, 0x1d, + 0x4d, 0x04, 0x1a, 0x03, 0xc4, 0x74, 0xc1, 0x13, 0x26, 0x78, 0xbc, 0xec, 0x5b, 0x03, 0x6b, 0xb8, + 0x3b, 0x46, 0x23, 0x1d, 0x60, 0x44, 0x32, 0x0f, 0x29, 0xac, 0x42, 0x2e, 0x74, 0x62, 0x7a, 0xcf, + 0x12, 0xc6, 0xa3, 0x7e, 0x7d, 0x60, 0x0d, 0xbb, 0x24, 0xd3, 0xf1, 0x0c, 0xde, 0x29, 0x65, 0x49, + 0x16, 0x3c, 0x4a, 0x28, 0x72, 0xa0, 0xc1, 0x59, 0xa0, 0xe2, 0xdb, 0x44, 0x8a, 0xe8, 0x11, 0xd8, + 0x7e, 0x10, 0x30, 0xc1, 0x78, 0x94, 0xa8, 0x28, 0x2d, 0x92, 0x1b, 0xa4, 0x37, 0xa0, 0x21, 0xd5, + 0xde, 0x86, 0xf6, 0x66, 0x06, 0xfc, 0xab, 0x05, 0xef, 0xe9, 0x2c, 0xe7, 0xc9, 0x51, 0x34, 0xa3, + 0x89, 0xe0, 0xf1, 0x9b, 0x6c, 0xe8, 0x10, 0x76, 0x7d, 0x13, 0xe6, 0x8a, 0x05, 0x0a, 0x8d, 0x4d, + 0x20, 0x35, 0x9d, 0x07, 0x68, 0x1f, 0x3a, 0xb3, 0x5b, 0x16, 0x06, 0xd2, 0xdb, 0x50, 0xde, 0x1d, + 0xa5, 0x9f, 0x07, 0xf8, 0x39, 0xf4, 0xd7, 0xa1, 0x98, 0x5d, 0x3f, 0x80, 0xd6, 0xbd, 0x1f, 0xde, + 0x51, 0x05, 0xa3, 0x43, 0xb4, 0x82, 0x7f, 0xb3, 0xc0, 0x99, 0xc6, 0x94, 0x4e, 0x22, 0x11, 0x2f, + 0xb7, 0x74, 0x0e, 0x08, 0x41, 0x73, 0xe1, 0x8b, 0x5b, 0x85, 0xb6, 0x4b, 0x94, 0x2c, 0xe1, 0x84, + 0x6c, 0xce, 0x44, 0xbf, 0x39, 0xb0, 0x86, 0x0d, 0xa2, 0x15, 0xfc, 0xa7, 0x05, 0x7b, 0x05, 0x38, + 0x06, 0xfa, 0x67, 0xd0, 0x14, 0xcb, 0x85, 0x46, 0xde, 0x1b, 0x7f, 0x90, 0x22, 0x59, 0x5b, 0x38, + 0xf2, 0xae, 0xbf, 0xa7, 0x33, 0x31, 0x5d, 0x2e, 0x28, 0x51, 0x5f, 0xa4, 0x47, 0x5d, 0xcf, 0x8f, + 0x1a, 0x41, 0x33, 0x61, 0x3f, 0x53, 0x85, 0xa5, 0x41, 0x94, 0x2c, 0x6d, 0x73, 0x1e, 0x50, 0x05, + 0xa5, 0x45, 0x94, 0x2c, 0x6d, 0x81, 0x2f, 0xfc, 0x7e, 0x4b, 0x63, 0x96, 0x32, 0xfe, 0x14, 0x20, + 0xcf, 0x80, 0x00, 0xda, 0x2f, 0xbc, 0x97, 0x2f, 0xcf, 0xa7, 0x4e, 0x0d, 0x75, 0xa0, 0x79, 0x7c, + 0xe1, 0x1d, 0x3b, 0x96, 0x94, 0xa6, 0x64, 0x32, 0x71, 0xea, 0x68, 0x07, 0x1a, 0xd3, 0xa3, 0x33, + 0xa7, 0x81, 0x39, 0x3c, 0xd4, 0xa7, 0x92, 0x1c, 0x53, 0xf1, 0x13, 0xa5, 0xd1, 0x9b, 0xd4, 0x19, + 0x41, 0xf3, 0xbb, 0x98, 0xcf, 0x4d, 0x8d, 0x95, 0x8c, 0x7a, 0x50, 0x17, 0xdc, 0x54, 0xb7, 0x2e, + 0x38, 0x9e, 0xc0, 0xbb, 0xab, 0x09, 0x4d, 0x25, 0x9f, 0xc1, 0x8e, 0xee, 0xce, 0xa4, 0x6f, 0x0d, + 0x1a, 0xc3, 0xdd, 0xf1, 0x5e, 0x9a, 0xee, 0x8c, 0x09, 0xfd, 0x0d, 0x49, 0x57, 0x60, 0x2a, 0xdb, + 0xe7, 0x2e, 0x32, 0xf6, 0xad, 0x75, 0xe9, 0x47, 0xf0, 0xa0, 0x9c, 0x26, 0x27, 0xec, 0x4c, 0xda, + 0x55, 0x8a, 0x16, 0xd1, 0x0a, 0xfe, 0xcb, 0x02, 0x3b, 0x3b, 0xf8, 0x8a, 0x56, 0xde, 0x87, 0x4e, + 0xcc, 0xb9, 0xb8, 0xca, 0x8f, 0x7d, 0x47, 0xea, 0x9e, 0x3e, 0xfa, 0x35, 0x1a, 0x7e, 0x6c, 0xa8, + 0xd5, 0x54, 0xd4, 0x3a, 0x58, 0xa3, 0xd6, 0x48, 0xfd, 0x16, 0x18, 0x95, 0x72, 0xa5, 0x55, 0xe0, + 0xca, 0x63, 0x00, 0x5d, 0x33, 0x95, 0xb5, 0xad, 0xb2, 0xda, 0xda, 0xe2, 0xb1, 0x00, 0x3f, 0x03, + 0x3b, 0x8b, 0x92, 0x31, 0xa5, 0x96, 0x31, 0xc5, 0x2a, 0x30, 0xa9, 0x81, 0x7f, 0x81, 0x87, 0x67, + 0x54, 0xa4, 0xf9, 0x19, 0x4d, 0xfe, 0xc7, 0xa6, 0x94, 0xc4, 0x59, 0x4d, 0x9e, 0x13, 0x87, 0x6a, + 0xd3, 0x2a, 0x71, 0xf2, 0x2e, 0x4c, 0x57, 0xe0, 0x6b, 0x70, 0x2e, 0x58, 0x22, 0x4e, 0x59, 0xb8, + 0x35, 0xf8, 0xf8, 0x29, 0xec, 0x15, 0x72, 0xe4, 0x94, 0x91, 0xfb, 0xd0, 0x18, 0xbb, 0x44, 0x2b, + 0x78, 0x06, 0x7b, 0xa7, 0x2c, 0x0a, 0x0c, 0xbd, 0xb7, 0x84, 0xe7, 0x0b, 0x40, 0xc5, 0x24, 0x06, + 0xd0, 0x53, 0x68, 0x6b, 0x1e, 0x98, 0x0c, 0x15, 0xed, 0x66, 0x16, 0xe0, 0xbf, 0x2d, 0x78, 0x28, + 0x23, 0x1c, 0x85, 0xe1, 0x76, 0x1b, 0x0e, 0x1d, 0x80, 0x3d, 0xf7, 0x5f, 0x5f, 0xe9, 0xe6, 0xd2, + 0xf7, 0x59, 0x67, 0xee, 0xbf, 0x56, 0x4d, 0xa8, 0xe6, 0xe3, 0x0f, 0x6c, 0x91, 0xce, 0x42, 0x29, + 0xa3, 0xcf, 0xa1, 0xc5, 0xe3, 0x80, 0xc6, 0x8a, 0xf4, 0xbd, 0xf1, 0xfb, 0x69, 0xee, 0x4a, 0xb8, + 0x23, 0x4f, 0x2e, 0x25, 0xfa, 0x0b, 0xfc, 0x21, 0xb4, 0x94, 0x2e, 0xd9, 0xfe, 0xca, 0x7b, 0x35, + 0x31, 0xbc, 0xf7, 0xbe, 0xf1, 0xf4, 0xac, 0x3c, 0x39, 0x9a, 0x4e, 0x9c, 0xba, 0x24, 0xde, 0x6a, + 0xb0, 0xff, 0x32, 0xb1, 0x6e, 0xd3, 0xc1, 0x77, 0xe1, 0x47, 0x37, 0x77, 0xfe, 0xcd, 0xf6, 0xe8, + 0xf7, 0x47, 0x76, 0xeb, 0x17, 0x52, 0x19, 0xc8, 0xa7, 0x60, 0x87, 0xa9, 0xd1, 0x80, 0x1e, 0xa6, + 0xa9, 0x36, 0x7c, 0x33, 0x4a, 0x2d, 0x24, 0xff, 0xd4, 0xfd, 0x0a, 0x3a, 0xa9, 0x59, 0x1e, 0x4b, + 0xe4, 0xcf, 0xa9, 0x99, 0x74, 0x4a, 0x96, 0x6c, 0x57, 0x8f, 0x2a, 0x05, 0xae, 0x4e, 0xb4, 0xa2, + 0xc7, 0x66, 0xc8, 0x63, 0xf3, 0x36, 0xd0, 0xca, 0xf8, 0xf7, 0x36, 0xbc, 0x65, 0xde, 0x42, 0x34, + 0xbe, 0x67, 0x33, 0x8a, 0xbe, 0x05, 0x67, 0xf5, 0xad, 0x80, 0x0e, 0xcb, 0x30, 0xd7, 0x1e, 0x34, + 0xee, 0x60, 0xf3, 0x02, 0xbd, 0x11, 0x5c, 0x43, 0x27, 0xc5, 0x01, 0xdd, 0xaf, 0xb8, 0xac, 0x75, + 0xa8, 0xfd, 0x8d, 0xd7, 0x38, 0xae, 0x3d, 0xb7, 0xd0, 0x25, 0xf4, 0xca, 0x77, 0x18, 0x7a, 0x5c, + 0xce, 0xbd, 0x72, 0x99, 0xba, 0x4f, 0x36, 0xb9, 0x0b, 0x41, 0xbf, 0x86, 0x6e, 0xf1, 0xaa, 0x41, + 0x07, 0xf9, 0x37, 0x6b, 0xf7, 0x9c, 0xfb, 0xa8, 0xda, 0x99, 0xed, 0xf3, 0x12, 0x7a, 0xe5, 0x61, + 0x99, 0x23, 0xac, 0x9c, 0xe0, 0x39, 0xc2, 0xea, 0x19, 0xab, 0x10, 0x9e, 0x80, 0x9d, 0x8d, 0xb5, + 0xbc, 0x78, 0xab, 0xd3, 0x34, 0x2f, 0xde, 0xda, 0x0c, 0x54, 0x51, 0x26, 0x00, 0xf9, 0x30, 0x42, + 0xfb, 0xc5, 0x7e, 0x2d, 0x4d, 0x41, 0xd7, 0xad, 0x72, 0x65, 0x3b, 0xfc, 0x12, 0x76, 0x0b, 0xef, + 0x67, 0xe4, 0x96, 0x2b, 0x5c, 0x7c, 0xba, 0xbb, 0x07, 0x95, 0xbe, 0x62, 0xad, 0xca, 0xfd, 0x9d, + 0xd7, 0xaa, 0x72, 0x88, 0xe4, 0xb5, 0xaa, 0x1e, 0x0b, 0x6a, 0x97, 0x53, 0x78, 0x7b, 0xa5, 0x9d, + 0xd0, 0x93, 0x8d, 0x7d, 0xa6, 0xc3, 0x1e, 0xfe, 0x4b, 0x1f, 0xe2, 0xda, 0x75, 0x5b, 0xfd, 0x43, + 0xf9, 0xe4, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x57, 0x28, 0x96, 0x2a, 0xc7, 0x0c, 0x00, 0x00, } diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go index aa5f428..08f933c 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go @@ -23,6 +23,14 @@ type CommitDiffRequest struct { RightCommitId string `protobuf:"bytes,3,opt,name=right_commit_id,json=rightCommitId" json:"right_commit_id,omitempty"` IgnoreWhitespaceChange bool `protobuf:"varint,4,opt,name=ignore_whitespace_change,json=ignoreWhitespaceChange" json:"ignore_whitespace_change,omitempty"` Paths [][]byte `protobuf:"bytes,5,rep,name=paths,proto3" json:"paths,omitempty"` + CollapseDiffs bool `protobuf:"varint,6,opt,name=collapse_diffs,json=collapseDiffs" json:"collapse_diffs,omitempty"` + EnforceLimits bool `protobuf:"varint,7,opt,name=enforce_limits,json=enforceLimits" json:"enforce_limits,omitempty"` + MaxFiles int32 `protobuf:"varint,8,opt,name=max_files,json=maxFiles" json:"max_files,omitempty"` + MaxLines int32 `protobuf:"varint,9,opt,name=max_lines,json=maxLines" json:"max_lines,omitempty"` + MaxBytes int32 `protobuf:"varint,10,opt,name=max_bytes,json=maxBytes" json:"max_bytes,omitempty"` + SafeMaxFiles int32 `protobuf:"varint,11,opt,name=safe_max_files,json=safeMaxFiles" json:"safe_max_files,omitempty"` + SafeMaxLines int32 `protobuf:"varint,12,opt,name=safe_max_lines,json=safeMaxLines" json:"safe_max_lines,omitempty"` + SafeMaxBytes int32 `protobuf:"varint,13,opt,name=safe_max_bytes,json=safeMaxBytes" json:"safe_max_bytes,omitempty"` } func (m *CommitDiffRequest) Reset() { *m = CommitDiffRequest{} } @@ -65,6 +73,62 @@ func (m *CommitDiffRequest) GetPaths() [][]byte { return nil } +func (m *CommitDiffRequest) GetCollapseDiffs() bool { + if m != nil { + return m.CollapseDiffs + } + return false +} + +func (m *CommitDiffRequest) GetEnforceLimits() bool { + if m != nil { + return m.EnforceLimits + } + return false +} + +func (m *CommitDiffRequest) GetMaxFiles() int32 { + if m != nil { + return m.MaxFiles + } + return 0 +} + +func (m *CommitDiffRequest) GetMaxLines() int32 { + if m != nil { + return m.MaxLines + } + return 0 +} + +func (m *CommitDiffRequest) GetMaxBytes() int32 { + if m != nil { + return m.MaxBytes + } + return 0 +} + +func (m *CommitDiffRequest) GetSafeMaxFiles() int32 { + if m != nil { + return m.SafeMaxFiles + } + return 0 +} + +func (m *CommitDiffRequest) GetSafeMaxLines() int32 { + if m != nil { + return m.SafeMaxLines + } + return 0 +} + +func (m *CommitDiffRequest) GetSafeMaxBytes() int32 { + if m != nil { + return m.SafeMaxBytes + } + return 0 +} + // A CommitDiffResponse corresponds to a single changed file in a commit. type CommitDiffResponse struct { FromPath []byte `protobuf:"bytes,1,opt,name=from_path,json=fromPath,proto3" json:"from_path,omitempty"` @@ -77,6 +141,10 @@ type CommitDiffResponse struct { Binary bool `protobuf:"varint,7,opt,name=binary" json:"binary,omitempty"` RawPatchData []byte `protobuf:"bytes,9,opt,name=raw_patch_data,json=rawPatchData,proto3" json:"raw_patch_data,omitempty"` EndOfPatch bool `protobuf:"varint,10,opt,name=end_of_patch,json=endOfPatch" json:"end_of_patch,omitempty"` + // Indicates the diff file at which we overflow according to the limitations sent, + // in which case only this attribute will be set. + OverflowMarker bool `protobuf:"varint,11,opt,name=overflow_marker,json=overflowMarker" json:"overflow_marker,omitempty"` + Collapsed bool `protobuf:"varint,12,opt,name=collapsed" json:"collapsed,omitempty"` } func (m *CommitDiffResponse) Reset() { *m = CommitDiffResponse{} } @@ -147,6 +215,20 @@ func (m *CommitDiffResponse) GetEndOfPatch() bool { return false } +func (m *CommitDiffResponse) GetOverflowMarker() bool { + if m != nil { + return m.OverflowMarker + } + return false +} + +func (m *CommitDiffResponse) GetCollapsed() bool { + if m != nil { + return m.Collapsed + } + return false +} + type CommitDeltaRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` LeftCommitId string `protobuf:"bytes,2,opt,name=left_commit_id,json=leftCommitId" json:"left_commit_id,omitempty"` @@ -434,36 +516,45 @@ var _DiffService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("diff.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 481 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x4f, 0x8e, 0xd3, 0x30, - 0x14, 0xc6, 0x71, 0xdb, 0xa4, 0xe9, 0x6b, 0xf8, 0xe7, 0xa2, 0xc1, 0xd3, 0xd9, 0x44, 0x11, 0x42, - 0x91, 0x90, 0x2a, 0x54, 0x36, 0xac, 0x99, 0x91, 0x50, 0x47, 0x42, 0x8c, 0xc2, 0x82, 0x65, 0xe4, - 0x89, 0x9d, 0xc6, 0x52, 0x1a, 0x07, 0xc7, 0x10, 0xf5, 0x1e, 0x9c, 0x80, 0x0d, 0x1b, 0xae, 0xc5, - 0x3d, 0x90, 0xed, 0x4e, 0x9a, 0x41, 0x3d, 0xc0, 0x2c, 0xfd, 0xfd, 0x3e, 0xbf, 0x7e, 0x7e, 0xef, - 0x35, 0x00, 0x4c, 0x14, 0xc5, 0xaa, 0x51, 0x52, 0x4b, 0xec, 0x6f, 0x85, 0xa6, 0xd5, 0x7e, 0x19, - 0xb6, 0x25, 0x55, 0x9c, 0x39, 0x35, 0xfe, 0x8b, 0xe0, 0xf9, 0xa5, 0xdc, 0xed, 0x84, 0xbe, 0x12, - 0x45, 0x91, 0xf2, 0x6f, 0xdf, 0x79, 0xab, 0xf1, 0x1a, 0x40, 0xf1, 0x46, 0xb6, 0x42, 0x4b, 0xb5, - 0x27, 0x28, 0x42, 0xc9, 0x7c, 0x8d, 0x57, 0xae, 0xc0, 0x2a, 0xed, 0x49, 0x3a, 0x70, 0xe1, 0x57, - 0xf0, 0xa4, 0xe2, 0x85, 0xce, 0x72, 0x5b, 0x2d, 0x13, 0x8c, 0x8c, 0x22, 0x94, 0xcc, 0xd2, 0xd0, - 0xa8, 0xee, 0x27, 0x36, 0x0c, 0xbf, 0x86, 0xa7, 0x4a, 0x6c, 0xcb, 0xa1, 0x6d, 0x6c, 0x6d, 0x8f, - 0xad, 0xdc, 0xfb, 0xde, 0x03, 0x11, 0xdb, 0x5a, 0x2a, 0x9e, 0x75, 0xa5, 0xd0, 0xbc, 0x6d, 0x68, - 0xce, 0xb3, 0xbc, 0xa4, 0xf5, 0x96, 0x93, 0x49, 0x84, 0x92, 0x20, 0x3d, 0x73, 0xfc, 0x6b, 0x8f, - 0x2f, 0x2d, 0xc5, 0x2f, 0xc0, 0x6b, 0xa8, 0x2e, 0x5b, 0xe2, 0x45, 0xe3, 0x24, 0x4c, 0xdd, 0x21, - 0xfe, 0x39, 0x02, 0x3c, 0x7c, 0x67, 0xdb, 0xc8, 0xba, 0xe5, 0xf8, 0x02, 0x66, 0x85, 0x92, 0xbb, - 0xcc, 0x98, 0xec, 0x3b, 0xc3, 0x34, 0x30, 0xc2, 0x0d, 0xd5, 0x25, 0x7e, 0x09, 0x53, 0x2d, 0x1d, - 0x1a, 0x59, 0xe4, 0x6b, 0x79, 0x07, 0xec, 0xad, 0x3e, 0xbc, 0x6f, 0x8e, 0x1b, 0x86, 0x17, 0xe0, - 0x69, 0x69, 0xe4, 0x89, 0x95, 0x27, 0x5a, 0x6e, 0x18, 0x3e, 0x87, 0x40, 0x56, 0x2c, 0xdb, 0x49, - 0xc6, 0x89, 0x17, 0xa1, 0xc4, 0x4b, 0xa7, 0xb2, 0x62, 0x9f, 0x24, 0xe3, 0x06, 0xd5, 0xbc, 0x73, - 0xc8, 0x77, 0xa8, 0xe6, 0x9d, 0x45, 0x67, 0xe0, 0xdf, 0x8a, 0x9a, 0xaa, 0x3d, 0x99, 0xda, 0xe7, - 0x1e, 0x4e, 0xa6, 0xcd, 0x8a, 0x76, 0x26, 0x55, 0x5e, 0x66, 0x8c, 0x6a, 0x4a, 0x66, 0x36, 0x5b, - 0xa8, 0x68, 0x77, 0x63, 0xc4, 0x2b, 0xaa, 0x29, 0x8e, 0x20, 0xe4, 0x35, 0xcb, 0x64, 0xe1, 0x8c, - 0x04, 0x6c, 0x0d, 0xe0, 0x35, 0xfb, 0x5c, 0x58, 0xd7, 0xf5, 0x24, 0x08, 0x9e, 0xcd, 0xe2, 0x3f, - 0xa8, 0x6f, 0x0b, 0xaf, 0x34, 0x7d, 0x38, 0xf3, 0xef, 0xa7, 0x38, 0x19, 0x4e, 0xf1, 0x37, 0x82, - 0xf9, 0x20, 0xee, 0xc3, 0x1d, 0x5f, 0xfc, 0x01, 0x16, 0xf7, 0xfa, 0x7a, 0xd8, 0xb7, 0x37, 0xe0, - 0x33, 0x23, 0xb4, 0x04, 0x45, 0xe3, 0x64, 0xbe, 0x5e, 0xdc, 0x35, 0x75, 0x68, 0x3e, 0x58, 0xd6, - 0xbf, 0x10, 0xcc, 0xcd, 0xb6, 0x7e, 0xe1, 0xea, 0x87, 0xc8, 0x39, 0xfe, 0x08, 0x70, 0x5c, 0x61, - 0x7c, 0xfe, 0xdf, 0xd5, 0xe3, 0xdf, 0x77, 0xb9, 0x3c, 0x85, 0x5c, 0x82, 0xf8, 0xd1, 0x5b, 0x84, - 0xaf, 0xef, 0x77, 0x71, 0x79, 0x2a, 0xc4, 0xa1, 0xd4, 0xc5, 0x49, 0x76, 0xac, 0x75, 0xeb, 0xdb, - 0xef, 0xc8, 0xbb, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4b, 0xf5, 0xb7, 0x6e, 0x6b, 0x04, 0x00, - 0x00, + // 629 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0xcf, 0x6e, 0xdb, 0x38, + 0x10, 0xc6, 0x57, 0xb1, 0xad, 0xc8, 0x63, 0x25, 0xd9, 0x65, 0x16, 0x59, 0xc5, 0xd9, 0x83, 0x60, + 0xf4, 0x8f, 0x81, 0x02, 0x41, 0xe1, 0x5e, 0x7a, 0x4e, 0x82, 0x16, 0x09, 0x12, 0x34, 0x50, 0x0f, + 0x3d, 0x0a, 0x8c, 0x38, 0xb2, 0x88, 0x4a, 0xa2, 0x4b, 0xb2, 0x71, 0xfc, 0x3a, 0xbd, 0xf4, 0xd2, + 0x37, 0xea, 0xab, 0xf4, 0x50, 0x90, 0xb4, 0x64, 0xb9, 0xc8, 0x03, 0xe4, 0x38, 0xdf, 0xef, 0xd3, + 0xcc, 0x68, 0x86, 0x24, 0x00, 0xe3, 0x79, 0x7e, 0xba, 0x90, 0x42, 0x0b, 0xe2, 0xcf, 0xb9, 0xa6, + 0xe5, 0x6a, 0x1c, 0xaa, 0x82, 0x4a, 0x64, 0x4e, 0x9d, 0xfc, 0xea, 0xc1, 0x3f, 0xe7, 0xa2, 0xaa, + 0xb8, 0xbe, 0xe0, 0x79, 0x9e, 0xe0, 0x97, 0xaf, 0xa8, 0x34, 0x99, 0x01, 0x48, 0x5c, 0x08, 0xc5, + 0xb5, 0x90, 0xab, 0xc8, 0x8b, 0xbd, 0xe9, 0x68, 0x46, 0x4e, 0x5d, 0x82, 0xd3, 0xa4, 0x25, 0x49, + 0xc7, 0x45, 0x9e, 0xc1, 0x7e, 0x89, 0xb9, 0x4e, 0x33, 0x9b, 0x2d, 0xe5, 0x2c, 0xda, 0x89, 0xbd, + 0xe9, 0x30, 0x09, 0x8d, 0xea, 0x4a, 0x5c, 0x32, 0xf2, 0x02, 0x0e, 0x24, 0x9f, 0x17, 0x5d, 0x5b, + 0xcf, 0xda, 0xf6, 0xac, 0xdc, 0xfa, 0xde, 0x42, 0xc4, 0xe7, 0xb5, 0x90, 0x98, 0x2e, 0x0b, 0xae, + 0x51, 0x2d, 0x68, 0x86, 0x69, 0x56, 0xd0, 0x7a, 0x8e, 0x51, 0x3f, 0xf6, 0xa6, 0x41, 0x72, 0xe4, + 0xf8, 0xa7, 0x16, 0x9f, 0x5b, 0x4a, 0xfe, 0x85, 0xc1, 0x82, 0xea, 0x42, 0x45, 0x83, 0xb8, 0x37, + 0x0d, 0x13, 0x17, 0x90, 0xe7, 0xb0, 0x9f, 0x89, 0xb2, 0xa4, 0x0b, 0x85, 0xa9, 0x19, 0x8a, 0x8a, + 0x7c, 0x9b, 0x65, 0xaf, 0x51, 0xcd, 0xef, 0x5b, 0x1b, 0xd6, 0xb9, 0x90, 0x19, 0xa6, 0x25, 0xaf, + 0xb8, 0x56, 0xd1, 0xae, 0xb3, 0xad, 0xd5, 0x6b, 0x2b, 0x92, 0x13, 0x18, 0x56, 0xf4, 0x21, 0xcd, + 0x79, 0x89, 0x2a, 0x0a, 0x62, 0x6f, 0x3a, 0x48, 0x82, 0x8a, 0x3e, 0xbc, 0x33, 0x71, 0x03, 0x4b, + 0x5e, 0xa3, 0x8a, 0x86, 0x2d, 0xbc, 0x36, 0x71, 0x03, 0xef, 0x56, 0x1a, 0x55, 0x04, 0x2d, 0x3c, + 0x33, 0xb1, 0x19, 0xa1, 0xa2, 0x39, 0xa6, 0x9b, 0xdc, 0x23, 0xeb, 0x08, 0x8d, 0x7a, 0xd3, 0xe4, + 0xef, 0xba, 0x5c, 0x91, 0x70, 0xcb, 0xe5, 0x0a, 0x75, 0x5d, 0xae, 0xda, 0xde, 0x96, 0xcb, 0x56, + 0x9c, 0xfc, 0xdc, 0x01, 0xd2, 0x5d, 0xbf, 0x5a, 0x88, 0x5a, 0xa1, 0xe9, 0x32, 0x97, 0xa2, 0x4a, + 0xcd, 0xec, 0xec, 0xfa, 0xc3, 0x24, 0x30, 0xc2, 0x2d, 0xd5, 0x05, 0xf9, 0x0f, 0x76, 0xb5, 0x70, + 0x68, 0xc7, 0x22, 0x5f, 0x8b, 0x06, 0xd8, 0xaf, 0xda, 0x9d, 0xfa, 0x26, 0xbc, 0x64, 0xe4, 0x10, + 0x06, 0x5a, 0x18, 0xb9, 0x6f, 0xe5, 0xbe, 0x16, 0x97, 0x8c, 0x1c, 0x43, 0x20, 0x4a, 0x96, 0x56, + 0x82, 0x61, 0x34, 0xb0, 0xad, 0xed, 0x8a, 0x92, 0xdd, 0x08, 0x86, 0x06, 0xd5, 0xb8, 0x74, 0xc8, + 0x77, 0xa8, 0xc6, 0xa5, 0x45, 0x47, 0xe0, 0xdf, 0xf1, 0x9a, 0xca, 0xd5, 0x7a, 0x31, 0xeb, 0xc8, + 0xfc, 0xae, 0xa4, 0x4b, 0xd3, 0x55, 0x56, 0xa4, 0x8c, 0x6a, 0x6a, 0x27, 0x1f, 0x26, 0xa1, 0xa4, + 0xcb, 0x5b, 0x23, 0x5e, 0x50, 0x4d, 0x49, 0x0c, 0x21, 0xd6, 0x2c, 0x15, 0xb9, 0x33, 0xda, 0x05, + 0x04, 0x09, 0x60, 0xcd, 0x3e, 0xe4, 0xd6, 0x45, 0x5e, 0xc2, 0x81, 0xb8, 0x47, 0x99, 0x97, 0x62, + 0x99, 0x56, 0x54, 0x7e, 0x46, 0x69, 0x77, 0x10, 0x24, 0xfb, 0x8d, 0x7c, 0x63, 0x55, 0xf2, 0x3f, + 0x0c, 0x9b, 0xa3, 0xc3, 0xec, 0x02, 0x82, 0x64, 0x23, 0x5c, 0xf5, 0x83, 0xe0, 0xef, 0xe1, 0xe4, + 0x87, 0xd7, 0x4e, 0x17, 0x4b, 0x4d, 0x9f, 0xce, 0xed, 0x6a, 0xef, 0x48, 0xbf, 0x73, 0x47, 0x26, + 0xdf, 0x3d, 0x18, 0x75, 0xda, 0x7d, 0xba, 0xa7, 0x60, 0x72, 0x06, 0x87, 0x5b, 0x73, 0x5d, 0x1f, + 0xdb, 0x57, 0xe0, 0x33, 0x23, 0xa8, 0xc8, 0x8b, 0x7b, 0xd3, 0xd1, 0xec, 0xb0, 0x19, 0x6a, 0xd7, + 0xbc, 0xb6, 0xcc, 0xbe, 0x79, 0x30, 0x32, 0x87, 0xfe, 0x23, 0xca, 0x7b, 0x9e, 0x21, 0x79, 0x0f, + 0xb0, 0xb9, 0x09, 0xe4, 0xf8, 0x8f, 0x4f, 0x37, 0x8f, 0xe3, 0x78, 0xfc, 0x18, 0x72, 0x1d, 0x4c, + 0xfe, 0x7a, 0xed, 0x91, 0xab, 0xed, 0x29, 0x8e, 0x1f, 0x6b, 0x62, 0x9d, 0xea, 0xe4, 0x51, 0xb6, + 0xc9, 0x75, 0xe7, 0xdb, 0x57, 0xfa, 0xcd, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x75, 0x5b, + 0xf9, 0xc9, 0x05, 0x00, 0x00, } diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/helper/inforefs.go b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/helper/inforefs.go deleted file mode 100644 index 5ddfbc2..0000000 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/helper/inforefs.go +++ /dev/null @@ -1,32 +0,0 @@ -package helper - -import ( - "io" - - pb "gitlab.com/gitlab-org/gitaly-proto/go" -) - -type InfoRefsClient interface { - Recv() (*pb.InfoRefsResponse, error) -} - -type InfoRefsClientWriterTo struct { - InfoRefsClient -} - -func (clientReader *InfoRefsClientWriterTo) WriteTo(w io.Writer) (total int64, err error) { - for { - response, err := clientReader.Recv() - if err == io.EOF { - return total, nil - } else if err != nil { - return total, err - } - - n, err := w.Write(response.GetData()) - total += int64(n) - if err != nil { - return total, err - } - } -} diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/helper/stream.go b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/helper/stream.go deleted file mode 100644 index 77cd157..0000000 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/helper/stream.go +++ /dev/null @@ -1,44 +0,0 @@ -package helper - -import ( - "io" -) - -// NewReceiveReader turns receiver into an io.Reader. Errors from the -// receiver function are passed on unmodified. This means receiver should -// emit io.EOF when done. -func NewReceiveReader(receiver func() ([]byte, error)) io.Reader { - return &receiveReader{receiver: receiver} -} - -type receiveReader struct { - receiver func() ([]byte, error) - data []byte - err error -} - -func (rr *receiveReader) Read(p []byte) (int, error) { - if len(rr.data) == 0 { - rr.data, rr.err = rr.receiver() - } - n := copy(p, rr.data) - rr.data = rr.data[n:] - if len(rr.data) == 0 { - return n, rr.err - } - return n, nil -} - -// NewSendWriter turns sender into an io.Writer. The number of 'bytes -// written' reported back is always len(p). -func NewSendWriter(sender func(p []byte) error) io.Writer { - return &sendWriter{sender: sender} -} - -type sendWriter struct { - sender func([]byte) error -} - -func (sw *sendWriter) Write(p []byte) (int, error) { - return len(p), sw.sender(p) -} diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go index 1ce9b0f..5c75a23 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go @@ -311,6 +311,64 @@ func (m *FindLocalBranchCommitAuthor) GetDate() *google_protobuf.Timestamp { return nil } +type FindAllBranchesRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` +} + +func (m *FindAllBranchesRequest) Reset() { *m = FindAllBranchesRequest{} } +func (m *FindAllBranchesRequest) String() string { return proto.CompactTextString(m) } +func (*FindAllBranchesRequest) ProtoMessage() {} +func (*FindAllBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{12} } + +func (m *FindAllBranchesRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +type FindAllBranchesResponse struct { + Branches []*FindAllBranchesResponse_Branch `protobuf:"bytes,1,rep,name=branches" json:"branches,omitempty"` +} + +func (m *FindAllBranchesResponse) Reset() { *m = FindAllBranchesResponse{} } +func (m *FindAllBranchesResponse) String() string { return proto.CompactTextString(m) } +func (*FindAllBranchesResponse) ProtoMessage() {} +func (*FindAllBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{13} } + +func (m *FindAllBranchesResponse) GetBranches() []*FindAllBranchesResponse_Branch { + if m != nil { + return m.Branches + } + return nil +} + +type FindAllBranchesResponse_Branch struct { + Name []byte `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Target *GitCommit `protobuf:"bytes,2,opt,name=target" json:"target,omitempty"` +} + +func (m *FindAllBranchesResponse_Branch) Reset() { *m = FindAllBranchesResponse_Branch{} } +func (m *FindAllBranchesResponse_Branch) String() string { return proto.CompactTextString(m) } +func (*FindAllBranchesResponse_Branch) ProtoMessage() {} +func (*FindAllBranchesResponse_Branch) Descriptor() ([]byte, []int) { + return fileDescriptor5, []int{13, 0} +} + +func (m *FindAllBranchesResponse_Branch) GetName() []byte { + if m != nil { + return m.Name + } + return nil +} + +func (m *FindAllBranchesResponse_Branch) GetTarget() *GitCommit { + if m != nil { + return m.Target + } + return nil +} + func init() { proto.RegisterType((*FindDefaultBranchNameRequest)(nil), "gitaly.FindDefaultBranchNameRequest") proto.RegisterType((*FindDefaultBranchNameResponse)(nil), "gitaly.FindDefaultBranchNameResponse") @@ -324,6 +382,9 @@ func init() { proto.RegisterType((*FindLocalBranchesResponse)(nil), "gitaly.FindLocalBranchesResponse") proto.RegisterType((*FindLocalBranchResponse)(nil), "gitaly.FindLocalBranchResponse") proto.RegisterType((*FindLocalBranchCommitAuthor)(nil), "gitaly.FindLocalBranchCommitAuthor") + proto.RegisterType((*FindAllBranchesRequest)(nil), "gitaly.FindAllBranchesRequest") + proto.RegisterType((*FindAllBranchesResponse)(nil), "gitaly.FindAllBranchesResponse") + proto.RegisterType((*FindAllBranchesResponse_Branch)(nil), "gitaly.FindAllBranchesResponse.Branch") proto.RegisterEnum("gitaly.FindLocalBranchesRequest_SortBy", FindLocalBranchesRequest_SortBy_name, FindLocalBranchesRequest_SortBy_value) } @@ -345,6 +406,7 @@ type RefServiceClient interface { FindRefName(ctx context.Context, in *FindRefNameRequest, opts ...grpc.CallOption) (*FindRefNameResponse, error) // Return a stream so we can divide the response in chunks of branches FindLocalBranches(ctx context.Context, in *FindLocalBranchesRequest, opts ...grpc.CallOption) (RefService_FindLocalBranchesClient, error) + FindAllBranches(ctx context.Context, in *FindAllBranchesRequest, opts ...grpc.CallOption) (RefService_FindAllBranchesClient, error) } type refServiceClient struct { @@ -469,6 +531,38 @@ func (x *refServiceFindLocalBranchesClient) Recv() (*FindLocalBranchesResponse, return m, nil } +func (c *refServiceClient) FindAllBranches(ctx context.Context, in *FindAllBranchesRequest, opts ...grpc.CallOption) (RefService_FindAllBranchesClient, error) { + stream, err := grpc.NewClientStream(ctx, &_RefService_serviceDesc.Streams[3], c.cc, "/gitaly.RefService/FindAllBranches", opts...) + if err != nil { + return nil, err + } + x := &refServiceFindAllBranchesClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type RefService_FindAllBranchesClient interface { + Recv() (*FindAllBranchesResponse, error) + grpc.ClientStream +} + +type refServiceFindAllBranchesClient struct { + grpc.ClientStream +} + +func (x *refServiceFindAllBranchesClient) Recv() (*FindAllBranchesResponse, error) { + m := new(FindAllBranchesResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + // Server API for RefService service type RefServiceServer interface { @@ -479,6 +573,7 @@ type RefServiceServer interface { FindRefName(context.Context, *FindRefNameRequest) (*FindRefNameResponse, error) // Return a stream so we can divide the response in chunks of branches FindLocalBranches(*FindLocalBranchesRequest, RefService_FindLocalBranchesServer) error + FindAllBranches(*FindAllBranchesRequest, RefService_FindAllBranchesServer) error } func RegisterRefServiceServer(s *grpc.Server, srv RefServiceServer) { @@ -584,6 +679,27 @@ func (x *refServiceFindLocalBranchesServer) Send(m *FindLocalBranchesResponse) e return x.ServerStream.SendMsg(m) } +func _RefService_FindAllBranches_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(FindAllBranchesRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(RefServiceServer).FindAllBranches(m, &refServiceFindAllBranchesServer{stream}) +} + +type RefService_FindAllBranchesServer interface { + Send(*FindAllBranchesResponse) error + grpc.ServerStream +} + +type refServiceFindAllBranchesServer struct { + grpc.ServerStream +} + +func (x *refServiceFindAllBranchesServer) Send(m *FindAllBranchesResponse) error { + return x.ServerStream.SendMsg(m) +} + var _RefService_serviceDesc = grpc.ServiceDesc{ ServiceName: "gitaly.RefService", HandlerType: (*RefServiceServer)(nil), @@ -613,6 +729,11 @@ var _RefService_serviceDesc = grpc.ServiceDesc{ Handler: _RefService_FindLocalBranches_Handler, ServerStreams: true, }, + { + StreamName: "FindAllBranches", + Handler: _RefService_FindAllBranches_Handler, + ServerStreams: true, + }, }, Metadata: "ref.proto", } @@ -620,44 +741,48 @@ var _RefService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("ref.proto", fileDescriptor5) } var fileDescriptor5 = []byte{ - // 620 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xad, 0xdb, 0x34, 0xb4, 0x13, 0xd3, 0x86, 0xa5, 0x14, 0xe3, 0x02, 0x4d, 0x0d, 0x15, 0xe5, - 0xe2, 0x22, 0x57, 0x9c, 0xb8, 0x90, 0x26, 0x45, 0x45, 0x2a, 0x05, 0x6d, 0x02, 0xe2, 0x80, 0x14, - 0x6d, 0x9c, 0x75, 0x62, 0x64, 0x67, 0xc3, 0x7a, 0x03, 0xe4, 0xc0, 0x17, 0xf0, 0x61, 0x7c, 0x01, - 0xff, 0x83, 0xb2, 0x6b, 0xa7, 0x4e, 0x6a, 0xbb, 0x48, 0x39, 0x39, 0x33, 0xfb, 0xde, 0xcc, 0xec, - 0xbc, 0xec, 0x83, 0x4d, 0x4e, 0x3d, 0x7b, 0xc4, 0x99, 0x60, 0xa8, 0xdc, 0xf7, 0x05, 0x09, 0x26, - 0xa6, 0x1e, 0x0d, 0x08, 0xa7, 0x3d, 0x95, 0x35, 0xf7, 0xfb, 0x8c, 0xf5, 0x03, 0x7a, 0x2c, 0xa3, - 0xee, 0xd8, 0x3b, 0x16, 0x7e, 0x48, 0x23, 0x41, 0xc2, 0x91, 0x02, 0x58, 0x18, 0x1e, 0xbe, 0xf1, - 0x87, 0xbd, 0x26, 0xf5, 0xc8, 0x38, 0x10, 0xa7, 0x9c, 0x0c, 0xdd, 0xc1, 0x25, 0x09, 0x29, 0xa6, - 0xdf, 0xc6, 0x34, 0x12, 0xc8, 0x01, 0xe0, 0x74, 0xc4, 0x22, 0x5f, 0x30, 0x3e, 0x31, 0xb4, 0x9a, - 0x76, 0x54, 0x71, 0x90, 0xad, 0x7a, 0xd9, 0x78, 0x76, 0x82, 0x53, 0x28, 0xeb, 0x04, 0x1e, 0xe5, - 0xd4, 0x8c, 0x46, 0x6c, 0x18, 0x51, 0x84, 0xa0, 0x34, 0x24, 0x21, 0x95, 0xe5, 0x74, 0x2c, 0x7f, - 0x5b, 0xef, 0xe1, 0xc1, 0x94, 0x54, 0x0f, 0x82, 0x2b, 0x42, 0xb4, 0xcc, 0x14, 0x0e, 0x98, 0x59, - 0x05, 0xe3, 0x11, 0x76, 0x60, 0x7d, 0xda, 0x36, 0x32, 0xb4, 0xda, 0xda, 0x91, 0x8e, 0x55, 0x60, - 0x5d, 0xc0, 0x6e, 0xcc, 0x69, 0x93, 0xfe, 0xd2, 0x13, 0x1c, 0xc3, 0xfd, 0x6b, 0xd5, 0x0a, 0xdb, - 0xff, 0x02, 0x34, 0x25, 0x60, 0xea, 0x2d, 0x29, 0x01, 0xda, 0x83, 0x4d, 0x97, 0x85, 0xa1, 0x2f, - 0x3a, 0x7e, 0xcf, 0x58, 0xad, 0x69, 0x47, 0x9b, 0x78, 0x43, 0x25, 0xde, 0xf6, 0xd0, 0x2e, 0x94, - 0x47, 0x9c, 0x7a, 0xfe, 0x4f, 0x63, 0x4d, 0x0a, 0x10, 0x47, 0xd6, 0x73, 0xb8, 0x3b, 0xd7, 0xbe, - 0x40, 0xad, 0x3f, 0x1a, 0x18, 0x53, 0xec, 0x05, 0x73, 0x49, 0xbc, 0xdf, 0xa5, 0x76, 0x85, 0x5e, - 0xc3, 0xad, 0x88, 0x71, 0xd1, 0xe9, 0x4e, 0xe4, 0xb8, 0x5b, 0xce, 0xb3, 0x84, 0x90, 0xd7, 0xc6, - 0x6e, 0x31, 0x2e, 0x4e, 0x27, 0xb8, 0x1c, 0xc9, 0xaf, 0xf5, 0x12, 0xca, 0x2a, 0x83, 0x36, 0xa0, - 0x74, 0x59, 0x7f, 0x77, 0x56, 0x5d, 0x41, 0xdb, 0x50, 0xf9, 0xf8, 0xa1, 0x59, 0x6f, 0x9f, 0x35, - 0x3b, 0xf5, 0x56, 0xa3, 0xaa, 0xa1, 0x2a, 0xe8, 0x49, 0xa2, 0x79, 0xd6, 0x6a, 0x54, 0x57, 0xad, - 0xcf, 0xea, 0x7f, 0xb7, 0xd0, 0x21, 0xbe, 0xfa, 0x2b, 0xd8, 0xe8, 0xc6, 0x39, 0xa9, 0x54, 0xc5, - 0xd9, 0xcf, 0x19, 0x2b, 0xa1, 0xe0, 0x19, 0xc1, 0xfa, 0xbd, 0xaa, 0xf4, 0xcf, 0x40, 0x65, 0xed, - 0xb4, 0x58, 0xb3, 0x43, 0xd8, 0x8a, 0x0f, 0xa3, 0x71, 0xf7, 0x2b, 0x75, 0x45, 0xac, 0xdd, 0x6d, - 0x95, 0x6d, 0xa9, 0x24, 0x3a, 0x87, 0x38, 0xd1, 0x21, 0x63, 0x31, 0x60, 0xdc, 0x28, 0xc9, 0xed, - 0x3f, 0xc9, 0x99, 0xba, 0x21, 0xb1, 0x75, 0x09, 0xc5, 0xba, 0x9b, 0x8a, 0xd0, 0x25, 0x54, 0xe3, - 0x4a, 0xea, 0x23, 0x28, 0x37, 0xd6, 0xff, 0xbf, 0xd8, 0xb6, 0x62, 0x35, 0x12, 0xae, 0xf5, 0x03, - 0xf6, 0x0a, 0xf0, 0x99, 0x0b, 0xd9, 0x81, 0x75, 0x1a, 0x12, 0x3f, 0x90, 0xcb, 0xd0, 0xb1, 0x0a, - 0x90, 0x0d, 0xa5, 0x1e, 0x11, 0x54, 0xde, 0xbf, 0xe2, 0x98, 0xb6, 0x72, 0x38, 0x3b, 0x71, 0x38, - 0xbb, 0x9d, 0x38, 0x1c, 0x96, 0x38, 0xe7, 0xef, 0x1a, 0x00, 0xa6, 0x5e, 0x8b, 0xf2, 0xef, 0xbe, - 0x4b, 0x91, 0x07, 0xf7, 0x32, 0xcd, 0x09, 0x3d, 0x4d, 0x5f, 0x2b, 0xcf, 0x0f, 0xcd, 0xc3, 0x1b, - 0x50, 0x4a, 0x5f, 0x6b, 0x05, 0x75, 0xd4, 0x5b, 0x9e, 0xb7, 0x1f, 0x74, 0x90, 0xa6, 0x67, 0x7a, - 0x9d, 0x69, 0x15, 0x41, 0x92, 0xf2, 0x2f, 0x34, 0xf4, 0x09, 0xb6, 0x17, 0xdc, 0x05, 0x3d, 0x5e, - 0xa0, 0x2e, 0x98, 0x98, 0xb9, 0x9f, 0x7b, 0x9e, 0xaa, 0x7b, 0x0e, 0x95, 0x94, 0x0b, 0x20, 0x33, - 0xcd, 0x99, 0x77, 0x26, 0x73, 0x2f, 0xf3, 0x6c, 0xb6, 0x82, 0x2f, 0x70, 0xe7, 0xda, 0xd3, 0x42, - 0xb5, 0x9b, 0xde, 0xb5, 0x79, 0x50, 0x80, 0xb8, 0x9a, 0xb3, 0x5b, 0x96, 0x8a, 0x9f, 0xfc, 0x0b, - 0x00, 0x00, 0xff, 0xff, 0xaa, 0x36, 0x2a, 0x93, 0x04, 0x07, 0x00, 0x00, + // 688 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xd1, 0x52, 0xd3, 0x4c, + 0x14, 0x26, 0x50, 0xf2, 0xc3, 0x69, 0x7f, 0x28, 0x2b, 0x62, 0x0c, 0x0a, 0x25, 0x8a, 0xc2, 0x4d, + 0x70, 0xc2, 0x78, 0xe5, 0x8d, 0xa5, 0x45, 0x70, 0x06, 0xd1, 0xd9, 0xa2, 0xe3, 0x85, 0x33, 0x9d, + 0x6d, 0xbb, 0x29, 0x71, 0x9a, 0xa6, 0x6e, 0xb6, 0x6a, 0x2f, 0x7c, 0x02, 0xdf, 0xc3, 0x3b, 0x9f, + 0xc3, 0xd7, 0x72, 0xba, 0xbb, 0xa9, 0x69, 0xbb, 0x29, 0xce, 0xd4, 0xab, 0x74, 0xcf, 0x7e, 0xdf, + 0xd9, 0xb3, 0xdf, 0x39, 0xfb, 0x15, 0x56, 0x19, 0xf5, 0xdd, 0x1e, 0x8b, 0x78, 0x84, 0xcc, 0x76, + 0xc0, 0x49, 0x67, 0x60, 0x17, 0xe2, 0x6b, 0xc2, 0x68, 0x4b, 0x46, 0xed, 0xdd, 0x76, 0x14, 0xb5, + 0x3b, 0xf4, 0x48, 0xac, 0x1a, 0x7d, 0xff, 0x88, 0x07, 0x21, 0x8d, 0x39, 0x09, 0x7b, 0x12, 0xe0, + 0x60, 0xb8, 0xf7, 0x22, 0xe8, 0xb6, 0xaa, 0xd4, 0x27, 0xfd, 0x0e, 0x3f, 0x61, 0xa4, 0xdb, 0xbc, + 0xbe, 0x24, 0x21, 0xc5, 0xf4, 0x53, 0x9f, 0xc6, 0x1c, 0x79, 0x00, 0x8c, 0xf6, 0xa2, 0x38, 0xe0, + 0x11, 0x1b, 0x58, 0x46, 0xc9, 0x38, 0xc8, 0x7b, 0xc8, 0x95, 0x67, 0xb9, 0x78, 0xb4, 0x83, 0x53, + 0x28, 0xe7, 0x18, 0xee, 0x67, 0xe4, 0x8c, 0x7b, 0x51, 0x37, 0xa6, 0x08, 0x41, 0xae, 0x4b, 0x42, + 0x2a, 0xd2, 0x15, 0xb0, 0xf8, 0xed, 0xbc, 0x86, 0xbb, 0x43, 0x52, 0xb9, 0xd3, 0xf9, 0x43, 0x88, + 0xe7, 0xa9, 0xc2, 0x03, 0x5b, 0x97, 0x50, 0x95, 0xb0, 0x09, 0xcb, 0xc3, 0x63, 0x63, 0xcb, 0x28, + 0x2d, 0x1d, 0x14, 0xb0, 0x5c, 0x38, 0x17, 0xb0, 0xa5, 0x38, 0x57, 0xa4, 0x3d, 0x77, 0x05, 0x47, + 0x70, 0x67, 0x2a, 0xdb, 0xcc, 0xe3, 0xbf, 0x01, 0x1a, 0x12, 0x30, 0xf5, 0xe7, 0x6c, 0x01, 0xda, + 0x86, 0xd5, 0x66, 0x14, 0x86, 0x01, 0xaf, 0x07, 0x2d, 0x6b, 0xb1, 0x64, 0x1c, 0xac, 0xe2, 0x15, + 0x19, 0x78, 0xd9, 0x42, 0x5b, 0x60, 0xf6, 0x18, 0xf5, 0x83, 0xaf, 0xd6, 0x92, 0x68, 0x80, 0x5a, + 0x39, 0x87, 0x70, 0x6b, 0xec, 0xf8, 0x19, 0xdd, 0xfa, 0x65, 0x80, 0x35, 0xc4, 0x5e, 0x44, 0x4d, + 0xa2, 0xf4, 0x9d, 0x4b, 0x2b, 0xf4, 0x1c, 0xfe, 0x8b, 0x23, 0xc6, 0xeb, 0x8d, 0x81, 0x28, 0x77, + 0xcd, 0x7b, 0x9c, 0x10, 0xb2, 0x8e, 0x71, 0x6b, 0x11, 0xe3, 0x27, 0x03, 0x6c, 0xc6, 0xe2, 0xeb, + 0x3c, 0x05, 0x53, 0x46, 0xd0, 0x0a, 0xe4, 0x2e, 0xcb, 0xaf, 0x4e, 0x8b, 0x0b, 0x68, 0x1d, 0xf2, + 0x6f, 0xdf, 0x54, 0xcb, 0x57, 0xa7, 0xd5, 0x7a, 0xb9, 0x56, 0x29, 0x1a, 0xa8, 0x08, 0x85, 0x24, + 0x50, 0x3d, 0xad, 0x55, 0x8a, 0x8b, 0xce, 0x7b, 0x39, 0x77, 0x13, 0x27, 0xa8, 0xab, 0x3f, 0x83, + 0x95, 0x86, 0x8a, 0x89, 0x4e, 0xe5, 0xbd, 0xdd, 0x8c, 0xb2, 0x12, 0x0a, 0x1e, 0x11, 0x9c, 0xef, + 0x8b, 0xb2, 0xff, 0x1a, 0x94, 0x4e, 0xd3, 0xd9, 0x3d, 0xdb, 0x87, 0x35, 0xb5, 0x19, 0xf7, 0x1b, + 0x1f, 0x69, 0x93, 0xab, 0xde, 0xfd, 0x2f, 0xa3, 0x35, 0x19, 0x44, 0xe7, 0xa0, 0x02, 0x75, 0xd2, + 0xe7, 0xd7, 0x11, 0xb3, 0x72, 0x42, 0xfd, 0x07, 0x19, 0x55, 0x57, 0x04, 0xb6, 0x2c, 0xa0, 0xb8, + 0xd0, 0x4c, 0xad, 0xd0, 0x25, 0x14, 0x55, 0x26, 0xf9, 0xe1, 0x94, 0x59, 0xcb, 0x7f, 0x9f, 0x6c, + 0x5d, 0xb2, 0x2a, 0x09, 0xd7, 0xf9, 0x02, 0xdb, 0x33, 0xf0, 0x5a, 0x41, 0x36, 0x61, 0x99, 0x86, + 0x24, 0xe8, 0x08, 0x31, 0x0a, 0x58, 0x2e, 0x90, 0x0b, 0xb9, 0x16, 0xe1, 0x54, 0xdc, 0x3f, 0xef, + 0xd9, 0xae, 0x74, 0x38, 0x37, 0x71, 0x38, 0xf7, 0x2a, 0x71, 0x38, 0x2c, 0x70, 0xa9, 0x37, 0xfd, + 0x0f, 0xe6, 0xd4, 0xf9, 0x61, 0x8c, 0x1e, 0xf5, 0xd4, 0xb4, 0x9c, 0x4c, 0x4d, 0xcb, 0xa3, 0xb4, + 0x54, 0x1a, 0x8a, 0xab, 0xc6, 0x62, 0xc4, 0xb3, 0xcf, 0xc0, 0x94, 0x31, 0xad, 0x22, 0x87, 0x60, + 0x72, 0xc2, 0xda, 0x94, 0x0b, 0x49, 0xf2, 0xde, 0x46, 0x92, 0xff, 0x2c, 0x91, 0x1a, 0x2b, 0x80, + 0xf7, 0x33, 0x07, 0x80, 0xa9, 0x5f, 0xa3, 0xec, 0x73, 0xd0, 0xa4, 0xc8, 0x87, 0xdb, 0x5a, 0x4f, + 0x46, 0x0f, 0xd3, 0x25, 0x66, 0xfd, 0x0d, 0xd8, 0xfb, 0x37, 0xa0, 0xe4, 0x75, 0x9c, 0x05, 0x54, + 0x97, 0x16, 0x36, 0xee, 0xba, 0x68, 0x4f, 0xab, 0x43, 0xda, 0x60, 0x6d, 0x67, 0x16, 0x24, 0x49, + 0xff, 0xc4, 0x40, 0xef, 0x60, 0x7d, 0xc2, 0x54, 0xd1, 0xce, 0x04, 0x75, 0xc2, 0xbb, 0xed, 0xdd, + 0xcc, 0xfd, 0x54, 0xde, 0x73, 0xc8, 0xa7, 0xcc, 0x0f, 0xd9, 0x69, 0xce, 0xb8, 0x21, 0xdb, 0xdb, + 0xda, 0xbd, 0x91, 0x04, 0x1f, 0x60, 0x63, 0xca, 0x51, 0x50, 0xe9, 0x26, 0x3b, 0xb3, 0xf7, 0x66, + 0x20, 0xb4, 0xf7, 0x1f, 0xe5, 0xde, 0xc9, 0x9c, 0x32, 0xfd, 0xfd, 0x75, 0x79, 0x1b, 0xa6, 0x78, + 0x40, 0xc7, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x05, 0x13, 0xab, 0x7e, 0x53, 0x08, 0x00, 0x00, } diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go index 2ddbb28..31ccac2 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go @@ -49,9 +49,103 @@ func (m *RepositoryExistsResponse) GetExists() bool { return false } +type RepackIncrementalRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` +} + +func (m *RepackIncrementalRequest) Reset() { *m = RepackIncrementalRequest{} } +func (m *RepackIncrementalRequest) String() string { return proto.CompactTextString(m) } +func (*RepackIncrementalRequest) ProtoMessage() {} +func (*RepackIncrementalRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{2} } + +func (m *RepackIncrementalRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +type RepackIncrementalResponse struct { +} + +func (m *RepackIncrementalResponse) Reset() { *m = RepackIncrementalResponse{} } +func (m *RepackIncrementalResponse) String() string { return proto.CompactTextString(m) } +func (*RepackIncrementalResponse) ProtoMessage() {} +func (*RepackIncrementalResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{3} } + +type RepackFullRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + CreateBitmap bool `protobuf:"varint,2,opt,name=create_bitmap,json=createBitmap" json:"create_bitmap,omitempty"` +} + +func (m *RepackFullRequest) Reset() { *m = RepackFullRequest{} } +func (m *RepackFullRequest) String() string { return proto.CompactTextString(m) } +func (*RepackFullRequest) ProtoMessage() {} +func (*RepackFullRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{4} } + +func (m *RepackFullRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *RepackFullRequest) GetCreateBitmap() bool { + if m != nil { + return m.CreateBitmap + } + return false +} + +type RepackFullResponse struct { +} + +func (m *RepackFullResponse) Reset() { *m = RepackFullResponse{} } +func (m *RepackFullResponse) String() string { return proto.CompactTextString(m) } +func (*RepackFullResponse) ProtoMessage() {} +func (*RepackFullResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{5} } + +type GarbageCollectRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + CreateBitmap bool `protobuf:"varint,2,opt,name=create_bitmap,json=createBitmap" json:"create_bitmap,omitempty"` +} + +func (m *GarbageCollectRequest) Reset() { *m = GarbageCollectRequest{} } +func (m *GarbageCollectRequest) String() string { return proto.CompactTextString(m) } +func (*GarbageCollectRequest) ProtoMessage() {} +func (*GarbageCollectRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{6} } + +func (m *GarbageCollectRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *GarbageCollectRequest) GetCreateBitmap() bool { + if m != nil { + return m.CreateBitmap + } + return false +} + +type GarbageCollectResponse struct { +} + +func (m *GarbageCollectResponse) Reset() { *m = GarbageCollectResponse{} } +func (m *GarbageCollectResponse) String() string { return proto.CompactTextString(m) } +func (*GarbageCollectResponse) ProtoMessage() {} +func (*GarbageCollectResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{7} } + func init() { proto.RegisterType((*RepositoryExistsRequest)(nil), "gitaly.RepositoryExistsRequest") proto.RegisterType((*RepositoryExistsResponse)(nil), "gitaly.RepositoryExistsResponse") + proto.RegisterType((*RepackIncrementalRequest)(nil), "gitaly.RepackIncrementalRequest") + proto.RegisterType((*RepackIncrementalResponse)(nil), "gitaly.RepackIncrementalResponse") + proto.RegisterType((*RepackFullRequest)(nil), "gitaly.RepackFullRequest") + proto.RegisterType((*RepackFullResponse)(nil), "gitaly.RepackFullResponse") + proto.RegisterType((*GarbageCollectRequest)(nil), "gitaly.GarbageCollectRequest") + proto.RegisterType((*GarbageCollectResponse)(nil), "gitaly.GarbageCollectResponse") } // Reference imports to suppress errors if they are not otherwise used. @@ -66,6 +160,9 @@ const _ = grpc.SupportPackageIsVersion4 type RepositoryServiceClient interface { Exists(ctx context.Context, in *RepositoryExistsRequest, opts ...grpc.CallOption) (*RepositoryExistsResponse, error) + RepackIncremental(ctx context.Context, in *RepackIncrementalRequest, opts ...grpc.CallOption) (*RepackIncrementalResponse, error) + RepackFull(ctx context.Context, in *RepackFullRequest, opts ...grpc.CallOption) (*RepackFullResponse, error) + GarbageCollect(ctx context.Context, in *GarbageCollectRequest, opts ...grpc.CallOption) (*GarbageCollectResponse, error) } type repositoryServiceClient struct { @@ -85,10 +182,40 @@ func (c *repositoryServiceClient) Exists(ctx context.Context, in *RepositoryExis return out, nil } +func (c *repositoryServiceClient) RepackIncremental(ctx context.Context, in *RepackIncrementalRequest, opts ...grpc.CallOption) (*RepackIncrementalResponse, error) { + out := new(RepackIncrementalResponse) + err := grpc.Invoke(ctx, "/gitaly.RepositoryService/RepackIncremental", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *repositoryServiceClient) RepackFull(ctx context.Context, in *RepackFullRequest, opts ...grpc.CallOption) (*RepackFullResponse, error) { + out := new(RepackFullResponse) + err := grpc.Invoke(ctx, "/gitaly.RepositoryService/RepackFull", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *repositoryServiceClient) GarbageCollect(ctx context.Context, in *GarbageCollectRequest, opts ...grpc.CallOption) (*GarbageCollectResponse, error) { + out := new(GarbageCollectResponse) + err := grpc.Invoke(ctx, "/gitaly.RepositoryService/GarbageCollect", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // Server API for RepositoryService service type RepositoryServiceServer interface { Exists(context.Context, *RepositoryExistsRequest) (*RepositoryExistsResponse, error) + RepackIncremental(context.Context, *RepackIncrementalRequest) (*RepackIncrementalResponse, error) + RepackFull(context.Context, *RepackFullRequest) (*RepackFullResponse, error) + GarbageCollect(context.Context, *GarbageCollectRequest) (*GarbageCollectResponse, error) } func RegisterRepositoryServiceServer(s *grpc.Server, srv RepositoryServiceServer) { @@ -113,6 +240,60 @@ func _RepositoryService_Exists_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } +func _RepositoryService_RepackIncremental_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RepackIncrementalRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RepositoryServiceServer).RepackIncremental(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.RepositoryService/RepackIncremental", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RepositoryServiceServer).RepackIncremental(ctx, req.(*RepackIncrementalRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _RepositoryService_RepackFull_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RepackFullRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RepositoryServiceServer).RepackFull(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.RepositoryService/RepackFull", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RepositoryServiceServer).RepackFull(ctx, req.(*RepackFullRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _RepositoryService_GarbageCollect_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GarbageCollectRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RepositoryServiceServer).GarbageCollect(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.RepositoryService/GarbageCollect", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RepositoryServiceServer).GarbageCollect(ctx, req.(*GarbageCollectRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _RepositoryService_serviceDesc = grpc.ServiceDesc{ ServiceName: "gitaly.RepositoryService", HandlerType: (*RepositoryServiceServer)(nil), @@ -121,6 +302,18 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{ MethodName: "Exists", Handler: _RepositoryService_Exists_Handler, }, + { + MethodName: "RepackIncremental", + Handler: _RepositoryService_RepackIncremental_Handler, + }, + { + MethodName: "RepackFull", + Handler: _RepositoryService_RepackFull_Handler, + }, + { + MethodName: "GarbageCollect", + Handler: _RepositoryService_GarbageCollect_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "repository-service.proto", @@ -129,16 +322,26 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("repository-service.proto", fileDescriptor6) } var fileDescriptor6 = []byte{ - // 172 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x4a, 0x2d, 0xc8, - 0x2f, 0xce, 0x2c, 0xc9, 0x2f, 0xaa, 0xd4, 0x2d, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x4b, 0xcf, 0x2c, 0x49, 0xcc, 0xa9, 0x94, 0xe2, 0x29, 0xce, - 0x48, 0x2c, 0x4a, 0x4d, 0x81, 0x88, 0x2a, 0xf9, 0x72, 0x89, 0x07, 0xc1, 0x75, 0xb8, 0x56, 0x64, - 0x16, 0x97, 0x14, 0x07, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x08, 0x19, 0x71, 0x71, 0x21, 0x0c, - 0x93, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x12, 0xd2, 0x83, 0x98, 0xa2, 0x87, 0xd0, 0x14, 0x84, - 0xa4, 0x4a, 0xc9, 0x88, 0x4b, 0x02, 0xd3, 0xb8, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x21, 0x31, - 0x2e, 0xb6, 0x54, 0xb0, 0x08, 0xd8, 0x2c, 0x8e, 0x20, 0x28, 0xcf, 0x28, 0x89, 0x4b, 0x10, 0xa1, - 0x27, 0x18, 0xe2, 0x66, 0x21, 0x5f, 0x2e, 0x36, 0x88, 0x76, 0x21, 0x79, 0x4c, 0x2b, 0x51, 0xdc, - 0x29, 0xa5, 0x80, 0x5b, 0x01, 0xc4, 0x66, 0x25, 0x86, 0x24, 0x36, 0xb0, 0x6f, 0x8d, 0x01, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x7e, 0xc1, 0x7d, 0x44, 0x1f, 0x01, 0x00, 0x00, + // 323 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0xcd, 0x4e, 0xeb, 0x30, + 0x10, 0x85, 0x6f, 0xbb, 0x88, 0xae, 0x86, 0x82, 0xc4, 0x08, 0x4a, 0x6a, 0x04, 0x94, 0xb0, 0x61, + 0x43, 0x17, 0xe1, 0x0d, 0x40, 0x05, 0xb1, 0x28, 0x12, 0x61, 0xc7, 0x06, 0xb9, 0x61, 0x54, 0x22, + 0xdc, 0x38, 0xd8, 0x2e, 0xa2, 0x6f, 0xca, 0xe3, 0x20, 0xd9, 0xf9, 0xa5, 0x29, 0x9b, 0x8a, 0x65, + 0xc6, 0x73, 0xbe, 0x39, 0x9e, 0xe3, 0x80, 0xaf, 0x28, 0x93, 0x3a, 0x31, 0x52, 0x2d, 0x2f, 0x34, + 0xa9, 0x8f, 0x24, 0xa6, 0x51, 0xa6, 0xa4, 0x91, 0xe8, 0xcd, 0x12, 0xc3, 0xc5, 0x92, 0xf5, 0xf4, + 0x2b, 0x57, 0xf4, 0xe2, 0xaa, 0xc1, 0x04, 0x0e, 0xa2, 0x52, 0x31, 0xfe, 0x4c, 0xb4, 0xd1, 0x11, + 0xbd, 0x2f, 0x48, 0x1b, 0x0c, 0x01, 0x2a, 0x98, 0xdf, 0x19, 0x76, 0xce, 0xb7, 0x42, 0x1c, 0x39, + 0xca, 0xa8, 0x12, 0x45, 0xb5, 0xae, 0x20, 0x04, 0x7f, 0x15, 0xa7, 0x33, 0x99, 0x6a, 0xc2, 0x3e, + 0x78, 0x64, 0x2b, 0x96, 0xf5, 0x3f, 0xca, 0xbf, 0x82, 0x7b, 0xab, 0xe1, 0xf1, 0xdb, 0x5d, 0x1a, + 0x2b, 0x9a, 0x53, 0x6a, 0xb8, 0xd8, 0xc4, 0xc3, 0x21, 0x0c, 0x5a, 0x78, 0xce, 0x44, 0x20, 0x60, + 0xd7, 0x1d, 0xde, 0x2c, 0xc4, 0x26, 0x53, 0xf0, 0x0c, 0xb6, 0x63, 0x45, 0xdc, 0xd0, 0xf3, 0x34, + 0x31, 0x73, 0x9e, 0xf9, 0x5d, 0x7b, 0xa9, 0x9e, 0x2b, 0x5e, 0xd9, 0x5a, 0xb0, 0x07, 0x58, 0x9f, + 0x96, 0x7b, 0xc8, 0x60, 0xff, 0x96, 0xab, 0x29, 0x9f, 0xd1, 0xb5, 0x14, 0x82, 0x62, 0xf3, 0xe7, + 0x3e, 0x7c, 0xe8, 0xff, 0x9c, 0xe8, 0xbc, 0x84, 0x5f, 0x5d, 0xbb, 0x90, 0x9c, 0xf6, 0xe8, 0x5e, + 0x0c, 0x4e, 0xc0, 0x73, 0xe1, 0xe1, 0xc9, 0xea, 0xf8, 0xc6, 0x2b, 0x61, 0xc3, 0xf5, 0x0d, 0xf9, + 0x75, 0xff, 0xe1, 0x53, 0xb1, 0xf4, 0x5a, 0x22, 0x58, 0x17, 0xb6, 0x86, 0xcf, 0x4e, 0x7f, 0xe9, + 0x28, 0xd9, 0x63, 0x80, 0x6a, 0xc5, 0x38, 0x68, 0x4a, 0x6a, 0x21, 0x33, 0xd6, 0x76, 0x54, 0x62, + 0x1e, 0x60, 0xa7, 0xb9, 0x21, 0x3c, 0x2a, 0xfa, 0x5b, 0xb3, 0x62, 0xc7, 0xeb, 0x8e, 0x0b, 0xe4, + 0xd4, 0xb3, 0x7f, 0xd8, 0xe5, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0xc6, 0x53, 0xd9, 0x93, + 0x03, 0x00, 0x00, } diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go index 3d92861..51f962e 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go @@ -22,6 +22,8 @@ type SSHUploadPackRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` // A chunk of raw data to be copied to 'git upload-pack' standard input Stdin []byte `protobuf:"bytes,2,opt,name=stdin,proto3" json:"stdin,omitempty"` + // Parameters to use with git -c (key=value pairs) + GitConfigParameters [][]byte `protobuf:"bytes,3,rep,name=git_config_parameters,json=gitConfigParameters,proto3" json:"git_config_parameters,omitempty"` } func (m *SSHUploadPackRequest) Reset() { *m = SSHUploadPackRequest{} } @@ -43,6 +45,13 @@ func (m *SSHUploadPackRequest) GetStdin() []byte { return nil } +func (m *SSHUploadPackRequest) GetGitConfigParameters() [][]byte { + if m != nil { + return m.GitConfigParameters + } + return nil +} + type SSHUploadPackResponse struct { // A chunk of raw data from 'git upload-pack' standard output Stdout []byte `protobuf:"bytes,1,opt,name=stdout,proto3" json:"stdout,omitempty"` @@ -342,25 +351,27 @@ var _SSHService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("ssh.proto", fileDescriptor9) } var fileDescriptor9 = []byte{ - // 307 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x52, 0xcf, 0x4e, 0x32, 0x31, - 0x10, 0xff, 0xfa, 0x09, 0x24, 0x0c, 0x8b, 0x87, 0x11, 0x09, 0x21, 0x6a, 0xc8, 0x7a, 0xe1, 0x44, - 0x0c, 0x3c, 0x83, 0x09, 0xde, 0x4c, 0x1b, 0xce, 0xb8, 0xd2, 0xc9, 0xd2, 0xd8, 0xd0, 0xb5, 0x2d, - 0x04, 0x12, 0x7d, 0x12, 0x1f, 0xc4, 0xd7, 0x33, 0xe9, 0xae, 0xb8, 0x8b, 0x72, 0xd4, 0xdb, 0xce, - 0xfc, 0x76, 0x7e, 0x7f, 0x3a, 0x03, 0x4d, 0xe7, 0x96, 0xa3, 0xcc, 0x1a, 0x6f, 0xb0, 0x91, 0x2a, - 0x9f, 0xe8, 0x5d, 0x3f, 0x72, 0xcb, 0xc4, 0x92, 0xcc, 0xbb, 0xf1, 0x03, 0x74, 0x84, 0x98, 0xce, - 0x32, 0x6d, 0x12, 0x79, 0x9f, 0x2c, 0x9e, 0x38, 0x3d, 0xaf, 0xc9, 0x79, 0x1c, 0x03, 0x58, 0xca, - 0x8c, 0x53, 0xde, 0xd8, 0x5d, 0x8f, 0x0d, 0xd8, 0xb0, 0x35, 0xc6, 0x51, 0x4e, 0x31, 0xe2, 0x7b, - 0x84, 0x97, 0xfe, 0xc2, 0x0e, 0xd4, 0x9d, 0x97, 0x6a, 0xd5, 0xfb, 0x3f, 0x60, 0xc3, 0x88, 0xe7, - 0x45, 0xfc, 0x02, 0xe7, 0x07, 0x0a, 0x2e, 0x33, 0x2b, 0x47, 0xd8, 0x85, 0x86, 0xf3, 0xd2, 0xac, - 0x7d, 0xa0, 0x8f, 0x78, 0x51, 0x15, 0x7d, 0xb2, 0xb6, 0xe0, 0x29, 0x2a, 0x9c, 0x40, 0x8b, 0xb6, - 0xca, 0xcf, 0x9d, 0x4f, 0xfc, 0xda, 0xf5, 0x4e, 0xaa, 0x9e, 0x6e, 0xb7, 0xca, 0x8b, 0x80, 0x70, - 0xa0, 0xfd, 0x77, 0xfc, 0xc6, 0x82, 0x3c, 0xa7, 0x05, 0xa9, 0x0d, 0xfd, 0x4a, 0x42, 0x3c, 0x83, - 0x7a, 0xaa, 0xe7, 0x4a, 0x06, 0x4b, 0x4d, 0x5e, 0x4b, 0xf5, 0x9d, 0xc4, 0x6b, 0x68, 0xa7, 0x7a, - 0x5e, 0x52, 0xa8, 0x05, 0x30, 0x4a, 0xf5, 0x17, 0x77, 0xfc, 0x0a, 0xdd, 0x43, 0x73, 0x7f, 0xf8, - 0x38, 0xe3, 0x77, 0x06, 0x20, 0xc4, 0x54, 0x90, 0xdd, 0xa8, 0x05, 0x21, 0x87, 0x76, 0x65, 0x53, - 0x78, 0xf1, 0x39, 0xff, 0xd3, 0x89, 0xf4, 0x2f, 0x8f, 0xa0, 0x79, 0x82, 0xf8, 0xdf, 0x90, 0xdd, - 0x30, 0x9c, 0xc1, 0x69, 0x35, 0x21, 0x96, 0xc7, 0xbe, 0xaf, 0xa5, 0x7f, 0x75, 0x0c, 0x2e, 0xd3, - 0x3e, 0x36, 0xc2, 0xf5, 0x4e, 0x3e, 0x02, 0x00, 0x00, 0xff, 0xff, 0x79, 0x5b, 0x32, 0x2b, 0xe0, - 0x02, 0x00, 0x00, + // 344 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x92, 0xcd, 0x4e, 0xea, 0x40, + 0x14, 0xc7, 0xef, 0x5c, 0x3e, 0x12, 0x0e, 0xe5, 0x2e, 0x86, 0x8f, 0x10, 0x72, 0xef, 0x0d, 0xa9, + 0x9b, 0xae, 0x88, 0x29, 0x8f, 0x60, 0x4c, 0x70, 0x47, 0xa6, 0x61, 0xdd, 0xd4, 0xf6, 0x38, 0x4c, + 0xac, 0x4c, 0x9d, 0x39, 0x10, 0x48, 0xf4, 0x2d, 0xdc, 0xf9, 0x20, 0xbe, 0x9e, 0xb1, 0xad, 0x58, + 0x50, 0x96, 0xba, 0xeb, 0x99, 0x5f, 0xcf, 0xf9, 0xff, 0xcf, 0x07, 0xb4, 0xac, 0x5d, 0x4e, 0x32, + 0xa3, 0x49, 0xf3, 0xa6, 0x54, 0x14, 0xa5, 0xbb, 0x91, 0x63, 0x97, 0x91, 0xc1, 0xa4, 0x78, 0x75, + 0x9f, 0x18, 0xf4, 0x82, 0x60, 0xb6, 0xc8, 0x52, 0x1d, 0x25, 0xf3, 0x28, 0xbe, 0x15, 0x78, 0xbf, + 0x46, 0x4b, 0xdc, 0x07, 0x30, 0x98, 0x69, 0xab, 0x48, 0x9b, 0xdd, 0x90, 0x8d, 0x99, 0xd7, 0xf6, + 0xf9, 0xa4, 0xa8, 0x31, 0x11, 0x7b, 0x22, 0x2a, 0x7f, 0xf1, 0x1e, 0x34, 0x2c, 0x25, 0x6a, 0x35, + 0xfc, 0x3d, 0x66, 0x9e, 0x23, 0x8a, 0x80, 0xfb, 0xd0, 0x97, 0x8a, 0xc2, 0x58, 0xaf, 0x6e, 0x94, + 0x0c, 0xb3, 0xc8, 0x44, 0x77, 0x48, 0x68, 0xec, 0xb0, 0x36, 0xae, 0x79, 0x8e, 0xe8, 0x4a, 0x45, + 0x17, 0x39, 0x9b, 0xef, 0x91, 0xfb, 0x00, 0xfd, 0x23, 0x57, 0x36, 0xd3, 0x2b, 0x8b, 0x7c, 0x00, + 0x4d, 0x4b, 0x89, 0x5e, 0x53, 0x6e, 0xc9, 0x11, 0x65, 0x54, 0xbe, 0xa3, 0x31, 0xa5, 0x76, 0x19, + 0xf1, 0x29, 0xb4, 0x71, 0xab, 0x28, 0xb4, 0x14, 0xd1, 0xfa, 0x4d, 0xf2, 0xa0, 0x8f, 0xcb, 0xad, + 0xa2, 0x20, 0x27, 0x02, 0x70, 0xff, 0xed, 0x3e, 0xb3, 0x5c, 0x5e, 0x60, 0x8c, 0x6a, 0x83, 0xdf, + 0x33, 0x95, 0x2e, 0x34, 0x64, 0x1a, 0xaa, 0x24, 0xb7, 0xd4, 0x12, 0x75, 0x99, 0x5e, 0x25, 0xfc, + 0x0c, 0x3a, 0x32, 0x0d, 0x2b, 0x0a, 0xf5, 0x1c, 0x3a, 0x32, 0xfd, 0xa8, 0xed, 0x3e, 0xc2, 0xe0, + 0xd8, 0xdc, 0x0f, 0x0e, 0xc7, 0x7f, 0x61, 0x00, 0x41, 0x30, 0x0b, 0xd0, 0x6c, 0x54, 0x8c, 0x5c, + 0x40, 0xe7, 0x60, 0x53, 0xfc, 0xef, 0x7b, 0xfe, 0x57, 0x67, 0x35, 0xfa, 0x77, 0x82, 0x16, 0x1d, + 0xb8, 0xbf, 0x3c, 0x76, 0xce, 0xf8, 0x02, 0xfe, 0x1c, 0x76, 0xc8, 0xab, 0x69, 0x9f, 0xd7, 0x32, + 0xfa, 0x7f, 0x0a, 0x57, 0xcb, 0x5e, 0x37, 0xf3, 0x93, 0x9f, 0xbe, 0x06, 0x00, 0x00, 0xff, 0xff, + 0xad, 0xff, 0xd1, 0xd9, 0x15, 0x03, 0x00, 0x00, } diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly/client/receive_pack.go b/go/vendor/gitlab.com/gitlab-org/gitaly/client/receive_pack.go index 39ba7ae..84dbe88 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly/client/receive_pack.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly/client/receive_pack.go @@ -3,12 +3,12 @@ package client import ( "io" - "google.golang.org/grpc" - - "golang.org/x/net/context" + "gitlab.com/gitlab-org/gitaly/streamio" pb "gitlab.com/gitlab-org/gitaly-proto/go" - pbhelper "gitlab.com/gitlab-org/gitaly-proto/go/helper" + + "golang.org/x/net/context" + "google.golang.org/grpc" ) // ReceivePack proxies an SSH git-receive-pack (git push) session to Gitaly @@ -16,7 +16,7 @@ func ReceivePack(ctx context.Context, conn *grpc.ClientConn, stdin io.Reader, st ctx2, cancel := context.WithCancel(ctx) defer cancel() - ssh := pb.NewSSHClient(conn) + ssh := pb.NewSSHServiceClient(conn) stream, err := ssh.SSHReceivePack(ctx2) if err != nil { return 0, err @@ -26,7 +26,7 @@ func ReceivePack(ctx context.Context, conn *grpc.ClientConn, stdin io.Reader, st return 0, err } - inWriter := pbhelper.NewSendWriter(func(p []byte) error { + inWriter := streamio.NewWriter(func(p []byte) error { return stream.Send(&pb.SSHReceivePackRequest{Stdin: p}) }) diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly/client/upload_pack.go b/go/vendor/gitlab.com/gitlab-org/gitaly/client/upload_pack.go index eb0fc7d..690ae65 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly/client/upload_pack.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly/client/upload_pack.go @@ -3,12 +3,12 @@ package client import ( "io" - "google.golang.org/grpc" - - "golang.org/x/net/context" + "gitlab.com/gitlab-org/gitaly/streamio" pb "gitlab.com/gitlab-org/gitaly-proto/go" - pbhelper "gitlab.com/gitlab-org/gitaly-proto/go/helper" + + "golang.org/x/net/context" + "google.golang.org/grpc" ) // UploadPack proxies an SSH git-upload-pack (git fetch) session to Gitaly @@ -16,7 +16,7 @@ func UploadPack(ctx context.Context, conn *grpc.ClientConn, stdin io.Reader, std ctx2, cancel := context.WithCancel(ctx) defer cancel() - ssh := pb.NewSSHClient(conn) + ssh := pb.NewSSHServiceClient(conn) stream, err := ssh.SSHUploadPack(ctx2) if err != nil { return 0, err @@ -26,7 +26,7 @@ func UploadPack(ctx context.Context, conn *grpc.ClientConn, stdin io.Reader, std return 0, err } - inWriter := pbhelper.NewSendWriter(func(p []byte) error { + inWriter := streamio.NewWriter(func(p []byte) error { return stream.Send(&pb.SSHUploadPackRequest{Stdin: p}) }) diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly/streamio/stream.go b/go/vendor/gitlab.com/gitlab-org/gitaly/streamio/stream.go new file mode 100644 index 0000000..379556a --- /dev/null +++ b/go/vendor/gitlab.com/gitlab-org/gitaly/streamio/stream.go @@ -0,0 +1,136 @@ +// Package streamio contains wrappers intended for turning gRPC streams +// that send/receive messages with a []byte field into io.Writers and +// io.Readers. +// +package streamio + +import ( + "io" + "os" + "strconv" +) + +func init() { + bufSize64, err := strconv.ParseInt(os.Getenv("GITALY_STREAMIO_WRITE_BUFFER_SIZE"), 10, 32) + if err == nil && bufSize64 > 0 { + WriteBufferSize = int(bufSize64) + } +} + +// NewReader turns receiver into an io.Reader. Errors from the receiver +// function are passed on unmodified. This means receiver should emit +// io.EOF when done. +func NewReader(receiver func() ([]byte, error)) io.Reader { + return &receiveReader{receiver: receiver} +} + +type receiveReader struct { + receiver func() ([]byte, error) + data []byte + err error +} + +func (rr *receiveReader) Read(p []byte) (int, error) { + if len(rr.data) == 0 { + rr.data, rr.err = rr.receiver() + } + n := copy(p, rr.data) + rr.data = rr.data[n:] + if len(rr.data) == 0 { + return n, rr.err + } + return n, nil +} + +// WriteTo implements io.WriterTo. +func (rr *receiveReader) WriteTo(w io.Writer) (int64, error) { + var written int64 + + // Deal with left-over state in rr.data and rr.err, if any + if len(rr.data) > 0 { + n, err := w.Write(rr.data) + written += int64(n) + if err != nil { + return written, err + } + } + if rr.err != nil { + return written, rr.err + } + + // Consume the response stream + var errRead, errWrite error + var n int + var buf []byte + for errWrite == nil && errRead != io.EOF { + buf, errRead = rr.receiver() + if errRead != nil && errRead != io.EOF { + return written, errRead + } + + if len(buf) > 0 { + n, errWrite = w.Write(buf) + written += int64(n) + } + } + + return written, errWrite +} + +// NewWriter turns sender into an io.Writer. The sender callback will +// receive []byte arguments of length at most WriteBufferSize. +func NewWriter(sender func(p []byte) error) io.Writer { + return &sendWriter{sender: sender} +} + +// WriteBufferSize is the largest []byte that Write() will pass to its +// underlying send function. This value can be changed at runtime using +// the GITALY_STREAMIO_WRITE_BUFFER_SIZE environment variable. +var WriteBufferSize = 128 * 1024 + +type sendWriter struct { + sender func([]byte) error +} + +func (sw *sendWriter) Write(p []byte) (int, error) { + var sent int + + for len(p) > 0 { + chunkSize := len(p) + if chunkSize > WriteBufferSize { + chunkSize = WriteBufferSize + } + + if err := sw.sender(p[:chunkSize]); err != nil { + return sent, err + } + + sent += chunkSize + p = p[chunkSize:] + } + + return sent, nil +} + +// ReadFrom implements io.ReaderFrom. +func (sw *sendWriter) ReadFrom(r io.Reader) (int64, error) { + var nRead int64 + buf := make([]byte, WriteBufferSize) + + var errRead, errSend error + for errSend == nil && errRead != io.EOF { + var n int + + n, errRead = r.Read(buf) + nRead += int64(n) + if errRead != nil && errRead != io.EOF { + return nRead, errRead + } + + if n > 0 { + errSend = sw.sender(buf[:n]) + } + } + + return nRead, errSend +} diff --git a/go/vendor/vendor.json b/go/vendor/vendor.json index 0cbbe90..99fae6c 100644 --- a/go/vendor/vendor.json +++ b/go/vendor/vendor.json @@ -21,29 +21,37 @@ "revisionTime": "2017-03-31T03:19:02Z" }, { - "checksumSHA1": "FPNHA80Wu9QTcNcjbuw0kdLOg5Q=", + "checksumSHA1": "+CNxvSTtLN/56WUMMlQvgJFCz2o=", "path": "gitlab.com/gitlab-org/gitaly-proto/go", - "revision": "e73c809c669748d0f49e257a249c4c12b59f7968", - "revisionTime": "2017-07-07T12:10:40Z", + "revision": "595c853b19e3440dde3728044a136d940811c1f9", + "revisionTime": "2017-07-25T17:44:10Z", "tree": true, - "version": "v0.14.0", - "versionExact": "v0.14.0" + "version": "v0.20.0", + "versionExact": "v0.20.0" }, { "checksumSHA1": "dUHJbKas746n5fLzlwxHb6FOCxs=", "path": "gitlab.com/gitlab-org/gitaly/auth", - "revision": "e4f8d3d14cc3fe673cb511fb4d0189b68a158ccd", - "revisionTime": "2017-06-30T12:58:40Z", - "version": "v0.14.0", - "versionExact": "v0.14.0" + "revision": "421641a7cd5a5d7edd8008a8089acbe9335b7f3d", + "revisionTime": "2017-07-18T12:50:12Z", + "version": "v0.21.2", + "versionExact": "v0.21.2" }, { - "checksumSHA1": "Z/BteCm3WErBI8bBmSN9gD+3EbU=", + "checksumSHA1": "qlzYmQ21XX/voiKWHDWUZ3lybGQ=", "path": "gitlab.com/gitlab-org/gitaly/client", - "revision": "e4f8d3d14cc3fe673cb511fb4d0189b68a158ccd", - "revisionTime": "2017-06-30T12:58:40Z", - "version": "v0.14.0", - "versionExact": "v0.14.0" + "revision": "421641a7cd5a5d7edd8008a8089acbe9335b7f3d", + "revisionTime": "2017-07-18T12:50:12Z", + "version": "v0.21.2", + "versionExact": "v0.21.2" + }, + { + "checksumSHA1": "mifcYH0qXpoPkX5KzXoM3mterWQ=", + "path": "gitlab.com/gitlab-org/gitaly/streamio", + "revision": "421641a7cd5a5d7edd8008a8089acbe9335b7f3d", + "revisionTime": "2017-07-18T12:50:12Z", + "version": "v0.21.2", + "versionExact": "v0.21.2" }, { "checksumSHA1": "Y+HGqEkYM15ir+J93MEaHdyFy0c=", @@ -230,6 +238,11 @@ "path": "gopkg.in/yaml.v2", "revision": "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b", "revisionTime": "2017-04-07T17:21:22Z" + }, + { + "path": "vendor/gitlab.com/gitlab-org/gitaly/streamio", + "revision": "v0.21.2", + "version": "v0.21.2" } ], "rootPath": "gitlab.com/gitlab-org/gitlab-shell/go" diff --git a/lib/gitlab_access_status.rb b/lib/gitlab_access_status.rb index a6a274c..988ff7a 100644 --- a/lib/gitlab_access_status.rb +++ b/lib/gitlab_access_status.rb @@ -1,19 +1,25 @@ require 'json' class GitAccessStatus - attr_reader :message, :gl_repository, :repository_path, :gitaly + attr_reader :message, :gl_repository, :repository_path, :gitaly, :geo_node - def initialize(status, message, gl_repository, repository_path, gitaly) + def initialize(status, message, gl_repository, repository_path, gitaly, geo_node = false) @status = status @message = message @gl_repository = gl_repository @repository_path = repository_path @gitaly = gitaly + @geo_node = geo_node end def self.create_from_json(json) values = JSON.parse(json) - self.new(values["status"], values["message"], values["gl_repository"], values["repository_path"], values["gitaly"]) + self.new(values["status"], + values["message"], + values["gl_repository"], + values["repository_path"], + values["gitaly"], + values["geo_node"]) end def allowed? diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index fad06d6..3acebea 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -39,7 +39,7 @@ class GitlabNet if resp.code == '200' GitAccessStatus.create_from_json(resp.body) else - GitAccessStatus.new(false, 'API is not accessible', nil, nil) + GitAccessStatus.new(false, 'API is not accessible', nil, nil, nil) end end @@ -73,7 +73,14 @@ class GitlabNet url = "#{host}/merge_request_urls?project=#{URI.escape(repo_path)}&changes=#{URI.escape(changes)}" url += "&gl_repository=#{URI.escape(gl_repository)}" if gl_repository resp = get(url) - JSON.parse(resp.body) rescue [] + + if resp.code == '200' + JSON.parse(resp.body) + else + [] + end + rescue + [] end def check diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index 262f9f7..e3025ef 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -17,7 +17,7 @@ class GitlabShell API_COMMANDS = %w(2fa_recovery_codes) GL_PROTOCOL = 'ssh'.freeze - attr_accessor :key_id, :gl_repository, :repo_name, :command, :git_access + attr_accessor :key_id, :gl_repository, :repo_name, :command, :git_access, :show_all_refs attr_reader :repo_path def initialize(key_id) @@ -100,6 +100,7 @@ class GitlabShell self.repo_path = status.repository_path @gl_repository = status.gl_repository @gitaly = status.gitaly + @show_all_refs = status.geo_node end def process_cmd(args) @@ -159,6 +160,10 @@ class GitlabShell env['GITALY_TOKEN'] = @gitaly['token'] end + # We have to use a negative transfer.hideRefs since this is the only way + # to undo an already set parameter: https://www.spinics.net/lists/git/msg256772.html + env['GIT_CONFIG_PARAMETERS'] = "'transfer.hideRefs=!refs'" if @show_all_refs + if git_trace_available? env.merge!({ 'GIT_TRACE' => @config.git_trace_log_file, diff --git a/spec/gitlab_net_spec.rb b/spec/gitlab_net_spec.rb index f3c67fd..3960c96 100644 --- a/spec/gitlab_net_spec.rb +++ b/spec/gitlab_net_spec.rb @@ -2,7 +2,6 @@ require_relative 'spec_helper' require_relative '../lib/gitlab_net' require_relative '../lib/gitlab_access_status' - describe GitlabNet, vcr: true do let(:gitlab_net) { GitlabNet.new } let(:changes) { ['0000000000000000000000000000000000000000 92d0970eefd7acb6d548878925ce2208cfe2d2ec refs/heads/branch4'] } @@ -97,20 +96,33 @@ describe GitlabNet, vcr: true do describe :merge_request_urls do let(:gl_repository) { "project-1" } - let(:repo_path) { "/path/to/my/repo.git" } let(:changes) { "123456 789012 refs/heads/test\n654321 210987 refs/tags/tag" } let(:encoded_changes) { "123456%20789012%20refs/heads/test%0A654321%20210987%20refs/tags/tag" } it "sends the given arguments as encoded URL parameters" do - gitlab_net.should_receive(:get).with("#{host}/merge_request_urls?project=#{repo_path}&changes=#{encoded_changes}&gl_repository=#{gl_repository}") + gitlab_net.should_receive(:get).with("#{host}/merge_request_urls?project=#{project}&changes=#{encoded_changes}&gl_repository=#{gl_repository}") - gitlab_net.merge_request_urls(gl_repository, repo_path, changes) + gitlab_net.merge_request_urls(gl_repository, project, changes) end it "omits the gl_repository parameter if it's nil" do - gitlab_net.should_receive(:get).with("#{host}/merge_request_urls?project=#{repo_path}&changes=#{encoded_changes}") + gitlab_net.should_receive(:get).with("#{host}/merge_request_urls?project=#{project}&changes=#{encoded_changes}") + + gitlab_net.merge_request_urls(nil, project, changes) + end + + it "returns an empty array when the result cannot be parsed as JSON" do + response = double(:response, code: '200', body: '') + allow(gitlab_net).to receive(:get).and_return(response) + + expect(gitlab_net.merge_request_urls(gl_repository, project, changes)).to eq([]) + end + + it "returns an empty array when the result's status is not 200" do + response = double(:response, code: '500', body: '[{}]') + allow(gitlab_net).to receive(:get).and_return(response) - gitlab_net.merge_request_urls(nil, repo_path, changes) + expect(gitlab_net.merge_request_urls(gl_repository, project, changes)).to eq([]) end end diff --git a/spec/gitlab_shell_spec.rb b/spec/gitlab_shell_spec.rb index 29093ac..87389b4 100644 --- a/spec/gitlab_shell_spec.rb +++ b/spec/gitlab_shell_spec.rb @@ -19,7 +19,7 @@ describe GitlabShell do end end - let(:gitaly_check_access) { GitAccessStatus.new(true, 'ok', gl_repository, repo_path, { 'repository' => { 'relative_path' => repo_name, 'storage_name' => 'default'} , 'address' => 'unix:gitaly.socket' })} + let(:gitaly_check_access) { GitAccessStatus.new(true, 'ok', gl_repository, repo_path, { 'repository' => { 'relative_path' => repo_name, 'storage_name' => 'default'} , 'address' => 'unix:gitaly.socket' }) } let(:api) do double(GitlabNet).tap do |api| @@ -386,6 +386,20 @@ describe GitlabShell do shell.send :exec_cmd, [1, 2] end + context "when show_all_refs is enabled" do + before { shell.show_all_refs = true } + + it 'sets local git parameters' do + expected_hash = hash_including( + 'GIT_CONFIG_PARAMETERS' => "'transfer.hideRefs=!refs'" + ) + + Kernel.should_receive(:exec).with(expected_hash, [1, 2], exec_options).once + + shell.send :exec_cmd, [1, 2] + end + end + context "when specifying a git_tracing log file" do let(:git_trace_log_file) { '/tmp/git_trace_performance.log' } |