Implement Raw{Diff,Patch} RPCs

Closes #621
Closes #613

8 files changed, 564 insertions, 51 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 289e296dd..c580e7acb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ UNRELEASED
 
 - Fix incorrect parsing of diff chunks starting with ++ or --
   https://gitlab.com/gitlab-org/gitaly/merge_requests/385
+- Implement Raw{Diff,Patch} RPCs
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/381
 
 v0.43.0
 
diff --git a/internal/service/diff/raw.go b/internal/service/diff/raw.go
new file mode 100644
index 000000000..ce93cd931
--- /dev/null
+++ b/internal/service/diff/raw.go
@@ -0,0 +1,59 @@
+package diff
+
+import (
+	"io"
+
+	"gitlab.com/gitlab-org/gitaly/internal/git"
+	"gitlab.com/gitlab-org/gitaly/streamio"
+
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+func (s *server) RawDiff(in *pb.RawDiffRequest, stream pb.DiffService_RawDiffServer) error {
+	if err := validateRequest(in); err != nil {
+		return grpc.Errorf(codes.InvalidArgument, "RawDiff: %v", err)
+	}
+
+	cmdArgs := []string{"diff", "--full-index", in.LeftCommitId, in.RightCommitId}
+
+	sw := streamio.NewWriter(func(p []byte) error {
+		return stream.Send(&pb.RawDiffResponse{Data: p})
+	})
+
+	return sendRawOutput(stream.Context(), "RawDiff", in.Repository, sw, cmdArgs)
+}
+
+func (s *server) RawPatch(in *pb.RawPatchRequest, stream pb.DiffService_RawPatchServer) error {
+	if err := validateRequest(in); err != nil {
+		return grpc.Errorf(codes.InvalidArgument, "RawPatch: %v", err)
+	}
+
+	cmdArgs := []string{"format-patch", "--stdout", in.LeftCommitId + ".." + in.RightCommitId}
+
+	sw := streamio.NewWriter(func(p []byte) error {
+		return stream.Send(&pb.RawPatchResponse{Data: p})
+	})
+
+	return sendRawOutput(stream.Context(), "RawPatch", in.Repository, sw, cmdArgs)
+}
+
+func sendRawOutput(ctx context.Context, rpc string, repo *pb.Repository, sender io.Writer, cmdArgs []string) error {
+	cmd, err := git.Command(ctx, repo, cmdArgs...)
+	if err != nil {
+		if _, ok := status.FromError(err); ok {
+			return err
+		}
+		return grpc.Errorf(codes.Internal, "%s: cmd: %v", rpc, err)
+	}
+
+	if _, err := io.Copy(sender, cmd); err != nil {
+		return grpc.Errorf(codes.Unavailable, "%s: send: %v", rpc, err)
+	}
+
+	return cmd.Wait()
+}
diff --git a/internal/service/diff/raw_test.go b/internal/service/diff/raw_test.go
new file mode 100644
index 000000000..2b8efbfc0
--- /dev/null
+++ b/internal/service/diff/raw_test.go
@@ -0,0 +1,215 @@
+package diff
+
+import (
+	"fmt"
+	"os"
+	"path"
+	"testing"
+
+	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
+	"gitlab.com/gitlab-org/gitaly/streamio"
+
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc/codes"
+)
+
+func TestSuccessfulRawDiffRequest(t *testing.T) {
+	server := runDiffServer(t)
+	defer server.Stop()
+
+	client, conn := newDiffClient(t)
+	defer conn.Close()
+
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	rightCommit := "e395f646b1499e8e0279445fc99a0596a65fab7e"
+	leftCommit := "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab"
+	rpcRequest := &pb.RawDiffRequest{Repository: testRepo, RightCommitId: rightCommit, LeftCommitId: leftCommit}
+
+	c, err := client.RawDiff(ctx, rpcRequest)
+	require.NoError(t, err)
+
+	reader := streamio.NewReader(func() ([]byte, error) {
+		response, err := c.Recv()
+		return response.GetData(), err
+	})
+
+	committerName := "Scrooge McDuck"
+	committerEmail := "scrooge@mcduck.com"
+	storagePath := testhelper.GitlabTestStoragePath()
+	sandboxRepoPath := path.Join(storagePath, "raw-diff-sandbox")
+
+	testhelper.MustRunCommand(t, nil, "git", "clone", testRepoPath, sandboxRepoPath)
+	testhelper.MustRunCommand(t, nil, "git", "-C", sandboxRepoPath, "reset", "--hard", leftCommit)
+	defer os.RemoveAll(sandboxRepoPath)
+
+	testhelper.MustRunCommand(t, reader, "git", "-C", sandboxRepoPath, "apply")
+	testhelper.MustRunCommand(t, reader, "git", "-C", sandboxRepoPath, "add", ".")
+	testhelper.MustRunCommand(t, nil, "git", "-C", sandboxRepoPath,
+		"-c", fmt.Sprintf("user.name=%s", committerName),
+		"-c", fmt.Sprintf("user.email=%s", committerEmail),
+		"commit", "-m", "Applying received raw diff")
+
+	expectedTreeStructure := testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "ls-tree", "-r", rightCommit)
+	actualTreeStructure := testhelper.MustRunCommand(t, nil, "git", "-C", sandboxRepoPath, "ls-tree", "-r", "HEAD")
+	require.Equal(t, expectedTreeStructure, actualTreeStructure)
+}
+
+func TestFailedRawDiffRequestDueToValidations(t *testing.T) {
+	server := runDiffServer(t)
+	defer server.Stop()
+
+	client, conn := newDiffClient(t)
+	defer conn.Close()
+
+	testCases := []struct {
+		desc    string
+		request *pb.RawDiffRequest
+		code    codes.Code
+	}{
+		{
+			desc: "empty left commit",
+			request: &pb.RawDiffRequest{
+				Repository:    testRepo,
+				LeftCommitId:  "",
+				RightCommitId: "e395f646b1499e8e0279445fc99a0596a65fab7e",
+			},
+			code: codes.InvalidArgument,
+		},
+		{
+			desc: "empty right commit",
+			request: &pb.RawDiffRequest{
+				Repository:    testRepo,
+				RightCommitId: "",
+				LeftCommitId:  "e395f646b1499e8e0279445fc99a0596a65fab7e",
+			},
+			code: codes.InvalidArgument,
+		},
+		{
+			desc: "empty repo",
+			request: &pb.RawDiffRequest{
+				Repository:    nil,
+				RightCommitId: "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab",
+				LeftCommitId:  "e395f646b1499e8e0279445fc99a0596a65fab7e",
+			},
+			code: codes.InvalidArgument,
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.desc, func(t *testing.T) {
+			ctx, cancel := testhelper.Context()
+			defer cancel()
+
+			c, _ := client.RawDiff(ctx, testCase.request)
+			testhelper.AssertGrpcError(t, drainRawDiffResponse(c), testCase.code, "")
+		})
+	}
+}
+
+func TestSuccessfulRawPatchRequest(t *testing.T) {
+	server := runDiffServer(t)
+	defer server.Stop()
+
+	client, conn := newDiffClient(t)
+	defer conn.Close()
+
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	rightCommit := "e395f646b1499e8e0279445fc99a0596a65fab7e"
+	leftCommit := "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab"
+	rpcRequest := &pb.RawPatchRequest{Repository: testRepo, RightCommitId: rightCommit, LeftCommitId: leftCommit}
+
+	c, err := client.RawPatch(ctx, rpcRequest)
+	require.NoError(t, err)
+
+	reader := streamio.NewReader(func() ([]byte, error) {
+		response, err := c.Recv()
+		return response.GetData(), err
+	})
+
+	storagePath := testhelper.GitlabTestStoragePath()
+	sandboxRepoPath := path.Join(storagePath, "raw-patch-sandbox")
+
+	testhelper.MustRunCommand(t, nil, "git", "clone", testRepoPath, sandboxRepoPath)
+	testhelper.MustRunCommand(t, nil, "git", "-C", sandboxRepoPath, "reset", "--hard", leftCommit)
+	defer os.RemoveAll(sandboxRepoPath)
+
+	testhelper.MustRunCommand(t, reader, "git", "-C", sandboxRepoPath, "am")
+
+	expectedTreeStructure := testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "ls-tree", "-r", rightCommit)
+	actualTreeStructure := testhelper.MustRunCommand(t, nil, "git", "-C", sandboxRepoPath, "ls-tree", "-r", "HEAD")
+	require.Equal(t, expectedTreeStructure, actualTreeStructure)
+}
+
+func TestFailedRawPatchRequestDueToValidations(t *testing.T) {
+	server := runDiffServer(t)
+	defer server.Stop()
+
+	client, conn := newDiffClient(t)
+	defer conn.Close()
+
+	testCases := []struct {
+		desc    string
+		request *pb.RawPatchRequest
+		code    codes.Code
+	}{
+		{
+			desc: "empty left commit",
+			request: &pb.RawPatchRequest{
+				Repository:    testRepo,
+				LeftCommitId:  "",
+				RightCommitId: "e395f646b1499e8e0279445fc99a0596a65fab7e",
+			},
+			code: codes.InvalidArgument,
+		},
+		{
+			desc: "empty right commit",
+			request: &pb.RawPatchRequest{
+				Repository:    testRepo,
+				RightCommitId: "",
+				LeftCommitId:  "e395f646b1499e8e0279445fc99a0596a65fab7e",
+			},
+			code: codes.InvalidArgument,
+		},
+		{
+			desc: "empty repo",
+			request: &pb.RawPatchRequest{
+				Repository:    nil,
+				RightCommitId: "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab",
+				LeftCommitId:  "e395f646b1499e8e0279445fc99a0596a65fab7e",
+			},
+			code: codes.InvalidArgument,
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.desc, func(t *testing.T) {
+			ctx, cancel := testhelper.Context()
+			defer cancel()
+
+			c, _ := client.RawPatch(ctx, testCase.request)
+			testhelper.AssertGrpcError(t, drainRawPatchResponse(c), testCase.code, "")
+		})
+	}
+}
+
+func drainRawDiffResponse(c pb.DiffService_RawDiffClient) error {
+	var err error
+	for err == nil {
+		_, err = c.Recv()
+	}
+	return err
+}
+
+func drainRawPatchResponse(c pb.DiffService_RawPatchClient) error {
+	var err error
+	for err == nil {
+		_, err = c.Recv()
+	}
+	return err
+}
diff --git a/internal/service/diff/testhelper_test.go b/internal/service/diff/testhelper_test.go
index 85d20d962..884331e64 100644
--- a/internal/service/diff/testhelper_test.go
+++ b/internal/service/diff/testhelper_test.go
@@ -12,6 +12,8 @@ import (
 	"google.golang.org/grpc/reflection"
 
 	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+	"gitlab.com/gitlab-org/gitaly/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 )
@@ -19,6 +21,7 @@ import (
 var (
 	serverSocketPath = testhelper.GetTemporaryGitalySocketFileName()
 	testRepo         *pb.Repository
+	testRepoPath     string
 )
 
 func TestMain(m *testing.M) {
@@ -32,8 +35,13 @@ func testMain(m *testing.M) int {
 
 	testRepo = testhelper.TestRepository()
 
-	testhelper.ConfigureRuby()
 	var err error
+	testRepoPath, err = helper.GetRepoPath(testRepo)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	testhelper.ConfigureRuby()
 	rubyServer, err = rubyserver.Start()
 	if err != nil {
 		log.Fatal(err)
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
index ca75280b0..4ef2eb086 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.38.0
+0.39.0
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
index 09401a53c..755eab258 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go
@@ -57,6 +57,10 @@ It has these top-level messages:
 	CommitDeltaResponse
 	CommitPatchRequest
 	CommitPatchResponse
+	RawDiffRequest
+	RawDiffResponse
+	RawPatchRequest
+	RawPatchResponse
 	AddNamespaceRequest
 	RemoveNamespaceRequest
 	RenameNamespaceRequest
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 53c2abd60..74c223ffa 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
@@ -382,6 +382,102 @@ func (m *CommitPatchResponse) GetData() []byte {
 	return nil
 }
 
+type RawDiffRequest 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"`
+	RightCommitId string      `protobuf:"bytes,3,opt,name=right_commit_id,json=rightCommitId" json:"right_commit_id,omitempty"`
+}
+
+func (m *RawDiffRequest) Reset()                    { *m = RawDiffRequest{} }
+func (m *RawDiffRequest) String() string            { return proto.CompactTextString(m) }
+func (*RawDiffRequest) ProtoMessage()               {}
+func (*RawDiffRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{7} }
+
+func (m *RawDiffRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *RawDiffRequest) GetLeftCommitId() string {
+	if m != nil {
+		return m.LeftCommitId
+	}
+	return ""
+}
+
+func (m *RawDiffRequest) GetRightCommitId() string {
+	if m != nil {
+		return m.RightCommitId
+	}
+	return ""
+}
+
+type RawDiffResponse struct {
+	Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+}
+
+func (m *RawDiffResponse) Reset()                    { *m = RawDiffResponse{} }
+func (m *RawDiffResponse) String() string            { return proto.CompactTextString(m) }
+func (*RawDiffResponse) ProtoMessage()               {}
+func (*RawDiffResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{8} }
+
+func (m *RawDiffResponse) GetData() []byte {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+type RawPatchRequest 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"`
+	RightCommitId string      `protobuf:"bytes,3,opt,name=right_commit_id,json=rightCommitId" json:"right_commit_id,omitempty"`
+}
+
+func (m *RawPatchRequest) Reset()                    { *m = RawPatchRequest{} }
+func (m *RawPatchRequest) String() string            { return proto.CompactTextString(m) }
+func (*RawPatchRequest) ProtoMessage()               {}
+func (*RawPatchRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{9} }
+
+func (m *RawPatchRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *RawPatchRequest) GetLeftCommitId() string {
+	if m != nil {
+		return m.LeftCommitId
+	}
+	return ""
+}
+
+func (m *RawPatchRequest) GetRightCommitId() string {
+	if m != nil {
+		return m.RightCommitId
+	}
+	return ""
+}
+
+type RawPatchResponse struct {
+	Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+}
+
+func (m *RawPatchResponse) Reset()                    { *m = RawPatchResponse{} }
+func (m *RawPatchResponse) String() string            { return proto.CompactTextString(m) }
+func (*RawPatchResponse) ProtoMessage()               {}
+func (*RawPatchResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{10} }
+
+func (m *RawPatchResponse) GetData() []byte {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*CommitDiffRequest)(nil), "gitaly.CommitDiffRequest")
 	proto.RegisterType((*CommitDiffResponse)(nil), "gitaly.CommitDiffResponse")
@@ -390,6 +486,10 @@ func init() {
 	proto.RegisterType((*CommitDeltaResponse)(nil), "gitaly.CommitDeltaResponse")
 	proto.RegisterType((*CommitPatchRequest)(nil), "gitaly.CommitPatchRequest")
 	proto.RegisterType((*CommitPatchResponse)(nil), "gitaly.CommitPatchResponse")
+	proto.RegisterType((*RawDiffRequest)(nil), "gitaly.RawDiffRequest")
+	proto.RegisterType((*RawDiffResponse)(nil), "gitaly.RawDiffResponse")
+	proto.RegisterType((*RawPatchRequest)(nil), "gitaly.RawPatchRequest")
+	proto.RegisterType((*RawPatchResponse)(nil), "gitaly.RawPatchResponse")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -408,6 +508,8 @@ type DiffServiceClient interface {
 	// Return a stream so we can divide the response in chunks of deltas
 	CommitDelta(ctx context.Context, in *CommitDeltaRequest, opts ...grpc.CallOption) (DiffService_CommitDeltaClient, error)
 	CommitPatch(ctx context.Context, in *CommitPatchRequest, opts ...grpc.CallOption) (DiffService_CommitPatchClient, error)
+	RawDiff(ctx context.Context, in *RawDiffRequest, opts ...grpc.CallOption) (DiffService_RawDiffClient, error)
+	RawPatch(ctx context.Context, in *RawPatchRequest, opts ...grpc.CallOption) (DiffService_RawPatchClient, error)
 }
 
 type diffServiceClient struct {
@@ -514,6 +616,70 @@ func (x *diffServiceCommitPatchClient) Recv() (*CommitPatchResponse, error) {
 	return m, nil
 }
 
+func (c *diffServiceClient) RawDiff(ctx context.Context, in *RawDiffRequest, opts ...grpc.CallOption) (DiffService_RawDiffClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_DiffService_serviceDesc.Streams[3], c.cc, "/gitaly.DiffService/RawDiff", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &diffServiceRawDiffClient{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 DiffService_RawDiffClient interface {
+	Recv() (*RawDiffResponse, error)
+	grpc.ClientStream
+}
+
+type diffServiceRawDiffClient struct {
+	grpc.ClientStream
+}
+
+func (x *diffServiceRawDiffClient) Recv() (*RawDiffResponse, error) {
+	m := new(RawDiffResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (c *diffServiceClient) RawPatch(ctx context.Context, in *RawPatchRequest, opts ...grpc.CallOption) (DiffService_RawPatchClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_DiffService_serviceDesc.Streams[4], c.cc, "/gitaly.DiffService/RawPatch", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &diffServiceRawPatchClient{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 DiffService_RawPatchClient interface {
+	Recv() (*RawPatchResponse, error)
+	grpc.ClientStream
+}
+
+type diffServiceRawPatchClient struct {
+	grpc.ClientStream
+}
+
+func (x *diffServiceRawPatchClient) Recv() (*RawPatchResponse, error) {
+	m := new(RawPatchResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // Server API for DiffService service
 
 type DiffServiceServer interface {
@@ -522,6 +688,8 @@ type DiffServiceServer interface {
 	// Return a stream so we can divide the response in chunks of deltas
 	CommitDelta(*CommitDeltaRequest, DiffService_CommitDeltaServer) error
 	CommitPatch(*CommitPatchRequest, DiffService_CommitPatchServer) error
+	RawDiff(*RawDiffRequest, DiffService_RawDiffServer) error
+	RawPatch(*RawPatchRequest, DiffService_RawPatchServer) error
 }
 
 func RegisterDiffServiceServer(s *grpc.Server, srv DiffServiceServer) {
@@ -591,6 +759,48 @@ func (x *diffServiceCommitPatchServer) Send(m *CommitPatchResponse) error {
 	return x.ServerStream.SendMsg(m)
 }
 
+func _DiffService_RawDiff_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(RawDiffRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(DiffServiceServer).RawDiff(m, &diffServiceRawDiffServer{stream})
+}
+
+type DiffService_RawDiffServer interface {
+	Send(*RawDiffResponse) error
+	grpc.ServerStream
+}
+
+type diffServiceRawDiffServer struct {
+	grpc.ServerStream
+}
+
+func (x *diffServiceRawDiffServer) Send(m *RawDiffResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func _DiffService_RawPatch_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(RawPatchRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(DiffServiceServer).RawPatch(m, &diffServiceRawPatchServer{stream})
+}
+
+type DiffService_RawPatchServer interface {
+	Send(*RawPatchResponse) error
+	grpc.ServerStream
+}
+
+type diffServiceRawPatchServer struct {
+	grpc.ServerStream
+}
+
+func (x *diffServiceRawPatchServer) Send(m *RawPatchResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
 var _DiffService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "gitaly.DiffService",
 	HandlerType: (*DiffServiceServer)(nil),
@@ -611,6 +821,16 @@ var _DiffService_serviceDesc = grpc.ServiceDesc{
 			Handler:       _DiffService_CommitPatch_Handler,
 			ServerStreams: true,
 		},
+		{
+			StreamName:    "RawDiff",
+			Handler:       _DiffService_RawDiff_Handler,
+			ServerStreams: true,
+		},
+		{
+			StreamName:    "RawPatch",
+			Handler:       _DiffService_RawPatch_Handler,
+			ServerStreams: true,
+		},
 	},
 	Metadata: "diff.proto",
 }
@@ -618,48 +838,53 @@ var _DiffService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("diff.proto", fileDescriptor3) }
 
 var fileDescriptor3 = []byte{
-	// 679 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xc1, 0x6e, 0xdb, 0x38,
-	0x10, 0x5d, 0xc5, 0xb6, 0x22, 0x8f, 0x95, 0x64, 0x97, 0x59, 0x64, 0x15, 0x67, 0x0f, 0x86, 0xb0,
-	0xdb, 0xba, 0x28, 0x10, 0x14, 0xee, 0xa5, 0xe7, 0x24, 0x68, 0x91, 0x20, 0x41, 0x03, 0xf5, 0xd0,
-	0xa3, 0xc0, 0x98, 0x23, 0x9b, 0xa8, 0x24, 0xba, 0x24, 0x1b, 0xc7, 0x5f, 0xd4, 0x4b, 0xff, 0xa8,
-	0xff, 0xd0, 0x2f, 0xe8, 0xa1, 0x20, 0x29, 0xc9, 0x72, 0xe0, 0x5b, 0x2f, 0xb9, 0x79, 0xde, 0x7b,
-	0x9e, 0x21, 0xdf, 0xe3, 0xd8, 0x00, 0x8c, 0x67, 0xd9, 0xe9, 0x42, 0x0a, 0x2d, 0x88, 0x3f, 0xe3,
-	0x9a, 0xe6, 0xab, 0x61, 0xa8, 0xe6, 0x54, 0x22, 0x73, 0x68, 0xfc, 0xb3, 0x03, 0x7f, 0x9d, 0x8b,
-	0xa2, 0xe0, 0xfa, 0x82, 0x67, 0x59, 0x82, 0x9f, 0xbf, 0xa0, 0xd2, 0x64, 0x02, 0x20, 0x71, 0x21,
-	0x14, 0xd7, 0x42, 0xae, 0x22, 0x6f, 0xe4, 0x8d, 0x07, 0x13, 0x72, 0xea, 0x1a, 0x9c, 0x26, 0x0d,
-	0x93, 0xb4, 0x54, 0xe4, 0x3f, 0xd8, 0xcf, 0x31, 0xd3, 0xe9, 0xd4, 0x76, 0x4b, 0x39, 0x8b, 0x76,
-	0x46, 0xde, 0xb8, 0x9f, 0x84, 0x06, 0x75, 0x23, 0x2e, 0x19, 0x79, 0x06, 0x07, 0x92, 0xcf, 0xe6,
-	0x6d, 0x59, 0xc7, 0xca, 0xf6, 0x2c, 0xdc, 0xe8, 0xde, 0x40, 0xc4, 0x67, 0xa5, 0x90, 0x98, 0x2e,
-	0xe7, 0x5c, 0xa3, 0x5a, 0xd0, 0x29, 0xa6, 0xd3, 0x39, 0x2d, 0x67, 0x18, 0x75, 0x47, 0xde, 0x38,
-	0x48, 0x8e, 0x1c, 0xff, 0xb1, 0xa1, 0xcf, 0x2d, 0x4b, 0xfe, 0x86, 0xde, 0x82, 0xea, 0xb9, 0x8a,
-	0x7a, 0xa3, 0xce, 0x38, 0x4c, 0x5c, 0x41, 0xfe, 0x87, 0xfd, 0xa9, 0xc8, 0x73, 0xba, 0x50, 0x98,
-	0x1a, 0x53, 0x54, 0xe4, 0xdb, 0x2e, 0x7b, 0x35, 0x6a, 0xae, 0x6f, 0x65, 0x58, 0x66, 0x42, 0x4e,
-	0x31, 0xcd, 0x79, 0xc1, 0xb5, 0x8a, 0x76, 0x9d, 0xac, 0x42, 0xaf, 0x2d, 0x48, 0x4e, 0xa0, 0x5f,
-	0xd0, 0x87, 0x34, 0xe3, 0x39, 0xaa, 0x28, 0x18, 0x79, 0xe3, 0x5e, 0x12, 0x14, 0xf4, 0xe1, 0xad,
-	0xa9, 0x6b, 0x32, 0xe7, 0x25, 0xaa, 0xa8, 0xdf, 0x90, 0xd7, 0xa6, 0xae, 0xc9, 0xbb, 0x95, 0x46,
-	0x15, 0x41, 0x43, 0x9e, 0x99, 0xda, 0x58, 0xa8, 0x68, 0x86, 0xe9, 0xba, 0xf7, 0xc0, 0x2a, 0x42,
-	0x83, 0xde, 0xd4, 0xfd, 0xdb, 0x2a, 0x37, 0x24, 0xdc, 0x50, 0xb9, 0x41, 0x6d, 0x95, 0x9b, 0xb6,
-	0xb7, 0xa1, 0xb2, 0x13, 0xe3, 0xef, 0x3b, 0x40, 0xda, 0xf1, 0xab, 0x85, 0x28, 0x15, 0x9a, 0x53,
-	0x66, 0x52, 0x14, 0xa9, 0xf1, 0xce, 0xc6, 0x1f, 0x26, 0x81, 0x01, 0x6e, 0xa9, 0x9e, 0x93, 0x7f,
-	0x60, 0x57, 0x0b, 0x47, 0xed, 0x58, 0xca, 0xd7, 0xa2, 0x26, 0xec, 0xb7, 0x9a, 0x4c, 0x7d, 0x53,
-	0x5e, 0x32, 0x72, 0x08, 0x3d, 0x2d, 0x0c, 0xdc, 0xb5, 0x70, 0x57, 0x8b, 0x4b, 0x46, 0x8e, 0x21,
-	0x10, 0x39, 0x4b, 0x0b, 0xc1, 0x30, 0xea, 0xd9, 0xa3, 0xed, 0x8a, 0x9c, 0xdd, 0x08, 0x86, 0x86,
-	0x2a, 0x71, 0xe9, 0x28, 0xdf, 0x51, 0x25, 0x2e, 0x2d, 0x75, 0x04, 0xfe, 0x1d, 0x2f, 0xa9, 0x5c,
-	0x55, 0xc1, 0x54, 0x95, 0xb9, 0xae, 0xa4, 0x4b, 0x73, 0xaa, 0xe9, 0x3c, 0x65, 0x54, 0x53, 0xeb,
-	0x7c, 0x98, 0x84, 0x92, 0x2e, 0x6f, 0x0d, 0x78, 0x41, 0x35, 0x25, 0x23, 0x08, 0xb1, 0x64, 0xa9,
-	0xc8, 0x9c, 0xd0, 0x06, 0x10, 0x24, 0x80, 0x25, 0x7b, 0x9f, 0x59, 0x15, 0x79, 0x0e, 0x07, 0xe2,
-	0x1e, 0x65, 0x96, 0x8b, 0x65, 0x5a, 0x50, 0xf9, 0x09, 0xa5, 0xcd, 0x20, 0x48, 0xf6, 0x6b, 0xf8,
-	0xc6, 0xa2, 0xe4, 0x5f, 0xe8, 0xd7, 0x4f, 0x87, 0xd9, 0x00, 0x82, 0x64, 0x0d, 0x5c, 0x75, 0x83,
-	0xe0, 0xcf, 0x7e, 0xfc, 0xcd, 0x6b, 0xdc, 0xc5, 0x5c, 0xd3, 0xa7, 0xb3, 0x5d, 0xcd, 0x8e, 0x74,
-	0x5b, 0x3b, 0x12, 0x7f, 0xf5, 0x60, 0xd0, 0x3a, 0xee, 0xd3, 0x7d, 0x05, 0xf1, 0x19, 0x1c, 0x6e,
-	0xf8, 0x5a, 0x3d, 0xdb, 0x97, 0xe0, 0x33, 0x03, 0xa8, 0xc8, 0x1b, 0x75, 0xc6, 0x83, 0xc9, 0x61,
-	0x6d, 0x6a, 0x5b, 0x5c, 0x49, 0x62, 0x56, 0x67, 0x63, 0x83, 0xff, 0x9d, 0x6c, 0x86, 0x10, 0x48,
-	0xbc, 0xe7, 0x8a, 0x8b, 0xb2, 0xf2, 0xa2, 0xa9, 0xe3, 0x17, 0xf5, 0x49, 0xab, 0x29, 0xd5, 0x49,
-	0x09, 0x74, 0xed, 0x23, 0x75, 0xae, 0xda, 0xcf, 0x93, 0x1f, 0x1e, 0x0c, 0xcc, 0x16, 0x7e, 0x40,
-	0x79, 0xcf, 0xa7, 0x48, 0xde, 0x01, 0xac, 0x57, 0x93, 0x1c, 0x3f, 0xba, 0xcb, 0xfa, 0xd7, 0x7a,
-	0x38, 0xdc, 0x46, 0xb9, 0x41, 0xf1, 0x1f, 0xaf, 0x3c, 0x72, 0xb5, 0x19, 0xeb, 0x70, 0x9b, 0x2b,
-	0x55, 0xab, 0x93, 0xad, 0xdc, 0xb6, 0x5e, 0x6e, 0x5d, 0x1e, 0xf5, 0x6a, 0x5b, 0xf9, 0xb8, 0xd7,
-	0x86, 0x01, 0xa6, 0xd7, 0x9d, 0x6f, 0xff, 0x82, 0x5e, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x15,
-	0xae, 0x47, 0xd4, 0xa6, 0x06, 0x00, 0x00,
+	// 753 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4d, 0x6f, 0xdb, 0x46,
+	0x10, 0x2d, 0xf5, 0x41, 0x51, 0x23, 0x5a, 0x76, 0xd7, 0x85, 0x4d, 0xcb, 0x3d, 0x08, 0x44, 0xed,
+	0xaa, 0x28, 0x60, 0x14, 0xea, 0xa5, 0xa7, 0x02, 0xb5, 0x8d, 0x16, 0x36, 0x6c, 0xd4, 0x60, 0x0e,
+	0x39, 0x12, 0x6b, 0xed, 0x52, 0x5a, 0x84, 0xe4, 0x2a, 0xbb, 0x1b, 0xcb, 0xfa, 0x1b, 0xc9, 0x8f,
+	0xc8, 0x25, 0xff, 0x28, 0xbf, 0x22, 0xf7, 0x1c, 0x82, 0xdd, 0x25, 0x29, 0xca, 0x56, 0x72, 0x71,
+	0x0e, 0xbe, 0x69, 0xdf, 0x7b, 0x9c, 0x19, 0xbe, 0x37, 0x4b, 0x08, 0x80, 0xb0, 0x24, 0x39, 0x99,
+	0x0b, 0xae, 0x38, 0x72, 0xa7, 0x4c, 0xe1, 0x74, 0x39, 0xf0, 0xe5, 0x0c, 0x0b, 0x4a, 0x2c, 0x1a,
+	0x7e, 0x6e, 0xc2, 0x8f, 0x67, 0x3c, 0xcb, 0x98, 0x3a, 0x67, 0x49, 0x12, 0xd1, 0xd7, 0x6f, 0xa8,
+	0x54, 0x68, 0x0c, 0x20, 0xe8, 0x9c, 0x4b, 0xa6, 0xb8, 0x58, 0x06, 0xce, 0xd0, 0x19, 0xf5, 0xc6,
+	0xe8, 0xc4, 0x16, 0x38, 0x89, 0x2a, 0x26, 0xaa, 0xa9, 0xd0, 0x2f, 0xd0, 0x4f, 0x69, 0xa2, 0xe2,
+	0x89, 0xa9, 0x16, 0x33, 0x12, 0x34, 0x86, 0xce, 0xa8, 0x1b, 0xf9, 0x1a, 0xb5, 0x2d, 0x2e, 0x08,
+	0x3a, 0x86, 0x6d, 0xc1, 0xa6, 0xb3, 0xba, 0xac, 0x69, 0x64, 0x5b, 0x06, 0xae, 0x74, 0x7f, 0x41,
+	0xc0, 0xa6, 0x39, 0x17, 0x34, 0x5e, 0xcc, 0x98, 0xa2, 0x72, 0x8e, 0x27, 0x34, 0x9e, 0xcc, 0x70,
+	0x3e, 0xa5, 0x41, 0x6b, 0xe8, 0x8c, 0xbc, 0x68, 0xcf, 0xf2, 0x2f, 0x2b, 0xfa, 0xcc, 0xb0, 0xe8,
+	0x27, 0x68, 0xcf, 0xb1, 0x9a, 0xc9, 0xa0, 0x3d, 0x6c, 0x8e, 0xfc, 0xc8, 0x1e, 0xd0, 0x11, 0xf4,
+	0x27, 0x3c, 0x4d, 0xf1, 0x5c, 0xd2, 0x58, 0x9b, 0x22, 0x03, 0xd7, 0x54, 0xd9, 0x2a, 0x51, 0xfd,
+	0xfa, 0x46, 0x46, 0xf3, 0x84, 0x8b, 0x09, 0x8d, 0x53, 0x96, 0x31, 0x25, 0x83, 0x8e, 0x95, 0x15,
+	0xe8, 0x95, 0x01, 0xd1, 0x21, 0x74, 0x33, 0x7c, 0x1f, 0x27, 0x2c, 0xa5, 0x32, 0xf0, 0x86, 0xce,
+	0xa8, 0x1d, 0x79, 0x19, 0xbe, 0xff, 0x57, 0x9f, 0x4b, 0x32, 0x65, 0x39, 0x95, 0x41, 0xb7, 0x22,
+	0xaf, 0xf4, 0xb9, 0x24, 0x6f, 0x97, 0x8a, 0xca, 0x00, 0x2a, 0xf2, 0x54, 0x9f, 0xb5, 0x85, 0x12,
+	0x27, 0x34, 0x5e, 0xd5, 0xee, 0x19, 0x85, 0xaf, 0xd1, 0xeb, 0xb2, 0x7e, 0x5d, 0x65, 0x9b, 0xf8,
+	0x6b, 0x2a, 0xdb, 0xa8, 0xae, 0xb2, 0xdd, 0xb6, 0xd6, 0x54, 0xa6, 0x63, 0xf8, 0xb1, 0x01, 0xa8,
+	0x1e, 0xbf, 0x9c, 0xf3, 0x5c, 0x52, 0x3d, 0x65, 0x22, 0x78, 0x16, 0x6b, 0xef, 0x4c, 0xfc, 0x7e,
+	0xe4, 0x69, 0xe0, 0x06, 0xab, 0x19, 0xda, 0x87, 0x8e, 0xe2, 0x96, 0x6a, 0x18, 0xca, 0x55, 0xbc,
+	0x24, 0xcc, 0x53, 0x55, 0xa6, 0xae, 0x3e, 0x5e, 0x10, 0xb4, 0x0b, 0x6d, 0xc5, 0x35, 0xdc, 0x32,
+	0x70, 0x4b, 0xf1, 0x0b, 0x82, 0x0e, 0xc0, 0xe3, 0x29, 0x89, 0x33, 0x4e, 0x68, 0xd0, 0x36, 0xa3,
+	0x75, 0x78, 0x4a, 0xae, 0x39, 0xa1, 0x9a, 0xca, 0xe9, 0xc2, 0x52, 0xae, 0xa5, 0x72, 0xba, 0x30,
+	0xd4, 0x1e, 0xb8, 0xb7, 0x2c, 0xc7, 0x62, 0x59, 0x04, 0x53, 0x9c, 0xf4, 0xeb, 0x0a, 0xbc, 0xd0,
+	0x53, 0x4d, 0x66, 0x31, 0xc1, 0x0a, 0x1b, 0xe7, 0xfd, 0xc8, 0x17, 0x78, 0x71, 0xa3, 0xc1, 0x73,
+	0xac, 0x30, 0x1a, 0x82, 0x4f, 0x73, 0x12, 0xf3, 0xc4, 0x0a, 0x4d, 0x00, 0x5e, 0x04, 0x34, 0x27,
+	0xff, 0x27, 0x46, 0x85, 0x7e, 0x85, 0x6d, 0x7e, 0x47, 0x45, 0x92, 0xf2, 0x45, 0x9c, 0x61, 0xf1,
+	0x8a, 0x0a, 0x93, 0x81, 0x17, 0xf5, 0x4b, 0xf8, 0xda, 0xa0, 0xe8, 0x67, 0xe8, 0x96, 0xab, 0x43,
+	0x4c, 0x00, 0x5e, 0xb4, 0x02, 0x2e, 0x5b, 0x9e, 0xb7, 0xd3, 0x0d, 0x3f, 0x38, 0x95, 0xbb, 0x34,
+	0x55, 0xf8, 0xf9, 0xdc, 0xae, 0xea, 0x8e, 0xb4, 0x6a, 0x77, 0x24, 0x7c, 0xef, 0x40, 0xaf, 0x36,
+	0xee, 0xf3, 0xdd, 0x82, 0xf0, 0x14, 0x76, 0xd7, 0x7c, 0x2d, 0xd6, 0xf6, 0x77, 0x70, 0x89, 0x06,
+	0x64, 0xe0, 0x0c, 0x9b, 0xa3, 0xde, 0x78, 0xb7, 0x34, 0xb5, 0x2e, 0x2e, 0x24, 0x21, 0x29, 0xb3,
+	0x31, 0xc1, 0x3f, 0x25, 0x9b, 0x01, 0x78, 0x82, 0xde, 0x31, 0xc9, 0x78, 0x5e, 0x78, 0x51, 0x9d,
+	0xc3, 0xdf, 0xca, 0x49, 0x8b, 0x2e, 0xc5, 0xa4, 0x08, 0x5a, 0x66, 0x49, 0xad, 0xab, 0xe6, 0x77,
+	0xf8, 0xd6, 0x81, 0x7e, 0x84, 0x17, 0xcf, 0xea, 0x3b, 0x1c, 0x1e, 0xc1, 0x76, 0x35, 0xd3, 0x37,
+	0x66, 0x7f, 0xe7, 0x18, 0xdd, 0x93, 0xad, 0xfc, 0xbe, 0xc3, 0x1f, 0xc3, 0xce, 0x6a, 0xa8, 0xaf,
+	0x4f, 0x3f, 0xfe, 0xd4, 0x80, 0x9e, 0x7e, 0xc5, 0x17, 0x54, 0xdc, 0xb1, 0x09, 0x45, 0xff, 0x01,
+	0xac, 0x3e, 0x8a, 0xe8, 0xe0, 0xc1, 0x16, 0xad, 0xf2, 0x19, 0x0c, 0x36, 0x51, 0xb6, 0x51, 0xf8,
+	0xc3, 0x1f, 0x0e, 0xba, 0x5c, 0xbf, 0x50, 0x83, 0x4d, 0xfb, 0x58, 0x94, 0x3a, 0xdc, 0xc8, 0x6d,
+	0xaa, 0x65, 0x3f, 0x54, 0x0f, 0x6a, 0xd5, 0x9d, 0x7f, 0x58, 0x6b, 0xcd, 0x00, 0x53, 0xeb, 0x6f,
+	0xe8, 0x14, 0xa9, 0xa2, 0xbd, 0x2a, 0x91, 0xb5, 0xd5, 0x1b, 0xec, 0x3f, 0xc2, 0x6b, 0xcf, 0xff,
+	0x03, 0x5e, 0x69, 0x2c, 0xaa, 0x0b, 0xd7, 0xa6, 0x08, 0x1e, 0x13, 0xab, 0x12, 0xb7, 0xae, 0xf9,
+	0xff, 0xf1, 0xe7, 0x97, 0x00, 0x00, 0x00, 0xff, 0xff, 0x55, 0x7c, 0x0d, 0x4f, 0xa3, 0x08, 0x00,
+	0x00,
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 9e4f072b7..da3afb526 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -201,12 +201,12 @@
 			"revisionTime": "2017-01-30T11:31:45Z"
 		},
 		{
-			"checksumSHA1": "tisAil16tojFqhqWYbs2kXwBYyk=",
+			"checksumSHA1": "I7Kz+IncdenJ5tOCo/5qJlQ4U7k=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "12872bd8dad9dc72328b2c590386e67a17c65612",
-			"revisionTime": "2017-09-27T21:53:01Z",
-			"version": "v0.38.0",
-			"versionExact": "v0.38.0"
+			"revision": "8ac6c4c6cb2c124ff95cdd0f97bc4624055edc8f",
+			"revisionTime": "2017-10-02T18:55:11Z",
+			"version": "v0.39.0",
+			"versionExact": "v0.39.0"
 		},
 		{
 			"checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=",