Merge branch 'zj-remove-repo-conflict-header' into 'master'

Remove repository from ConflictFileHeader

Closes #2106

See merge request gitlab-org/gitaly!1636

5 files changed, 57 insertions, 69 deletions

diff --git a/internal/service/conflicts/list_conflict_files_test.go b/internal/service/conflicts/list_conflict_files_test.go
index 9119c55ca..074234caa 100644
--- a/internal/service/conflicts/list_conflict_files_test.go
+++ b/internal/service/conflicts/list_conflict_files_test.go
@@ -65,21 +65,19 @@ end
 	expectedFiles := []*conflictFile{
 		{
 			header: &gitalypb.ConflictFileHeader{
-				Repository: testRepo,
-				CommitOid:  ourCommitOid,
-				OurMode:    int32(0100644),
-				OurPath:    []byte("encoding/codagé"),
-				TheirPath:  []byte("encoding/codagé"),
+				CommitOid: ourCommitOid,
+				OurMode:   int32(0100644),
+				OurPath:   []byte("encoding/codagé"),
+				TheirPath: []byte("encoding/codagé"),
 			},
 			content: []byte(conflictContent1),
 		},
 		{
 			header: &gitalypb.ConflictFileHeader{
-				Repository: testRepo,
-				CommitOid:  ourCommitOid,
-				OurMode:    int32(0100644),
-				OurPath:    []byte("files/ruby/feature.rb"),
-				TheirPath:  []byte("files/ruby/feature.rb"),
+				CommitOid: ourCommitOid,
+				OurMode:   int32(0100644),
+				OurPath:   []byte("files/ruby/feature.rb"),
+				TheirPath: []byte("files/ruby/feature.rb"),
 			},
 			content: []byte(conflictContent2),
 		},
diff --git a/proto/conflicts.proto b/proto/conflicts.proto
index 6409a38d5..1ff17c7fc 100644
--- a/proto/conflicts.proto
+++ b/proto/conflicts.proto
@@ -28,7 +28,7 @@ message ListConflictFilesRequest {
 }
 
 message ConflictFileHeader {
-  Repository repository = 1;
+  reserved 1;
   string commit_oid = 2;
   bytes their_path = 3;
   bytes our_path = 4;
diff --git a/proto/go/gitalypb/conflicts.pb.go b/proto/go/gitalypb/conflicts.pb.go
index 0dda32c33..a2373a0bb 100644
--- a/proto/go/gitalypb/conflicts.pb.go
+++ b/proto/go/gitalypb/conflicts.pb.go
@@ -80,14 +80,13 @@ func (m *ListConflictFilesRequest) GetTheirCommitOid() string {
 }
 
 type ConflictFileHeader struct {
-	Repository           *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
-	CommitOid            string      `protobuf:"bytes,2,opt,name=commit_oid,json=commitOid,proto3" json:"commit_oid,omitempty"`
-	TheirPath            []byte      `protobuf:"bytes,3,opt,name=their_path,json=theirPath,proto3" json:"their_path,omitempty"`
-	OurPath              []byte      `protobuf:"bytes,4,opt,name=our_path,json=ourPath,proto3" json:"our_path,omitempty"`
-	OurMode              int32       `protobuf:"varint,5,opt,name=our_mode,json=ourMode,proto3" json:"our_mode,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
-	XXX_unrecognized     []byte      `json:"-"`
-	XXX_sizecache        int32       `json:"-"`
+	CommitOid            string   `protobuf:"bytes,2,opt,name=commit_oid,json=commitOid,proto3" json:"commit_oid,omitempty"`
+	TheirPath            []byte   `protobuf:"bytes,3,opt,name=their_path,json=theirPath,proto3" json:"their_path,omitempty"`
+	OurPath              []byte   `protobuf:"bytes,4,opt,name=our_path,json=ourPath,proto3" json:"our_path,omitempty"`
+	OurMode              int32    `protobuf:"varint,5,opt,name=our_mode,json=ourMode,proto3" json:"our_mode,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ConflictFileHeader) Reset()         { *m = ConflictFileHeader{} }
@@ -115,13 +114,6 @@ func (m *ConflictFileHeader) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ConflictFileHeader proto.InternalMessageInfo
 
-func (m *ConflictFileHeader) GetRepository() *Repository {
-	if m != nil {
-		return m.Repository
-	}
-	return nil
-}
-
 func (m *ConflictFileHeader) GetCommitOid() string {
 	if m != nil {
 		return m.CommitOid
@@ -496,47 +488,47 @@ func init() {
 func init() { proto.RegisterFile("conflicts.proto", fileDescriptor_28fc8937e7d75862) }
 
 var fileDescriptor_28fc8937e7d75862 = []byte{
-	// 626 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xcf, 0x4e, 0xdb, 0x4c,
-	0x14, 0xc5, 0x19, 0x42, 0xfe, 0x5d, 0x0c, 0x84, 0xd1, 0xf7, 0x09, 0x63, 0x09, 0x61, 0x4c, 0x91,
-	0xdc, 0x4a, 0x4d, 0x20, 0xed, 0x1e, 0x29, 0x88, 0x16, 0x55, 0x45, 0xad, 0x5c, 0x75, 0xd3, 0x8d,
-	0xe5, 0xd8, 0x97, 0xc4, 0x95, 0xe3, 0x49, 0x67, 0xc6, 0x48, 0x79, 0x12, 0x76, 0x55, 0x1f, 0xa4,
-	0xef, 0xd2, 0xc7, 0xa8, 0xc4, 0xaa, 0xca, 0x8c, 0x6d, 0x02, 0x49, 0x68, 0xd5, 0xee, 0x92, 0x73,
-	0x7f, 0xbe, 0x73, 0xee, 0xdc, 0xa3, 0x81, 0xad, 0x90, 0xa5, 0x57, 0x49, 0x1c, 0x4a, 0xd1, 0x1e,
-	0x73, 0x26, 0x19, 0xad, 0x0d, 0x62, 0x19, 0x24, 0x13, 0xcb, 0x10, 0xc3, 0x80, 0x63, 0xa4, 0x55,
-	0xe7, 0x2b, 0x01, 0xf3, 0x6d, 0x2c, 0xe4, 0x59, 0x4e, 0xbf, 0x8a, 0x13, 0x14, 0x1e, 0x7e, 0xc9,
-	0x50, 0x48, 0xda, 0x05, 0xe0, 0x38, 0x66, 0x22, 0x96, 0x8c, 0x4f, 0x4c, 0x62, 0x13, 0x77, 0xbd,
-	0x4b, 0xdb, 0xba, 0x4f, 0xdb, 0x2b, 0x2b, 0xde, 0x0c, 0x45, 0x9f, 0xc0, 0x26, 0xcb, 0xb8, 0x1f,
-	0xb2, 0xd1, 0x28, 0x96, 0x3e, 0x8b, 0x23, 0x73, 0xd5, 0x26, 0x6e, 0xd3, 0x33, 0x58, 0xc6, 0xcf,
-	0x94, 0xf8, 0x2e, 0x8e, 0xa8, 0x0b, 0x2d, 0x39, 0xc4, 0xf8, 0x1e, 0x57, 0x51, 0xdc, 0xa6, 0xd2,
-	0x4b, 0xd2, 0xf9, 0x4e, 0x80, 0xce, 0x9a, 0xbb, 0xc0, 0x20, 0x42, 0xfe, 0x57, 0xd6, 0xf6, 0x00,
-	0xe6, 0x6c, 0x35, 0xc3, 0xd2, 0xd3, 0x1e, 0x80, 0xf6, 0x34, 0x0e, 0xe4, 0x50, 0xb9, 0x31, 0xbc,
-	0xa6, 0x52, 0xde, 0x07, 0x72, 0x48, 0x77, 0xa1, 0x31, 0x1d, 0x4c, 0x15, 0xd7, 0x54, 0xb1, 0xce,
-	0xb2, 0x7b, 0xa5, 0x11, 0x8b, 0xd0, 0xac, 0xda, 0xc4, 0xad, 0xaa, 0xd2, 0x25, 0x8b, 0xd0, 0x99,
-	0x80, 0x31, 0xeb, 0x9e, 0xbe, 0x84, 0xda, 0x50, 0x4d, 0x90, 0x7b, 0xb6, 0x0a, 0xcf, 0xf3, 0x33,
-	0x5e, 0xac, 0x78, 0x39, 0x4b, 0x2d, 0xa8, 0x87, 0x2c, 0x95, 0x98, 0x4a, 0x65, 0xdb, 0xb8, 0x58,
-	0xf1, 0x0a, 0xa1, 0xb7, 0x03, 0xff, 0x17, 0xab, 0xf6, 0xaf, 0xe2, 0x04, 0xfd, 0x71, 0x30, 0x49,
-	0x58, 0x10, 0x39, 0xaf, 0x61, 0x77, 0xc1, 0x66, 0xc5, 0x98, 0xa5, 0x02, 0xe9, 0x33, 0xa8, 0x4e,
-	0x61, 0x61, 0x12, 0xbb, 0xe2, 0xae, 0x77, 0xff, 0x5b, 0x64, 0xc3, 0xd3, 0x88, 0xf3, 0x73, 0x15,
-	0xf6, 0x3c, 0x14, 0x2c, 0xb9, 0xc6, 0xa2, 0x5c, 0x44, 0xe4, 0x1f, 0xb6, 0xf1, 0x67, 0x41, 0x39,
-	0x85, 0x6d, 0x19, 0xf0, 0x01, 0x4a, 0x7f, 0xe6, 0x80, 0xca, 0xd2, 0x03, 0x5a, 0x1a, 0xbe, 0x53,
-	0x16, 0x26, 0x6d, 0x6d, 0x51, 0xd2, 0xe8, 0x21, 0x6c, 0x08, 0x96, 0xf1, 0x10, 0xfd, 0x3e, 0x0f,
-	0xd2, 0x70, 0xa8, 0x56, 0x69, 0x78, 0x86, 0x16, 0x7b, 0x4a, 0x9b, 0x42, 0xb9, 0x9f, 0x1c, 0xaa,
-	0x69, 0x48, 0x8b, 0x39, 0x74, 0x04, 0x9b, 0xf9, 0x69, 0x23, 0x14, 0x22, 0x18, 0xa0, 0x59, 0x57,
-	0xd4, 0x86, 0x56, 0x2f, 0xb5, 0x48, 0x6d, 0x58, 0xcb, 0x04, 0x72, 0xb3, 0xa1, 0xc6, 0x31, 0x8a,
-	0x71, 0x3e, 0x0a, 0xe4, 0x9e, 0xaa, 0x38, 0xdf, 0x08, 0xec, 0x2c, 0xb9, 0x79, 0x7a, 0xfa, 0x20,
-	0x49, 0x47, 0x77, 0xd7, 0xf1, 0xc8, 0xaa, 0x66, 0x42, 0xb5, 0x0f, 0xa0, 0xf6, 0xeb, 0x7f, 0x16,
-	0x2c, 0x2d, 0x73, 0xd5, 0x54, 0xda, 0x1b, 0xc1, 0xd2, 0xde, 0x21, 0x1c, 0x70, 0xdd, 0xcb, 0x2f,
-	0x1f, 0x13, 0x9f, 0xeb, 0x6e, 0x65, 0xca, 0xce, 0xc1, 0x9c, 0x3f, 0x30, 0x0f, 0xd9, 0x53, 0x68,
-	0xa9, 0x06, 0x99, 0x8c, 0x59, 0xea, 0x23, 0xe7, 0x4c, 0x9b, 0x6d, 0x7a, 0x5b, 0x77, 0xfa, 0xf9,
-	0x54, 0xee, 0xfe, 0x20, 0xd0, 0x2a, 0x1b, 0x7c, 0x40, 0x7e, 0x1d, 0x87, 0x48, 0x11, 0xb6, 0xe7,
-	0x12, 0x4c, 0xed, 0x62, 0xce, 0x65, 0xcf, 0x96, 0x75, 0xf0, 0x08, 0xa1, 0x9d, 0x39, 0xcd, 0xdb,
-	0x1b, 0xb7, 0xda, 0x58, 0xb5, 0xc8, 0xc9, 0x31, 0xa1, 0x11, 0xb4, 0x1e, 0x8e, 0x40, 0xf7, 0x7f,
-	0x73, 0x9b, 0x96, 0xbd, 0x1c, 0xc8, 0xcf, 0x58, 0xbf, 0xbd, 0x71, 0xeb, 0x0d, 0x62, 0x55, 0x4e,
-	0xda, 0x27, 0x2e, 0xe9, 0x1d, 0x7f, 0x9a, 0x7e, 0x91, 0x04, 0xfd, 0x76, 0xc8, 0x46, 0x1d, 0xfd,
-	0xf3, 0x39, 0xe3, 0x83, 0x8e, 0xee, 0xd3, 0x51, 0xef, 0x71, 0x67, 0xc0, 0xf2, 0xff, 0xe3, 0x7e,
-	0xbf, 0xa6, 0xa4, 0x17, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0e, 0xbc, 0xad, 0x15, 0xcb, 0x05,
-	0x00, 0x00,
+	// 625 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x4d, 0x4f, 0xdb, 0x40,
+	0x10, 0x65, 0xf3, 0x9d, 0xc1, 0x40, 0x58, 0xb5, 0xc2, 0x44, 0x42, 0x18, 0x53, 0x24, 0xb7, 0x52,
+	0x13, 0x48, 0x7b, 0x47, 0x0a, 0xa2, 0x45, 0xa8, 0xa8, 0x95, 0xab, 0x5e, 0x7a, 0xb1, 0x1c, 0x7b,
+	0x48, 0x5c, 0x39, 0xde, 0x74, 0x77, 0x8d, 0x94, 0x3f, 0xd1, 0x2b, 0xb7, 0xaa, 0xff, 0xac, 0x3f,
+	0xa3, 0x12, 0xa7, 0x2a, 0xbb, 0xb6, 0x09, 0x24, 0xa1, 0xa7, 0xde, 0x92, 0x37, 0xcf, 0x6f, 0xde,
+	0xcc, 0x3c, 0x2d, 0x6c, 0x05, 0x2c, 0xb9, 0x8e, 0xa3, 0x40, 0x8a, 0xce, 0x84, 0x33, 0xc9, 0x68,
+	0x6d, 0x18, 0x49, 0x3f, 0x9e, 0xb6, 0x0d, 0x31, 0xf2, 0x39, 0x86, 0x1a, 0xb5, 0x7f, 0x12, 0x30,
+	0x3f, 0x44, 0x42, 0x9e, 0x65, 0xec, 0x77, 0x51, 0x8c, 0xc2, 0xc5, 0xef, 0x29, 0x0a, 0x49, 0x7b,
+	0x00, 0x1c, 0x27, 0x4c, 0x44, 0x92, 0xf1, 0xa9, 0x49, 0x2c, 0xe2, 0xac, 0xf7, 0x68, 0x47, 0xeb,
+	0x74, 0xdc, 0xa2, 0xe2, 0xce, 0xb1, 0xe8, 0x0b, 0xd8, 0x64, 0x29, 0xf7, 0x02, 0x36, 0x1e, 0x47,
+	0xd2, 0x63, 0x51, 0x68, 0x96, 0x2c, 0xe2, 0x34, 0x5d, 0x83, 0xa5, 0xfc, 0x4c, 0x81, 0x1f, 0xa3,
+	0x90, 0x3a, 0xd0, 0x92, 0x23, 0x8c, 0x1e, 0xf0, 0xca, 0x8a, 0xb7, 0xa9, 0xf0, 0x82, 0x69, 0xff,
+	0x20, 0x40, 0xe7, 0xcd, 0x5d, 0xa0, 0x1f, 0x22, 0xa7, 0x7b, 0x00, 0x0b, 0x2d, 0x9a, 0x41, 0xa1,
+	0xbf, 0x07, 0xa0, 0xf5, 0x27, 0xbe, 0x1c, 0x29, 0x65, 0xc3, 0x6d, 0x2a, 0xe4, 0x93, 0x2f, 0x47,
+	0x74, 0x17, 0x1a, 0x33, 0x93, 0xaa, 0x58, 0x51, 0xc5, 0x3a, 0x4b, 0x1f, 0x94, 0xc6, 0x2c, 0x44,
+	0xb3, 0x6a, 0x11, 0xa7, 0xaa, 0x4a, 0x57, 0x2c, 0xc4, 0xcb, 0x4a, 0x83, 0xb4, 0x4a, 0xf6, 0x14,
+	0x8c, 0x79, 0x3f, 0xf4, 0x2d, 0xd4, 0x46, 0xca, 0x53, 0xb6, 0xa0, 0x76, 0xbe, 0xa0, 0x45, 0xd7,
+	0x17, 0x6b, 0x6e, 0xc6, 0xa5, 0x6d, 0xa8, 0x07, 0x2c, 0x91, 0x98, 0x48, 0x65, 0xde, 0xb8, 0x58,
+	0x73, 0x73, 0xa0, 0xbf, 0x03, 0xcf, 0xf3, 0xe3, 0x79, 0xd7, 0x51, 0x8c, 0xde, 0xc4, 0x9f, 0xc6,
+	0xcc, 0x0f, 0xed, 0xf7, 0xb0, 0xbb, 0xe4, 0x56, 0x62, 0xc2, 0x12, 0x81, 0xf4, 0x15, 0x54, 0x67,
+	0x64, 0x61, 0x12, 0xab, 0xec, 0xac, 0xf7, 0x9e, 0x2d, 0xb3, 0xe1, 0x6a, 0x8a, 0xfd, 0xa7, 0x04,
+	0x7b, 0x2e, 0x0a, 0x16, 0xdf, 0x60, 0x5e, 0xce, 0x8f, 0x9e, 0xed, 0xf7, 0xff, 0x9d, 0xfe, 0x14,
+	0xb6, 0xa5, 0xcf, 0x87, 0x28, 0xbd, 0xb9, 0x06, 0xe5, 0x95, 0x0d, 0x5a, 0x9a, 0x7c, 0x8f, 0x2c,
+	0xcd, 0x4e, 0x65, 0x59, 0x76, 0xe8, 0x21, 0x6c, 0x08, 0x96, 0xf2, 0x00, 0xbd, 0x01, 0xf7, 0x93,
+	0x60, 0xa4, 0x0e, 0x6a, 0xb8, 0x86, 0x06, 0xfb, 0x0a, 0x9b, 0x91, 0x32, 0x3f, 0x19, 0xa9, 0xa6,
+	0x49, 0x1a, 0xcc, 0x48, 0x47, 0xb0, 0x99, 0x75, 0x1b, 0xa3, 0x10, 0xfe, 0x10, 0xcd, 0xba, 0x62,
+	0x6d, 0x68, 0xf4, 0x4a, 0x83, 0xd4, 0x82, 0x4a, 0x2a, 0x90, 0x9b, 0x0d, 0x35, 0x8e, 0x91, 0x8f,
+	0xf3, 0x45, 0x20, 0x77, 0x55, 0xc5, 0xfe, 0x45, 0x60, 0x67, 0xc5, 0xe6, 0xe9, 0xe9, 0xa3, 0x24,
+	0x1d, 0xdd, 0xaf, 0xe3, 0x89, 0x53, 0xcd, 0x85, 0x6a, 0x1f, 0x40, 0xdd, 0xd7, 0xfb, 0x26, 0x58,
+	0x52, 0xe4, 0xaa, 0xa9, 0xb0, 0x4b, 0xc1, 0x92, 0xfe, 0x21, 0x1c, 0x70, 0xad, 0xe5, 0x15, 0xcf,
+	0x83, 0xc7, 0xb5, 0x5a, 0x91, 0xb2, 0x73, 0x30, 0x17, 0x1b, 0x66, 0x21, 0x7b, 0x09, 0x2d, 0x25,
+	0x90, 0xca, 0x88, 0x25, 0x1e, 0x72, 0xce, 0xb4, 0xd9, 0xa6, 0xbb, 0x75, 0x8f, 0x9f, 0xcf, 0xe0,
+	0xde, 0x6f, 0x02, 0xad, 0x42, 0xe0, 0x33, 0xf2, 0x9b, 0x28, 0x40, 0x8a, 0xb0, 0xbd, 0x90, 0x60,
+	0x6a, 0xe5, 0x73, 0xae, 0x7a, 0x88, 0xda, 0x07, 0x4f, 0x30, 0xb4, 0x33, 0xbb, 0x79, 0x77, 0xeb,
+	0x54, 0x1b, 0xa5, 0x36, 0x39, 0x39, 0x26, 0x34, 0x84, 0xd6, 0xe3, 0x11, 0xe8, 0xfe, 0x3f, 0xb6,
+	0xd9, 0xb6, 0x56, 0x13, 0xb2, 0x1e, 0xeb, 0x77, 0xb7, 0x4e, 0xbd, 0x41, 0xda, 0xe5, 0x93, 0xce,
+	0x89, 0x43, 0xfa, 0xc7, 0x5f, 0x67, 0x5f, 0xc4, 0xfe, 0xa0, 0x13, 0xb0, 0x71, 0x57, 0xff, 0x7c,
+	0xcd, 0xf8, 0xb0, 0xab, 0x75, 0xba, 0xea, 0x85, 0xed, 0x0e, 0x59, 0xf6, 0x7f, 0x32, 0x18, 0xd4,
+	0x14, 0xf4, 0xe6, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x52, 0xab, 0xf8, 0x46, 0x9d, 0x05, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/ruby/lib/gitaly_server/conflicts_service.rb b/ruby/lib/gitaly_server/conflicts_service.rb
index 737d2118d..f0e5a7cef 100644
--- a/ruby/lib/gitaly_server/conflicts_service.rb
+++ b/ruby/lib/gitaly_server/conflicts_service.rb
@@ -75,7 +75,6 @@ module GitalyServer
 
     def conflict_file_header(file)
       Gitaly::ConflictFileHeader.new(
-        repository: file.repository.gitaly_repository,
         commit_oid: file.commit_oid,
         their_path: file.their_path.b,
         our_path: file.our_path.b,
diff --git a/ruby/proto/gitaly/conflicts_pb.rb b/ruby/proto/gitaly/conflicts_pb.rb
index 4d94a9ecc..8ab2e6c15 100644
--- a/ruby/proto/gitaly/conflicts_pb.rb
+++ b/ruby/proto/gitaly/conflicts_pb.rb
@@ -11,7 +11,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :their_commit_oid, :string, 3
   end
   add_message "gitaly.ConflictFileHeader" do
-    optional :repository, :message, 1, "gitaly.Repository"
     optional :commit_oid, :string, 2
     optional :their_path, :bytes, 3
     optional :our_path, :bytes, 4