Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Sherif <me@ahmadsherif.com>2017-06-07 16:03:49 +0300
committerAhmad Sherif <me@ahmadsherif.com>2017-06-09 03:58:15 +0300
commitca033e062c7cf693fc5258134025b0d4404f1c81 (patch)
treeee1d468b7035e593d298fc62fdfa47bbacaa6eb7
parent2ea32f2457426f69954ebd12a4d3f9c27a16fe40 (diff)
-rw-r--r--internal/service/blob/blob_from_commit.go181
-rw-r--r--internal/service/blob/blob_from_commit_test.go165
-rw-r--r--internal/service/blob/server.go14
-rw-r--r--internal/service/blob/testdata/maintenance-md-blob.txt26
-rw-r--r--internal/service/blob/testdata/with-space-readme-md-blob.txt1
-rw-r--r--internal/service/blob/testhelper_test.go26
-rw-r--r--vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go280
-rw-r--r--vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go61
-rw-r--r--vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go14
-rw-r--r--vendor/gitlab.com/gitlab-org/gitaly-proto/go/notifications.pb.go8
-rw-r--r--vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go30
-rw-r--r--vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go8
-rw-r--r--vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go16
-rw-r--r--vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go12
-rw-r--r--vendor/vendor.json10
15 files changed, 746 insertions, 106 deletions
diff --git a/internal/service/blob/blob_from_commit.go b/internal/service/blob/blob_from_commit.go
new file mode 100644
index 000000000..bb7c72c9e
--- /dev/null
+++ b/internal/service/blob/blob_from_commit.go
@@ -0,0 +1,181 @@
+package blob
+
+import (
+ "bufio"
+ "bytes"
+ "fmt"
+ "io"
+ "log"
+ "os/exec"
+ "path"
+ "strconv"
+ "strings"
+
+ "gitlab.com/gitlab-org/gitaly/internal/helper"
+
+ pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+ "google.golang.org/grpc"
+ "google.golang.org/grpc/codes"
+)
+
+func (s *server) BlobFromCommit(in *pb.BlobFromCommitRequest, stream pb.Blob_BlobFromCommitServer) error {
+ if err := validateRequest(in); err != nil {
+ return grpc.Errorf(codes.InvalidArgument, "BlobFromCommit: %v", err)
+ }
+
+ repoPath, err := helper.GetRepoPath(in.Repository)
+ if err != nil {
+ return err
+ }
+
+ stdinReader, stdinWriter := io.Pipe()
+
+ cmdArgs := []string{
+ "--git-dir", repoPath,
+ "cat-file",
+ "--batch",
+ }
+ cmd, err := helper.NewCommand(exec.Command("git", cmdArgs...), stdinReader, nil, nil)
+ if err != nil {
+ return grpc.Errorf(codes.Internal, "BlobFromCommit: cmd: %v", err)
+ }
+ defer cmd.Kill()
+ // Needed?
+ defer stdinWriter.Close()
+ defer stdinReader.Close()
+
+ dirName := path.Dir(string(in.GetPath()))
+ if dirName == "." {
+ dirName = ""
+ }
+ baseName := path.Base(string(in.GetPath()))
+
+ treeObject := fmt.Sprintf("%s^{tree}:%s\n", in.GetCommitId(), dirName) // TODO: Escape both args
+ stdinWriter.Write([]byte(treeObject))
+
+ buf := bufio.NewReader(cmd)
+ line, err := buf.ReadBytes('\n')
+ if err != nil {
+ return grpc.Errorf(codes.Internal, "BlobFromCommit: stdout initial read: %v", err)
+ }
+
+ if bytes.HasSuffix(line, []byte("missing\n")) {
+ response := &pb.BlobFromCommitResponse{
+ Found: false,
+ }
+ stream.Send(response)
+
+ return nil
+ }
+
+ treeInfo := bytes.Split(line, []byte(" "))
+ treeSizeStr := string(treeInfo[2])
+ treeSizeStr = strings.TrimSpace(treeSizeStr)
+ treeSize, err := strconv.ParseInt(treeSizeStr, 10, 0)
+ if err != nil {
+ return grpc.Errorf(codes.Internal, "BlobFromCommit: parse tree size: %v", err)
+ }
+
+ var mode, path []byte
+ sha := make([]byte, 20)
+ entryFound := false
+ bytesLeft := int(treeSize) // XXX: should it be int?
+
+ for {
+ mode, err = buf.ReadBytes(' ')
+ if err != nil {
+ return grpc.Errorf(codes.Internal, "BlobFromCommit: read entry mode: %v", err)
+ }
+ bytesLeft -= len(mode)
+
+ path, err = buf.ReadBytes('\x00')
+ if err != nil {
+ return grpc.Errorf(codes.Internal, "BlobFromCommit: read entry path: %v", err)
+ }
+ bytesLeft -= len(path)
+
+ if n, _ := buf.Read(sha); n != 20 {
+ return grpc.Errorf(codes.Internal, "BlobFromCommit: read entry sha: %v", err)
+ }
+ bytesLeft -= len(sha)
+
+ if strings.TrimSuffix(string(path), "\x00") == baseName { // XXX
+ entryFound = true
+ break
+ }
+ }
+
+ if !entryFound {
+ response := &pb.BlobFromCommitResponse{
+ Found: false,
+ }
+ stream.Send(response)
+
+ return nil
+ }
+
+ sha = []byte(fmt.Sprintf("%02x", sha))
+
+ if string(mode) == "160000 " { // XXX: Trim that
+ response := &pb.BlobFromCommitResponse{
+ Id: string(sha),
+ Found: true,
+ }
+ stream.Send(response)
+
+ return nil
+ }
+
+ log.Printf("mode=%s path=%s", mode, path)
+
+ buf.Discard(bytesLeft + 1) // There's a linefeed at the end
+ stdinWriter.Write([]byte(fmt.Sprintf("%s\n", sha)))
+ stdinWriter.Close()
+
+ line, err = buf.ReadBytes('\n')
+ if err != nil {
+ return grpc.Errorf(codes.Internal, "BlobFromCommit: stdout initial read: %v", err)
+ }
+ blob := make([]byte, s.MsgSizeThreshold)
+ blobInfo := bytes.Split(line, []byte(" "))
+
+ blobSizeStr := string(blobInfo[2])
+ blobSizeStr = strings.TrimSpace(blobSizeStr)
+ blobSize, err := strconv.ParseInt(blobSizeStr, 10, 0)
+ if err != nil {
+ return grpc.Errorf(codes.Internal, "BlobFromCommit: parse blob size: %v", err)
+ }
+
+ for {
+ n, err := buf.Read(blob)
+ if err != nil && err != io.EOF {
+ return grpc.Errorf(codes.Internal, "BlobFromCommit: stdout read: %v", err)
+ }
+ if n == 0 {
+ break
+ }
+
+ response := &pb.BlobFromCommitResponse{
+ Id: string(blobInfo[0]),
+ Blob: blob[:n],
+ Size: int32(blobSize),
+ Found: true,
+ }
+ stream.Send(response)
+ }
+
+ return nil
+}
+
+func validateRequest(in *pb.BlobFromCommitRequest) error {
+ if in.GetCommitId() == "" {
+ return fmt.Errorf("empty CommitId")
+ }
+
+ if len(in.GetPath()) == 0 {
+ return fmt.Errorf("empty Path")
+ }
+
+ return nil
+}
diff --git a/internal/service/blob/blob_from_commit_test.go b/internal/service/blob/blob_from_commit_test.go
new file mode 100644
index 000000000..9f6f15b34
--- /dev/null
+++ b/internal/service/blob/blob_from_commit_test.go
@@ -0,0 +1,165 @@
+package blob
+
+import (
+ "bytes"
+ "io"
+ "net"
+ "path"
+ "testing"
+ "time"
+
+ "gitlab.com/gitlab-org/gitaly/internal/testhelper"
+
+ pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+ "golang.org/x/net/context"
+ "google.golang.org/grpc"
+ "google.golang.org/grpc/reflection"
+)
+
+var serverSocketPath = path.Join(scratchDir, "gitaly.sock")
+
+type blob struct {
+ id string
+ content []byte
+ size int32
+ found bool
+}
+
+func TestSuccessfulBlobFromCommit(t *testing.T) {
+ server := runBlobServer(t)
+ defer server.Stop()
+
+ client := newBlobClient(t)
+ repo := &pb.Repository{Path: testRepoPath}
+
+ testCases := []struct {
+ commit string
+ path []byte
+ limit int
+ expectedBlob blob
+ }{
+ {
+ commit: "913c66a37b4a45b9769037c55c2d238bd0942d2e",
+ path: []byte("MAINTENANCE.md"),
+ expectedBlob: blob{
+ id: "95d9f0a5e7bb054e9dd3975589b8dfc689e20e88",
+ content: testhelper.MustReadFile(t, "testdata/maintenance-md-blob.txt"),
+ size: 1367,
+ found: true,
+ },
+ },
+ {
+ commit: "38008cb17ce1466d8fec2dfa6f6ab8dcfe5cf49e",
+ path: []byte("with space/README.md"),
+ expectedBlob: blob{
+ id: "8c3014aceae45386c3c026a7ea4a1f68660d51d6",
+ content: testhelper.MustReadFile(t, "testdata/with-space-readme-md-blob.txt"),
+ size: 36,
+ found: true,
+ },
+ },
+ {
+ commit: "deadfacedeadfacedeadfacedeadfacedeadface",
+ path: []byte("with space/README.md"),
+ expectedBlob: blob{
+ found: false,
+ },
+ },
+ {
+ commit: "e63f41fe459e62e1228fcef60d7189127aeba95a",
+ path: []byte("gitlab-grack"),
+ expectedBlob: blob{
+ id: "645f6c4c82fd3f5e06f67134450a570b795e55a6",
+ found: true,
+ },
+ },
+ }
+
+ for _, testCase := range testCases {
+ t.Logf("test case: commit=%q path=%q", testCase.commit, testCase.path)
+
+ request := &pb.BlobFromCommitRequest{
+ Repository: repo,
+ CommitId: testCase.commit,
+ Path: testCase.path,
+ }
+
+ c, err := client.BlobFromCommit(context.Background(), request)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ assertExactReceivedBlob(t, c, &testCase.expectedBlob)
+ }
+}
+
+func runBlobServer(t *testing.T) *grpc.Server {
+ server := grpc.NewServer()
+ listener, err := net.Listen("unix", serverSocketPath)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ pb.RegisterBlobServer(server, NewServer())
+ reflection.Register(server)
+
+ go server.Serve(listener)
+
+ return server
+}
+
+func newBlobClient(t *testing.T) pb.BlobClient {
+ connOpts := []grpc.DialOption{
+ grpc.WithInsecure(),
+ grpc.WithDialer(func(addr string, _ time.Duration) (net.Conn, error) {
+ return net.Dial("unix", addr)
+ }),
+ }
+ conn, err := grpc.Dial(serverSocketPath, connOpts...)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ return pb.NewBlobClient(conn)
+}
+
+func getBlobFromBlobFromCommitClient(t *testing.T, client pb.Blob_BlobFromCommitClient) *blob {
+ fetchedBlob := &blob{}
+
+ for {
+ resp, err := client.Recv()
+ if err == io.EOF {
+ break
+ } else if err != nil {
+ t.Fatal(err)
+ }
+
+ fetchedBlob.id = resp.GetId()
+ fetchedBlob.found = resp.GetFound()
+ fetchedBlob.size = resp.GetSize()
+ fetchedBlob.content = append(fetchedBlob.content, resp.GetBlob()...)
+ }
+
+ return fetchedBlob
+}
+
+func assertExactReceivedBlob(t *testing.T, client pb.Blob_BlobFromCommitClient, expectedBlob *blob) {
+ fetchedBlob := getBlobFromBlobFromCommitClient(t, client)
+
+ if fetchedBlob.found != expectedBlob.found {
+ t.Errorf("Expected blob existence to be %t, got %t", expectedBlob.found, fetchedBlob.found)
+ }
+
+ if fetchedBlob.id != expectedBlob.id {
+ t.Errorf("Expected blob ID to be %q, got %q", expectedBlob.id, fetchedBlob.id)
+ }
+
+ if !bytes.Equal(fetchedBlob.content, expectedBlob.content) {
+ t.Errorf("Expected blob content to be %q, got %q", expectedBlob.content, fetchedBlob.content)
+ }
+
+ if fetchedBlob.size != expectedBlob.size {
+ t.Errorf("Expected blob size to be %d, got %d", expectedBlob.size, fetchedBlob.size)
+ }
+}
diff --git a/internal/service/blob/server.go b/internal/service/blob/server.go
new file mode 100644
index 000000000..4a7701c46
--- /dev/null
+++ b/internal/service/blob/server.go
@@ -0,0 +1,14 @@
+package blob
+
+import pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+const msgSizeThreshold = 8 * 1024
+
+type server struct {
+ MsgSizeThreshold int
+}
+
+// NewServer creates a new instance of a grpc BlobServer
+func NewServer() pb.BlobServer {
+ return &server{MsgSizeThreshold: msgSizeThreshold}
+}
diff --git a/internal/service/blob/testdata/maintenance-md-blob.txt b/internal/service/blob/testdata/maintenance-md-blob.txt
new file mode 100644
index 000000000..f9c7f0513
--- /dev/null
+++ b/internal/service/blob/testdata/maintenance-md-blob.txt
@@ -0,0 +1,26 @@
+# GitLab Maintenance Policy
+
+GitLab is a fast moving and evolving project. We currently don't have the
+resources to support many releases concurrently. We support exactly one stable
+release at any given time.
+
+GitLab follows the [Semantic Versioning](http://semver.org/) for its releases:
+`(Major).(Minor).(Patch)`.
+
+* **Major version**: Whenever there is something significant or any backwards
+ incompatible changes are introduced to the public API.
+* **Minor version**: When new, backwards compatible functionality is introduced
+ to the public API or a minor feature is introduced, or when a set of smaller
+ features is rolled out.
+* **Patch number**: When backwards compatible bug fixes are introduced that fix
+ incorrect behavior.
+
+The current stable release will receive security patches and bug fixes
+(eg. `5.0` -> `5.0.1`). Feature releases will mark the next supported stable
+release where the minor version is increased numerically by increments of one
+(eg. `5.0 -> 5.1`).
+
+We encourage everyone to run the latest stable release to ensure that you can easily upgrade to the most secure and feature rich GitLab experience. In order to make sure you can easily run the most recent stable release, we are working hard to keep the update process simple and reliable.
+
+More information about the release procedures can be found in the doc/release directory.
+
diff --git a/internal/service/blob/testdata/with-space-readme-md-blob.txt b/internal/service/blob/testdata/with-space-readme-md-blob.txt
new file mode 100644
index 000000000..049b38504
--- /dev/null
+++ b/internal/service/blob/testdata/with-space-readme-md-blob.txt
@@ -0,0 +1 @@
+This is a directory with much space.
diff --git a/internal/service/blob/testhelper_test.go b/internal/service/blob/testhelper_test.go
new file mode 100644
index 000000000..25840ae58
--- /dev/null
+++ b/internal/service/blob/testhelper_test.go
@@ -0,0 +1,26 @@
+package blob
+
+import (
+ "os"
+ "testing"
+
+ log "github.com/sirupsen/logrus"
+
+ "gitlab.com/gitlab-org/gitaly/internal/testhelper"
+)
+
+const scratchDir = "testdata/scratch"
+
+var testRepoPath = ""
+
+func TestMain(m *testing.M) {
+ testRepoPath = testhelper.GitlabTestRepoPath()
+
+ if err := os.MkdirAll(scratchDir, 0755); err != nil {
+ log.WithError(err).Fatal("mkdirall failed")
+ }
+
+ os.Exit(func() int {
+ return m.Run()
+ }())
+}
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go
new file mode 100644
index 000000000..453f3a275
--- /dev/null
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go
@@ -0,0 +1,280 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: blob.proto
+
+/*
+Package gitaly is a generated protocol buffer package.
+
+It is generated from these files:
+ blob.proto
+ commit.proto
+ diff.proto
+ notifications.proto
+ ref.proto
+ shared.proto
+ smarthttp.proto
+ ssh.proto
+
+It has these top-level messages:
+ BlobFromCommitRequest
+ BlobFromCommitResponse
+ CommitIsAncestorRequest
+ CommitIsAncestorResponse
+ CommitDiffRequest
+ CommitDiffResponse
+ CommitDeltaRequest
+ CommitDelta
+ CommitDeltaResponse
+ PostReceiveRequest
+ PostReceiveResponse
+ FindDefaultBranchNameRequest
+ FindDefaultBranchNameResponse
+ FindAllBranchNamesRequest
+ FindAllBranchNamesResponse
+ FindAllTagNamesRequest
+ FindAllTagNamesResponse
+ FindRefNameRequest
+ FindRefNameResponse
+ FindLocalBranchesRequest
+ FindLocalBranchesResponse
+ FindLocalBranchResponse
+ FindLocalBranchCommitAuthor
+ Repository
+ ExitStatus
+ InfoRefsRequest
+ InfoRefsResponse
+ PostUploadPackRequest
+ PostUploadPackResponse
+ PostReceivePackRequest
+ PostReceivePackResponse
+ SSHUploadPackRequest
+ SSHUploadPackResponse
+ SSHReceivePackRequest
+ SSHReceivePackResponse
+*/
+package gitaly
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+import (
+ context "golang.org/x/net/context"
+ grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type BlobFromCommitRequest struct {
+ Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+ CommitId string `protobuf:"bytes,2,opt,name=commit_id,json=commitId" json:"commit_id,omitempty"`
+ Path []byte `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"`
+ Limit int32 `protobuf:"varint,4,opt,name=limit" json:"limit,omitempty"`
+}
+
+func (m *BlobFromCommitRequest) Reset() { *m = BlobFromCommitRequest{} }
+func (m *BlobFromCommitRequest) String() string { return proto.CompactTextString(m) }
+func (*BlobFromCommitRequest) ProtoMessage() {}
+func (*BlobFromCommitRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *BlobFromCommitRequest) GetRepository() *Repository {
+ if m != nil {
+ return m.Repository
+ }
+ return nil
+}
+
+func (m *BlobFromCommitRequest) GetCommitId() string {
+ if m != nil {
+ return m.CommitId
+ }
+ return ""
+}
+
+func (m *BlobFromCommitRequest) GetPath() []byte {
+ if m != nil {
+ return m.Path
+ }
+ return nil
+}
+
+func (m *BlobFromCommitRequest) GetLimit() int32 {
+ if m != nil {
+ return m.Limit
+ }
+ return 0
+}
+
+type BlobFromCommitResponse struct {
+ Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+ Blob []byte `protobuf:"bytes,2,opt,name=blob,proto3" json:"blob,omitempty"`
+ Size int32 `protobuf:"varint,3,opt,name=size" json:"size,omitempty"`
+ Found bool `protobuf:"varint,4,opt,name=found" json:"found,omitempty"`
+}
+
+func (m *BlobFromCommitResponse) Reset() { *m = BlobFromCommitResponse{} }
+func (m *BlobFromCommitResponse) String() string { return proto.CompactTextString(m) }
+func (*BlobFromCommitResponse) ProtoMessage() {}
+func (*BlobFromCommitResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *BlobFromCommitResponse) GetId() string {
+ if m != nil {
+ return m.Id
+ }
+ return ""
+}
+
+func (m *BlobFromCommitResponse) GetBlob() []byte {
+ if m != nil {
+ return m.Blob
+ }
+ return nil
+}
+
+func (m *BlobFromCommitResponse) GetSize() int32 {
+ if m != nil {
+ return m.Size
+ }
+ return 0
+}
+
+func (m *BlobFromCommitResponse) GetFound() bool {
+ if m != nil {
+ return m.Found
+ }
+ return false
+}
+
+func init() {
+ proto.RegisterType((*BlobFromCommitRequest)(nil), "gitaly.BlobFromCommitRequest")
+ proto.RegisterType((*BlobFromCommitResponse)(nil), "gitaly.BlobFromCommitResponse")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// Client API for Blob service
+
+type BlobClient interface {
+ BlobFromCommit(ctx context.Context, in *BlobFromCommitRequest, opts ...grpc.CallOption) (Blob_BlobFromCommitClient, error)
+}
+
+type blobClient struct {
+ cc *grpc.ClientConn
+}
+
+func NewBlobClient(cc *grpc.ClientConn) BlobClient {
+ return &blobClient{cc}
+}
+
+func (c *blobClient) BlobFromCommit(ctx context.Context, in *BlobFromCommitRequest, opts ...grpc.CallOption) (Blob_BlobFromCommitClient, error) {
+ stream, err := grpc.NewClientStream(ctx, &_Blob_serviceDesc.Streams[0], c.cc, "/gitaly.Blob/BlobFromCommit", opts...)
+ if err != nil {
+ return nil, err
+ }
+ x := &blobBlobFromCommitClient{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 Blob_BlobFromCommitClient interface {
+ Recv() (*BlobFromCommitResponse, error)
+ grpc.ClientStream
+}
+
+type blobBlobFromCommitClient struct {
+ grpc.ClientStream
+}
+
+func (x *blobBlobFromCommitClient) Recv() (*BlobFromCommitResponse, error) {
+ m := new(BlobFromCommitResponse)
+ if err := x.ClientStream.RecvMsg(m); err != nil {
+ return nil, err
+ }
+ return m, nil
+}
+
+// Server API for Blob service
+
+type BlobServer interface {
+ BlobFromCommit(*BlobFromCommitRequest, Blob_BlobFromCommitServer) error
+}
+
+func RegisterBlobServer(s *grpc.Server, srv BlobServer) {
+ s.RegisterService(&_Blob_serviceDesc, srv)
+}
+
+func _Blob_BlobFromCommit_Handler(srv interface{}, stream grpc.ServerStream) error {
+ m := new(BlobFromCommitRequest)
+ if err := stream.RecvMsg(m); err != nil {
+ return err
+ }
+ return srv.(BlobServer).BlobFromCommit(m, &blobBlobFromCommitServer{stream})
+}
+
+type Blob_BlobFromCommitServer interface {
+ Send(*BlobFromCommitResponse) error
+ grpc.ServerStream
+}
+
+type blobBlobFromCommitServer struct {
+ grpc.ServerStream
+}
+
+func (x *blobBlobFromCommitServer) Send(m *BlobFromCommitResponse) error {
+ return x.ServerStream.SendMsg(m)
+}
+
+var _Blob_serviceDesc = grpc.ServiceDesc{
+ ServiceName: "gitaly.Blob",
+ HandlerType: (*BlobServer)(nil),
+ Methods: []grpc.MethodDesc{},
+ Streams: []grpc.StreamDesc{
+ {
+ StreamName: "BlobFromCommit",
+ Handler: _Blob_BlobFromCommit_Handler,
+ ServerStreams: true,
+ },
+ },
+ Metadata: "blob.proto",
+}
+
+func init() { proto.RegisterFile("blob.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+ // 255 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0xc1, 0x4a, 0xf4, 0x40,
+ 0x10, 0x84, 0xff, 0xc9, 0x9f, 0x2c, 0x9b, 0x36, 0xec, 0xa1, 0x51, 0x09, 0x2b, 0x4a, 0xc8, 0x29,
+ 0xa7, 0x20, 0xf1, 0x0d, 0x14, 0x04, 0xaf, 0xed, 0xd1, 0x83, 0x24, 0x66, 0xd6, 0x1d, 0x48, 0xb6,
+ 0xe3, 0xcc, 0xec, 0x61, 0x7d, 0x0c, 0x9f, 0x58, 0xd2, 0x83, 0xa2, 0xa2, 0xb7, 0x9a, 0xea, 0xa1,
+ 0xbe, 0xea, 0x06, 0xe8, 0x06, 0xee, 0xea, 0xc9, 0xb2, 0x67, 0x5c, 0x3c, 0x1b, 0xdf, 0x0e, 0x87,
+ 0x75, 0xe6, 0xb6, 0xad, 0xd5, 0x7d, 0x70, 0xcb, 0x37, 0x05, 0x27, 0xd7, 0x03, 0x77, 0xb7, 0x96,
+ 0xc7, 0x1b, 0x1e, 0x47, 0xe3, 0x49, 0xbf, 0xec, 0xb5, 0xf3, 0xd8, 0x00, 0x58, 0x3d, 0xb1, 0x33,
+ 0x9e, 0xed, 0x21, 0x57, 0x85, 0xaa, 0x8e, 0x1a, 0xac, 0x43, 0x48, 0x4d, 0x9f, 0x13, 0xfa, 0xf2,
+ 0x0b, 0xcf, 0x20, 0x7d, 0x92, 0x90, 0x47, 0xd3, 0xe7, 0x51, 0xa1, 0xaa, 0x94, 0x96, 0xc1, 0xb8,
+ 0xeb, 0x11, 0x21, 0x9e, 0x5a, 0xbf, 0xcd, 0xff, 0x17, 0xaa, 0xca, 0x48, 0x34, 0x1e, 0x43, 0x32,
+ 0x98, 0xd1, 0xf8, 0x3c, 0x2e, 0x54, 0x95, 0x50, 0x78, 0x94, 0x1b, 0x38, 0xfd, 0xd9, 0xc9, 0x4d,
+ 0xbc, 0x73, 0x1a, 0x57, 0x10, 0x99, 0x5e, 0xca, 0xa4, 0x14, 0x19, 0xc9, 0x9c, 0x57, 0x14, 0x56,
+ 0x46, 0xa2, 0x67, 0xcf, 0x99, 0x57, 0x2d, 0x9c, 0x84, 0x44, 0xcf, 0x9c, 0x0d, 0xef, 0x77, 0xbd,
+ 0x70, 0x96, 0x14, 0x1e, 0xcd, 0x03, 0xc4, 0x33, 0x07, 0xef, 0x61, 0xf5, 0x9d, 0x87, 0xe7, 0x1f,
+ 0x8b, 0xfe, 0x7a, 0x9b, 0xf5, 0xc5, 0x5f, 0xe3, 0x50, 0xb3, 0xfc, 0x77, 0xa9, 0xba, 0x85, 0x1c,
+ 0xf8, 0xea, 0x3d, 0x00, 0x00, 0xff, 0xff, 0x2e, 0x0b, 0x70, 0x98, 0x84, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
index 902aaa902..e8f1c19fd 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
@@ -1,53 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: commit.proto
-/*
-Package gitaly is a generated protocol buffer package.
-
-It is generated from these files:
- commit.proto
- diff.proto
- notifications.proto
- ref.proto
- shared.proto
- smarthttp.proto
- ssh.proto
-
-It has these top-level messages:
- CommitIsAncestorRequest
- CommitIsAncestorResponse
- CommitDiffRequest
- CommitDiffResponse
- CommitDeltaRequest
- CommitDelta
- CommitDeltaResponse
- PostReceiveRequest
- PostReceiveResponse
- FindDefaultBranchNameRequest
- FindDefaultBranchNameResponse
- FindAllBranchNamesRequest
- FindAllBranchNamesResponse
- FindAllTagNamesRequest
- FindAllTagNamesResponse
- FindRefNameRequest
- FindRefNameResponse
- FindLocalBranchesRequest
- FindLocalBranchesResponse
- FindLocalBranchResponse
- FindLocalBranchCommitAuthor
- Repository
- ExitStatus
- InfoRefsRequest
- InfoRefsResponse
- PostUploadPackRequest
- PostUploadPackResponse
- PostReceivePackRequest
- PostReceivePackResponse
- SSHUploadPackRequest
- SSHUploadPackResponse
- SSHReceivePackRequest
- SSHReceivePackResponse
-*/
package gitaly
import proto "github.com/golang/protobuf/proto"
@@ -64,12 +17,6 @@ var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
type CommitIsAncestorRequest struct {
Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
AncestorId string `protobuf:"bytes,2,opt,name=ancestor_id,json=ancestorId" json:"ancestor_id,omitempty"`
@@ -79,7 +26,7 @@ type CommitIsAncestorRequest struct {
func (m *CommitIsAncestorRequest) Reset() { *m = CommitIsAncestorRequest{} }
func (m *CommitIsAncestorRequest) String() string { return proto.CompactTextString(m) }
func (*CommitIsAncestorRequest) ProtoMessage() {}
-func (*CommitIsAncestorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (*CommitIsAncestorRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
func (m *CommitIsAncestorRequest) GetRepository() *Repository {
if m != nil {
@@ -109,7 +56,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 fileDescriptor0, []int{1} }
+func (*CommitIsAncestorResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
func (m *CommitIsAncestorResponse) GetValue() bool {
if m != nil {
@@ -195,9 +142,9 @@ var _Commit_serviceDesc = grpc.ServiceDesc{
Metadata: "commit.proto",
}
-func init() { proto.RegisterFile("commit.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("commit.proto", fileDescriptor1) }
-var fileDescriptor0 = []byte{
+var fileDescriptor1 = []byte{
// 213 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x50, 0xbf, 0x4e, 0x84, 0x30,
0x18, 0xb7, 0x1a, 0x11, 0x3f, 0x18, 0xcc, 0x17, 0x13, 0x91, 0x05, 0xc2, 0xc4, 0x44, 0x0c, 0x3e,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go
index 737e54216..6acc09ecb 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go
@@ -28,7 +28,7 @@ type CommitDiffRequest struct {
func (m *CommitDiffRequest) Reset() { *m = CommitDiffRequest{} }
func (m *CommitDiffRequest) String() string { return proto.CompactTextString(m) }
func (*CommitDiffRequest) ProtoMessage() {}
-func (*CommitDiffRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (*CommitDiffRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
func (m *CommitDiffRequest) GetRepository() *Repository {
if m != nil {
@@ -82,7 +82,7 @@ type CommitDiffResponse struct {
func (m *CommitDiffResponse) Reset() { *m = CommitDiffResponse{} }
func (m *CommitDiffResponse) String() string { return proto.CompactTextString(m) }
func (*CommitDiffResponse) ProtoMessage() {}
-func (*CommitDiffResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (*CommitDiffResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
func (m *CommitDiffResponse) GetFromPath() []byte {
if m != nil {
@@ -157,7 +157,7 @@ type CommitDeltaRequest struct {
func (m *CommitDeltaRequest) Reset() { *m = CommitDeltaRequest{} }
func (m *CommitDeltaRequest) String() string { return proto.CompactTextString(m) }
func (*CommitDeltaRequest) ProtoMessage() {}
-func (*CommitDeltaRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (*CommitDeltaRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
func (m *CommitDeltaRequest) GetRepository() *Repository {
if m != nil {
@@ -200,7 +200,7 @@ type CommitDelta struct {
func (m *CommitDelta) Reset() { *m = CommitDelta{} }
func (m *CommitDelta) String() string { return proto.CompactTextString(m) }
func (*CommitDelta) ProtoMessage() {}
-func (*CommitDelta) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (*CommitDelta) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
func (m *CommitDelta) GetFromPath() []byte {
if m != nil {
@@ -251,7 +251,7 @@ type CommitDeltaResponse struct {
func (m *CommitDeltaResponse) Reset() { *m = CommitDeltaResponse{} }
func (m *CommitDeltaResponse) String() string { return proto.CompactTextString(m) }
func (*CommitDeltaResponse) ProtoMessage() {}
-func (*CommitDeltaResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+func (*CommitDeltaResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
func (m *CommitDeltaResponse) GetDeltas() []*CommitDelta {
if m != nil {
@@ -431,9 +431,9 @@ var _Diff_serviceDesc = grpc.ServiceDesc{
Metadata: "diff.proto",
}
-func init() { proto.RegisterFile("diff.proto", fileDescriptor1) }
+func init() { proto.RegisterFile("diff.proto", fileDescriptor2) }
-var fileDescriptor1 = []byte{
+var fileDescriptor2 = []byte{
// 473 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x4d, 0x8a, 0xdb, 0x30,
0x14, 0xc7, 0xab, 0xc4, 0x76, 0x9c, 0x17, 0xf7, 0x4b, 0x29, 0x53, 0x4d, 0x66, 0x63, 0x4c, 0x29,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/notifications.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/notifications.pb.go
index 49891c3a0..03dce9418 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/notifications.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/notifications.pb.go
@@ -24,7 +24,7 @@ type PostReceiveRequest struct {
func (m *PostReceiveRequest) Reset() { *m = PostReceiveRequest{} }
func (m *PostReceiveRequest) String() string { return proto.CompactTextString(m) }
func (*PostReceiveRequest) ProtoMessage() {}
-func (*PostReceiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+func (*PostReceiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
func (m *PostReceiveRequest) GetRepository() *Repository {
if m != nil {
@@ -39,7 +39,7 @@ type PostReceiveResponse struct {
func (m *PostReceiveResponse) Reset() { *m = PostReceiveResponse{} }
func (m *PostReceiveResponse) String() string { return proto.CompactTextString(m) }
func (*PostReceiveResponse) ProtoMessage() {}
-func (*PostReceiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+func (*PostReceiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
func init() {
proto.RegisterType((*PostReceiveRequest)(nil), "gitaly.PostReceiveRequest")
@@ -118,9 +118,9 @@ var _Notifications_serviceDesc = grpc.ServiceDesc{
Metadata: "notifications.proto",
}
-func init() { proto.RegisterFile("notifications.proto", fileDescriptor2) }
+func init() { proto.RegisterFile("notifications.proto", fileDescriptor3) }
-var fileDescriptor2 = []byte{
+var fileDescriptor3 = []byte{
// 163 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xce, 0xcb, 0x2f, 0xc9,
0x4c, 0xcb, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go
index fe3178e9f..542365a71 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go
@@ -41,7 +41,7 @@ func (x FindLocalBranchesRequest_SortBy) String() string {
return proto.EnumName(FindLocalBranchesRequest_SortBy_name, int32(x))
}
func (FindLocalBranchesRequest_SortBy) EnumDescriptor() ([]byte, []int) {
- return fileDescriptor3, []int{8, 0}
+ return fileDescriptor4, []int{8, 0}
}
type FindDefaultBranchNameRequest struct {
@@ -51,7 +51,7 @@ type FindDefaultBranchNameRequest struct {
func (m *FindDefaultBranchNameRequest) Reset() { *m = FindDefaultBranchNameRequest{} }
func (m *FindDefaultBranchNameRequest) String() string { return proto.CompactTextString(m) }
func (*FindDefaultBranchNameRequest) ProtoMessage() {}
-func (*FindDefaultBranchNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+func (*FindDefaultBranchNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
func (m *FindDefaultBranchNameRequest) GetRepository() *Repository {
if m != nil {
@@ -67,7 +67,7 @@ type FindDefaultBranchNameResponse struct {
func (m *FindDefaultBranchNameResponse) Reset() { *m = FindDefaultBranchNameResponse{} }
func (m *FindDefaultBranchNameResponse) String() string { return proto.CompactTextString(m) }
func (*FindDefaultBranchNameResponse) ProtoMessage() {}
-func (*FindDefaultBranchNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+func (*FindDefaultBranchNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
func (m *FindDefaultBranchNameResponse) GetName() []byte {
if m != nil {
@@ -83,7 +83,7 @@ type FindAllBranchNamesRequest struct {
func (m *FindAllBranchNamesRequest) Reset() { *m = FindAllBranchNamesRequest{} }
func (m *FindAllBranchNamesRequest) String() string { return proto.CompactTextString(m) }
func (*FindAllBranchNamesRequest) ProtoMessage() {}
-func (*FindAllBranchNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} }
+func (*FindAllBranchNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} }
func (m *FindAllBranchNamesRequest) GetRepository() *Repository {
if m != nil {
@@ -99,7 +99,7 @@ type FindAllBranchNamesResponse struct {
func (m *FindAllBranchNamesResponse) Reset() { *m = FindAllBranchNamesResponse{} }
func (m *FindAllBranchNamesResponse) String() string { return proto.CompactTextString(m) }
func (*FindAllBranchNamesResponse) ProtoMessage() {}
-func (*FindAllBranchNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{3} }
+func (*FindAllBranchNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
func (m *FindAllBranchNamesResponse) GetNames() [][]byte {
if m != nil {
@@ -115,7 +115,7 @@ type FindAllTagNamesRequest struct {
func (m *FindAllTagNamesRequest) Reset() { *m = FindAllTagNamesRequest{} }
func (m *FindAllTagNamesRequest) String() string { return proto.CompactTextString(m) }
func (*FindAllTagNamesRequest) ProtoMessage() {}
-func (*FindAllTagNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{4} }
+func (*FindAllTagNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{4} }
func (m *FindAllTagNamesRequest) GetRepository() *Repository {
if m != nil {
@@ -131,7 +131,7 @@ type FindAllTagNamesResponse struct {
func (m *FindAllTagNamesResponse) Reset() { *m = FindAllTagNamesResponse{} }
func (m *FindAllTagNamesResponse) String() string { return proto.CompactTextString(m) }
func (*FindAllTagNamesResponse) ProtoMessage() {}
-func (*FindAllTagNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{5} }
+func (*FindAllTagNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{5} }
func (m *FindAllTagNamesResponse) GetNames() [][]byte {
if m != nil {
@@ -151,7 +151,7 @@ type FindRefNameRequest struct {
func (m *FindRefNameRequest) Reset() { *m = FindRefNameRequest{} }
func (m *FindRefNameRequest) String() string { return proto.CompactTextString(m) }
func (*FindRefNameRequest) ProtoMessage() {}
-func (*FindRefNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{6} }
+func (*FindRefNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{6} }
func (m *FindRefNameRequest) GetRepository() *Repository {
if m != nil {
@@ -182,7 +182,7 @@ type FindRefNameResponse struct {
func (m *FindRefNameResponse) Reset() { *m = FindRefNameResponse{} }
func (m *FindRefNameResponse) String() string { return proto.CompactTextString(m) }
func (*FindRefNameResponse) ProtoMessage() {}
-func (*FindRefNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{7} }
+func (*FindRefNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{7} }
func (m *FindRefNameResponse) GetName() []byte {
if m != nil {
@@ -199,7 +199,7 @@ type FindLocalBranchesRequest struct {
func (m *FindLocalBranchesRequest) Reset() { *m = FindLocalBranchesRequest{} }
func (m *FindLocalBranchesRequest) String() string { return proto.CompactTextString(m) }
func (*FindLocalBranchesRequest) ProtoMessage() {}
-func (*FindLocalBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{8} }
+func (*FindLocalBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{8} }
func (m *FindLocalBranchesRequest) GetRepository() *Repository {
if m != nil {
@@ -222,7 +222,7 @@ type FindLocalBranchesResponse struct {
func (m *FindLocalBranchesResponse) Reset() { *m = FindLocalBranchesResponse{} }
func (m *FindLocalBranchesResponse) String() string { return proto.CompactTextString(m) }
func (*FindLocalBranchesResponse) ProtoMessage() {}
-func (*FindLocalBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{9} }
+func (*FindLocalBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{9} }
func (m *FindLocalBranchesResponse) GetBranches() []*FindLocalBranchResponse {
if m != nil {
@@ -242,7 +242,7 @@ type FindLocalBranchResponse struct {
func (m *FindLocalBranchResponse) Reset() { *m = FindLocalBranchResponse{} }
func (m *FindLocalBranchResponse) String() string { return proto.CompactTextString(m) }
func (*FindLocalBranchResponse) ProtoMessage() {}
-func (*FindLocalBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{10} }
+func (*FindLocalBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{10} }
func (m *FindLocalBranchResponse) GetName() []byte {
if m != nil {
@@ -288,7 +288,7 @@ type FindLocalBranchCommitAuthor struct {
func (m *FindLocalBranchCommitAuthor) Reset() { *m = FindLocalBranchCommitAuthor{} }
func (m *FindLocalBranchCommitAuthor) String() string { return proto.CompactTextString(m) }
func (*FindLocalBranchCommitAuthor) ProtoMessage() {}
-func (*FindLocalBranchCommitAuthor) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{11} }
+func (*FindLocalBranchCommitAuthor) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{11} }
func (m *FindLocalBranchCommitAuthor) GetName() []byte {
if m != nil {
@@ -617,9 +617,9 @@ var _Ref_serviceDesc = grpc.ServiceDesc{
Metadata: "ref.proto",
}
-func init() { proto.RegisterFile("ref.proto", fileDescriptor3) }
+func init() { proto.RegisterFile("ref.proto", fileDescriptor4) }
-var fileDescriptor3 = []byte{
+var fileDescriptor4 = []byte{
// 615 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x51, 0x73, 0xd2, 0x4c,
0x14, 0x6d, 0x0a, 0xe5, 0x6b, 0x2f, 0xf9, 0x5a, 0x5c, 0x6b, 0x8d, 0x41, 0x85, 0x46, 0x3b, 0xe2,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go
index fea7b4302..16a89d38b 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go
@@ -21,7 +21,7 @@ type Repository struct {
func (m *Repository) Reset() { *m = Repository{} }
func (m *Repository) String() string { return proto.CompactTextString(m) }
func (*Repository) ProtoMessage() {}
-func (*Repository) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+func (*Repository) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
func (m *Repository) GetPath() string {
if m != nil {
@@ -51,7 +51,7 @@ type ExitStatus struct {
func (m *ExitStatus) Reset() { *m = ExitStatus{} }
func (m *ExitStatus) String() string { return proto.CompactTextString(m) }
func (*ExitStatus) ProtoMessage() {}
-func (*ExitStatus) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
+func (*ExitStatus) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{1} }
func (m *ExitStatus) GetValue() int32 {
if m != nil {
@@ -65,9 +65,9 @@ func init() {
proto.RegisterType((*ExitStatus)(nil), "gitaly.ExitStatus")
}
-func init() { proto.RegisterFile("shared.proto", fileDescriptor4) }
+func init() { proto.RegisterFile("shared.proto", fileDescriptor5) }
-var fileDescriptor4 = []byte{
+var fileDescriptor5 = []byte{
// 161 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x34, 0x8e, 0xb1, 0xca, 0xc2, 0x40,
0x10, 0x84, 0xc9, 0xff, 0x9b, 0x80, 0x6b, 0x6c, 0x16, 0x8b, 0x94, 0x1a, 0x1b, 0x2b, 0x1b, 0x9f,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go
index 3024bf626..c6017fc28 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go
@@ -24,7 +24,7 @@ type InfoRefsRequest struct {
func (m *InfoRefsRequest) Reset() { *m = InfoRefsRequest{} }
func (m *InfoRefsRequest) String() string { return proto.CompactTextString(m) }
func (*InfoRefsRequest) ProtoMessage() {}
-func (*InfoRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
+func (*InfoRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
func (m *InfoRefsRequest) GetRepository() *Repository {
if m != nil {
@@ -40,7 +40,7 @@ type InfoRefsResponse struct {
func (m *InfoRefsResponse) Reset() { *m = InfoRefsResponse{} }
func (m *InfoRefsResponse) String() string { return proto.CompactTextString(m) }
func (*InfoRefsResponse) ProtoMessage() {}
-func (*InfoRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{1} }
+func (*InfoRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1} }
func (m *InfoRefsResponse) GetData() []byte {
if m != nil {
@@ -59,7 +59,7 @@ type PostUploadPackRequest struct {
func (m *PostUploadPackRequest) Reset() { *m = PostUploadPackRequest{} }
func (m *PostUploadPackRequest) String() string { return proto.CompactTextString(m) }
func (*PostUploadPackRequest) ProtoMessage() {}
-func (*PostUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{2} }
+func (*PostUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{2} }
func (m *PostUploadPackRequest) GetRepository() *Repository {
if m != nil {
@@ -83,7 +83,7 @@ type PostUploadPackResponse struct {
func (m *PostUploadPackResponse) Reset() { *m = PostUploadPackResponse{} }
func (m *PostUploadPackResponse) String() string { return proto.CompactTextString(m) }
func (*PostUploadPackResponse) ProtoMessage() {}
-func (*PostUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{3} }
+func (*PostUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{3} }
func (m *PostUploadPackResponse) GetData() []byte {
if m != nil {
@@ -106,7 +106,7 @@ type PostReceivePackRequest struct {
func (m *PostReceivePackRequest) Reset() { *m = PostReceivePackRequest{} }
func (m *PostReceivePackRequest) String() string { return proto.CompactTextString(m) }
func (*PostReceivePackRequest) ProtoMessage() {}
-func (*PostReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{4} }
+func (*PostReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{4} }
func (m *PostReceivePackRequest) GetRepository() *Repository {
if m != nil {
@@ -144,7 +144,7 @@ type PostReceivePackResponse struct {
func (m *PostReceivePackResponse) Reset() { *m = PostReceivePackResponse{} }
func (m *PostReceivePackResponse) String() string { return proto.CompactTextString(m) }
func (*PostReceivePackResponse) ProtoMessage() {}
-func (*PostReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{5} }
+func (*PostReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{5} }
func (m *PostReceivePackResponse) GetData() []byte {
if m != nil {
@@ -459,9 +459,9 @@ var _SmartHTTP_serviceDesc = grpc.ServiceDesc{
Metadata: "smarthttp.proto",
}
-func init() { proto.RegisterFile("smarthttp.proto", fileDescriptor5) }
+func init() { proto.RegisterFile("smarthttp.proto", fileDescriptor6) }
-var fileDescriptor5 = []byte{
+var fileDescriptor6 = []byte{
// 321 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x4d, 0x4b, 0xc3, 0x40,
0x10, 0x75, 0x6b, 0x2d, 0x74, 0xac, 0x56, 0xa6, 0x68, 0x4b, 0x40, 0x2d, 0x11, 0xa4, 0x07, 0x0d,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go
index 81693891a..ae6a9509a 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go
@@ -27,7 +27,7 @@ type SSHUploadPackRequest struct {
func (m *SSHUploadPackRequest) Reset() { *m = SSHUploadPackRequest{} }
func (m *SSHUploadPackRequest) String() string { return proto.CompactTextString(m) }
func (*SSHUploadPackRequest) ProtoMessage() {}
-func (*SSHUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
+func (*SSHUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{0} }
func (m *SSHUploadPackRequest) GetRepository() *Repository {
if m != nil {
@@ -56,7 +56,7 @@ type SSHUploadPackResponse struct {
func (m *SSHUploadPackResponse) Reset() { *m = SSHUploadPackResponse{} }
func (m *SSHUploadPackResponse) String() string { return proto.CompactTextString(m) }
func (*SSHUploadPackResponse) ProtoMessage() {}
-func (*SSHUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1} }
+func (*SSHUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{1} }
func (m *SSHUploadPackResponse) GetStdout() []byte {
if m != nil {
@@ -93,7 +93,7 @@ type SSHReceivePackRequest struct {
func (m *SSHReceivePackRequest) Reset() { *m = SSHReceivePackRequest{} }
func (m *SSHReceivePackRequest) String() string { return proto.CompactTextString(m) }
func (*SSHReceivePackRequest) ProtoMessage() {}
-func (*SSHReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{2} }
+func (*SSHReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{2} }
func (m *SSHReceivePackRequest) GetRepository() *Repository {
if m != nil {
@@ -136,7 +136,7 @@ type SSHReceivePackResponse struct {
func (m *SSHReceivePackResponse) Reset() { *m = SSHReceivePackResponse{} }
func (m *SSHReceivePackResponse) String() string { return proto.CompactTextString(m) }
func (*SSHReceivePackResponse) ProtoMessage() {}
-func (*SSHReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{3} }
+func (*SSHReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{3} }
func (m *SSHReceivePackResponse) GetStdout() []byte {
if m != nil {
@@ -339,9 +339,9 @@ var _SSH_serviceDesc = grpc.ServiceDesc{
Metadata: "ssh.proto",
}
-func init() { proto.RegisterFile("ssh.proto", fileDescriptor6) }
+func init() { proto.RegisterFile("ssh.proto", fileDescriptor7) }
-var fileDescriptor6 = []byte{
+var fileDescriptor7 = []byte{
// 304 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x52, 0xcd, 0x4e, 0xf3, 0x30,
0x10, 0xfc, 0xfc, 0xf5, 0x47, 0xea, 0x36, 0xe5, 0xb0, 0x94, 0xaa, 0x8a, 0x00, 0x55, 0xe1, 0x92,
diff --git a/vendor/vendor.json b/vendor/vendor.json
index fb74643c1..e2b3f5dcf 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -149,18 +149,18 @@
"revisionTime": "2017-01-30T11:31:45Z"
},
{
- "checksumSHA1": "1P6wuKa+3R47Rxv7G6aV6ZTk0AM=",
+ "checksumSHA1": "TnXUXXH0AfSieMvV6x2zXXDn4wk=",
"path": "gitlab.com/gitlab-org/gitaly-proto/go",
- "revision": "a3df13b83c05490abefdbd2827702ccaa41bff84",
- "revisionTime": "2017-05-31T15:17:17Z",
+ "revision": "4b0ae3b8250ae7ceeb2afdfc4a0725439b18838e",
+ "revisionTime": "2017-06-07T20:32:00Z",
"version": "v0.8.0",
"versionExact": "v0.8.0"
},
{
"checksumSHA1": "GkeSZfXVbtAkBZOrswot19GJZqQ=",
"path": "gitlab.com/gitlab-org/gitaly-proto/go/helper",
- "revision": "a3df13b83c05490abefdbd2827702ccaa41bff84",
- "revisionTime": "2017-05-31T15:17:17Z",
+ "revision": "4b0ae3b8250ae7ceeb2afdfc4a0725439b18838e",
+ "revisionTime": "2017-06-07T20:32:00Z",
"version": "v0.8.0",
"versionExact": "v0.8.0"
},