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
path: root/proto/go/gitalypb/conflicts.pb.go
diff options
context:
space:
mode:
Diffstat (limited to 'proto/go/gitalypb/conflicts.pb.go')
-rw-r--r--proto/go/gitalypb/conflicts.pb.go951
1 files changed, 604 insertions, 347 deletions
diff --git a/proto/go/gitalypb/conflicts.pb.go b/proto/go/gitalypb/conflicts.pb.go
index e93c9e9c1..38681ef24 100644
--- a/proto/go/gitalypb/conflicts.pb.go
+++ b/proto/go/gitalypb/conflicts.pb.go
@@ -1,207 +1,220 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.23.0
+// protoc v3.12.4
// source: conflicts.proto
package gitalypb
import (
context "context"
- fmt "fmt"
proto "github.com/golang/protobuf/proto"
timestamp "github.com/golang/protobuf/ptypes/timestamp"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
- math "math"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ reflect "reflect"
+ sync "sync"
)
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
-// 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.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
type ListConflictFilesRequest struct {
- Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
- OurCommitOid string `protobuf:"bytes,2,opt,name=our_commit_oid,json=ourCommitOid,proto3" json:"our_commit_oid,omitempty"`
- TheirCommitOid string `protobuf:"bytes,3,opt,name=their_commit_oid,json=theirCommitOid,proto3" json:"their_commit_oid,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
-func (m *ListConflictFilesRequest) Reset() { *m = ListConflictFilesRequest{} }
-func (m *ListConflictFilesRequest) String() string { return proto.CompactTextString(m) }
-func (*ListConflictFilesRequest) ProtoMessage() {}
-func (*ListConflictFilesRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_28fc8937e7d75862, []int{0}
+ Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
+ OurCommitOid string `protobuf:"bytes,2,opt,name=our_commit_oid,json=ourCommitOid,proto3" json:"our_commit_oid,omitempty"`
+ TheirCommitOid string `protobuf:"bytes,3,opt,name=their_commit_oid,json=theirCommitOid,proto3" json:"their_commit_oid,omitempty"`
}
-func (m *ListConflictFilesRequest) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_ListConflictFilesRequest.Unmarshal(m, b)
-}
-func (m *ListConflictFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_ListConflictFilesRequest.Marshal(b, m, deterministic)
-}
-func (m *ListConflictFilesRequest) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ListConflictFilesRequest.Merge(m, src)
+func (x *ListConflictFilesRequest) Reset() {
+ *x = ListConflictFilesRequest{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_conflicts_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
-func (m *ListConflictFilesRequest) XXX_Size() int {
- return xxx_messageInfo_ListConflictFilesRequest.Size(m)
+
+func (x *ListConflictFilesRequest) String() string {
+ return protoimpl.X.MessageStringOf(x)
}
-func (m *ListConflictFilesRequest) XXX_DiscardUnknown() {
- xxx_messageInfo_ListConflictFilesRequest.DiscardUnknown(m)
+
+func (*ListConflictFilesRequest) ProtoMessage() {}
+
+func (x *ListConflictFilesRequest) ProtoReflect() protoreflect.Message {
+ mi := &file_conflicts_proto_msgTypes[0]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
}
-var xxx_messageInfo_ListConflictFilesRequest proto.InternalMessageInfo
+// Deprecated: Use ListConflictFilesRequest.ProtoReflect.Descriptor instead.
+func (*ListConflictFilesRequest) Descriptor() ([]byte, []int) {
+ return file_conflicts_proto_rawDescGZIP(), []int{0}
+}
-func (m *ListConflictFilesRequest) GetRepository() *Repository {
- if m != nil {
- return m.Repository
+func (x *ListConflictFilesRequest) GetRepository() *Repository {
+ if x != nil {
+ return x.Repository
}
return nil
}
-func (m *ListConflictFilesRequest) GetOurCommitOid() string {
- if m != nil {
- return m.OurCommitOid
+func (x *ListConflictFilesRequest) GetOurCommitOid() string {
+ if x != nil {
+ return x.OurCommitOid
}
return ""
}
-func (m *ListConflictFilesRequest) GetTheirCommitOid() string {
- if m != nil {
- return m.TheirCommitOid
+func (x *ListConflictFilesRequest) GetTheirCommitOid() string {
+ if x != nil {
+ return x.TheirCommitOid
}
return ""
}
type ConflictFileHeader struct {
- 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"`
- AncestorPath []byte `protobuf:"bytes,6,opt,name=ancestor_path,json=ancestorPath,proto3" json:"ancestor_path,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *ConflictFileHeader) Reset() { *m = ConflictFileHeader{} }
-func (m *ConflictFileHeader) String() string { return proto.CompactTextString(m) }
-func (*ConflictFileHeader) ProtoMessage() {}
-func (*ConflictFileHeader) Descriptor() ([]byte, []int) {
- return fileDescriptor_28fc8937e7d75862, []int{1}
-}
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
-func (m *ConflictFileHeader) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_ConflictFileHeader.Unmarshal(m, b)
+ 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"`
+ AncestorPath []byte `protobuf:"bytes,6,opt,name=ancestor_path,json=ancestorPath,proto3" json:"ancestor_path,omitempty"`
}
-func (m *ConflictFileHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_ConflictFileHeader.Marshal(b, m, deterministic)
-}
-func (m *ConflictFileHeader) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ConflictFileHeader.Merge(m, src)
+
+func (x *ConflictFileHeader) Reset() {
+ *x = ConflictFileHeader{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_conflicts_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
-func (m *ConflictFileHeader) XXX_Size() int {
- return xxx_messageInfo_ConflictFileHeader.Size(m)
+
+func (x *ConflictFileHeader) String() string {
+ return protoimpl.X.MessageStringOf(x)
}
-func (m *ConflictFileHeader) XXX_DiscardUnknown() {
- xxx_messageInfo_ConflictFileHeader.DiscardUnknown(m)
+
+func (*ConflictFileHeader) ProtoMessage() {}
+
+func (x *ConflictFileHeader) ProtoReflect() protoreflect.Message {
+ mi := &file_conflicts_proto_msgTypes[1]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
}
-var xxx_messageInfo_ConflictFileHeader proto.InternalMessageInfo
+// Deprecated: Use ConflictFileHeader.ProtoReflect.Descriptor instead.
+func (*ConflictFileHeader) Descriptor() ([]byte, []int) {
+ return file_conflicts_proto_rawDescGZIP(), []int{1}
+}
-func (m *ConflictFileHeader) GetCommitOid() string {
- if m != nil {
- return m.CommitOid
+func (x *ConflictFileHeader) GetCommitOid() string {
+ if x != nil {
+ return x.CommitOid
}
return ""
}
-func (m *ConflictFileHeader) GetTheirPath() []byte {
- if m != nil {
- return m.TheirPath
+func (x *ConflictFileHeader) GetTheirPath() []byte {
+ if x != nil {
+ return x.TheirPath
}
return nil
}
-func (m *ConflictFileHeader) GetOurPath() []byte {
- if m != nil {
- return m.OurPath
+func (x *ConflictFileHeader) GetOurPath() []byte {
+ if x != nil {
+ return x.OurPath
}
return nil
}
-func (m *ConflictFileHeader) GetOurMode() int32 {
- if m != nil {
- return m.OurMode
+func (x *ConflictFileHeader) GetOurMode() int32 {
+ if x != nil {
+ return x.OurMode
}
return 0
}
-func (m *ConflictFileHeader) GetAncestorPath() []byte {
- if m != nil {
- return m.AncestorPath
+func (x *ConflictFileHeader) GetAncestorPath() []byte {
+ if x != nil {
+ return x.AncestorPath
}
return nil
}
type ConflictFile struct {
- // Types that are valid to be assigned to ConflictFilePayload:
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ // Types that are assignable to ConflictFilePayload:
// *ConflictFile_Header
// *ConflictFile_Content
- ConflictFilePayload isConflictFile_ConflictFilePayload `protobuf_oneof:"conflict_file_payload"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ ConflictFilePayload isConflictFile_ConflictFilePayload `protobuf_oneof:"conflict_file_payload"`
}
-func (m *ConflictFile) Reset() { *m = ConflictFile{} }
-func (m *ConflictFile) String() string { return proto.CompactTextString(m) }
-func (*ConflictFile) ProtoMessage() {}
-func (*ConflictFile) Descriptor() ([]byte, []int) {
- return fileDescriptor_28fc8937e7d75862, []int{2}
+func (x *ConflictFile) Reset() {
+ *x = ConflictFile{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_conflicts_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
-func (m *ConflictFile) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_ConflictFile.Unmarshal(m, b)
-}
-func (m *ConflictFile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_ConflictFile.Marshal(b, m, deterministic)
-}
-func (m *ConflictFile) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ConflictFile.Merge(m, src)
-}
-func (m *ConflictFile) XXX_Size() int {
- return xxx_messageInfo_ConflictFile.Size(m)
-}
-func (m *ConflictFile) XXX_DiscardUnknown() {
- xxx_messageInfo_ConflictFile.DiscardUnknown(m)
+func (x *ConflictFile) String() string {
+ return protoimpl.X.MessageStringOf(x)
}
-var xxx_messageInfo_ConflictFile proto.InternalMessageInfo
+func (*ConflictFile) ProtoMessage() {}
-type isConflictFile_ConflictFilePayload interface {
- isConflictFile_ConflictFilePayload()
-}
-
-type ConflictFile_Header struct {
- Header *ConflictFileHeader `protobuf:"bytes,1,opt,name=header,proto3,oneof"`
+func (x *ConflictFile) ProtoReflect() protoreflect.Message {
+ mi := &file_conflicts_proto_msgTypes[2]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
}
-type ConflictFile_Content struct {
- Content []byte `protobuf:"bytes,2,opt,name=content,proto3,oneof"`
+// Deprecated: Use ConflictFile.ProtoReflect.Descriptor instead.
+func (*ConflictFile) Descriptor() ([]byte, []int) {
+ return file_conflicts_proto_rawDescGZIP(), []int{2}
}
-func (*ConflictFile_Header) isConflictFile_ConflictFilePayload() {}
-
-func (*ConflictFile_Content) isConflictFile_ConflictFilePayload() {}
-
func (m *ConflictFile) GetConflictFilePayload() isConflictFile_ConflictFilePayload {
if m != nil {
return m.ConflictFilePayload
@@ -209,63 +222,79 @@ func (m *ConflictFile) GetConflictFilePayload() isConflictFile_ConflictFilePaylo
return nil
}
-func (m *ConflictFile) GetHeader() *ConflictFileHeader {
- if x, ok := m.GetConflictFilePayload().(*ConflictFile_Header); ok {
+func (x *ConflictFile) GetHeader() *ConflictFileHeader {
+ if x, ok := x.GetConflictFilePayload().(*ConflictFile_Header); ok {
return x.Header
}
return nil
}
-func (m *ConflictFile) GetContent() []byte {
- if x, ok := m.GetConflictFilePayload().(*ConflictFile_Content); ok {
+func (x *ConflictFile) GetContent() []byte {
+ if x, ok := x.GetConflictFilePayload().(*ConflictFile_Content); ok {
return x.Content
}
return nil
}
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*ConflictFile) XXX_OneofWrappers() []interface{} {
- return []interface{}{
- (*ConflictFile_Header)(nil),
- (*ConflictFile_Content)(nil),
- }
+type isConflictFile_ConflictFilePayload interface {
+ isConflictFile_ConflictFilePayload()
}
-type ListConflictFilesResponse struct {
- Files []*ConflictFile `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+type ConflictFile_Header struct {
+ Header *ConflictFileHeader `protobuf:"bytes,1,opt,name=header,proto3,oneof"`
}
-func (m *ListConflictFilesResponse) Reset() { *m = ListConflictFilesResponse{} }
-func (m *ListConflictFilesResponse) String() string { return proto.CompactTextString(m) }
-func (*ListConflictFilesResponse) ProtoMessage() {}
-func (*ListConflictFilesResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_28fc8937e7d75862, []int{3}
+type ConflictFile_Content struct {
+ Content []byte `protobuf:"bytes,2,opt,name=content,proto3,oneof"`
}
-func (m *ListConflictFilesResponse) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_ListConflictFilesResponse.Unmarshal(m, b)
-}
-func (m *ListConflictFilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_ListConflictFilesResponse.Marshal(b, m, deterministic)
+func (*ConflictFile_Header) isConflictFile_ConflictFilePayload() {}
+
+func (*ConflictFile_Content) isConflictFile_ConflictFilePayload() {}
+
+type ListConflictFilesResponse struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Files []*ConflictFile `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty"`
}
-func (m *ListConflictFilesResponse) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ListConflictFilesResponse.Merge(m, src)
+
+func (x *ListConflictFilesResponse) Reset() {
+ *x = ListConflictFilesResponse{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_conflicts_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
-func (m *ListConflictFilesResponse) XXX_Size() int {
- return xxx_messageInfo_ListConflictFilesResponse.Size(m)
+
+func (x *ListConflictFilesResponse) String() string {
+ return protoimpl.X.MessageStringOf(x)
}
-func (m *ListConflictFilesResponse) XXX_DiscardUnknown() {
- xxx_messageInfo_ListConflictFilesResponse.DiscardUnknown(m)
+
+func (*ListConflictFilesResponse) ProtoMessage() {}
+
+func (x *ListConflictFilesResponse) ProtoReflect() protoreflect.Message {
+ mi := &file_conflicts_proto_msgTypes[3]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
}
-var xxx_messageInfo_ListConflictFilesResponse proto.InternalMessageInfo
+// Deprecated: Use ListConflictFilesResponse.ProtoReflect.Descriptor instead.
+func (*ListConflictFilesResponse) Descriptor() ([]byte, []int) {
+ return file_conflicts_proto_rawDescGZIP(), []int{3}
+}
-func (m *ListConflictFilesResponse) GetFiles() []*ConflictFile {
- if m != nil {
- return m.Files
+func (x *ListConflictFilesResponse) GetFiles() []*ConflictFile {
+ if x != nil {
+ return x.Files
}
return nil
}
@@ -273,6 +302,10 @@ func (m *ListConflictFilesResponse) GetFiles() []*ConflictFile {
// ResolveConflictsRequestHeader is the first message that must be sent for
// each ResolveConflicts call.
type ResolveConflictsRequestHeader struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
// Repository is the repository in which conflicts shall be resolved and
// where SourceBranch shall be updated with the resolved conflict.
Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
@@ -296,155 +329,150 @@ type ResolveConflictsRequestHeader struct {
User *User `protobuf:"bytes,8,opt,name=user,proto3" json:"user,omitempty"`
// timestamp is the optional timestamp to use for the commit as committer
// date. If it's not set, the current time will be used.
- Timestamp *timestamp.Timestamp `protobuf:"bytes,9,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ Timestamp *timestamp.Timestamp `protobuf:"bytes,9,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
}
-func (m *ResolveConflictsRequestHeader) Reset() { *m = ResolveConflictsRequestHeader{} }
-func (m *ResolveConflictsRequestHeader) String() string { return proto.CompactTextString(m) }
-func (*ResolveConflictsRequestHeader) ProtoMessage() {}
-func (*ResolveConflictsRequestHeader) Descriptor() ([]byte, []int) {
- return fileDescriptor_28fc8937e7d75862, []int{4}
+func (x *ResolveConflictsRequestHeader) Reset() {
+ *x = ResolveConflictsRequestHeader{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_conflicts_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
-func (m *ResolveConflictsRequestHeader) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_ResolveConflictsRequestHeader.Unmarshal(m, b)
-}
-func (m *ResolveConflictsRequestHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_ResolveConflictsRequestHeader.Marshal(b, m, deterministic)
-}
-func (m *ResolveConflictsRequestHeader) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ResolveConflictsRequestHeader.Merge(m, src)
-}
-func (m *ResolveConflictsRequestHeader) XXX_Size() int {
- return xxx_messageInfo_ResolveConflictsRequestHeader.Size(m)
+func (x *ResolveConflictsRequestHeader) String() string {
+ return protoimpl.X.MessageStringOf(x)
}
-func (m *ResolveConflictsRequestHeader) XXX_DiscardUnknown() {
- xxx_messageInfo_ResolveConflictsRequestHeader.DiscardUnknown(m)
+
+func (*ResolveConflictsRequestHeader) ProtoMessage() {}
+
+func (x *ResolveConflictsRequestHeader) ProtoReflect() protoreflect.Message {
+ mi := &file_conflicts_proto_msgTypes[4]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
}
-var xxx_messageInfo_ResolveConflictsRequestHeader proto.InternalMessageInfo
+// Deprecated: Use ResolveConflictsRequestHeader.ProtoReflect.Descriptor instead.
+func (*ResolveConflictsRequestHeader) Descriptor() ([]byte, []int) {
+ return file_conflicts_proto_rawDescGZIP(), []int{4}
+}
-func (m *ResolveConflictsRequestHeader) GetRepository() *Repository {
- if m != nil {
- return m.Repository
+func (x *ResolveConflictsRequestHeader) GetRepository() *Repository {
+ if x != nil {
+ return x.Repository
}
return nil
}
-func (m *ResolveConflictsRequestHeader) GetOurCommitOid() string {
- if m != nil {
- return m.OurCommitOid
+func (x *ResolveConflictsRequestHeader) GetOurCommitOid() string {
+ if x != nil {
+ return x.OurCommitOid
}
return ""
}
-func (m *ResolveConflictsRequestHeader) GetTargetRepository() *Repository {
- if m != nil {
- return m.TargetRepository
+func (x *ResolveConflictsRequestHeader) GetTargetRepository() *Repository {
+ if x != nil {
+ return x.TargetRepository
}
return nil
}
-func (m *ResolveConflictsRequestHeader) GetTheirCommitOid() string {
- if m != nil {
- return m.TheirCommitOid
+func (x *ResolveConflictsRequestHeader) GetTheirCommitOid() string {
+ if x != nil {
+ return x.TheirCommitOid
}
return ""
}
-func (m *ResolveConflictsRequestHeader) GetSourceBranch() []byte {
- if m != nil {
- return m.SourceBranch
+func (x *ResolveConflictsRequestHeader) GetSourceBranch() []byte {
+ if x != nil {
+ return x.SourceBranch
}
return nil
}
-func (m *ResolveConflictsRequestHeader) GetTargetBranch() []byte {
- if m != nil {
- return m.TargetBranch
+func (x *ResolveConflictsRequestHeader) GetTargetBranch() []byte {
+ if x != nil {
+ return x.TargetBranch
}
return nil
}
-func (m *ResolveConflictsRequestHeader) GetCommitMessage() []byte {
- if m != nil {
- return m.CommitMessage
+func (x *ResolveConflictsRequestHeader) GetCommitMessage() []byte {
+ if x != nil {
+ return x.CommitMessage
}
return nil
}
-func (m *ResolveConflictsRequestHeader) GetUser() *User {
- if m != nil {
- return m.User
+func (x *ResolveConflictsRequestHeader) GetUser() *User {
+ if x != nil {
+ return x.User
}
return nil
}
-func (m *ResolveConflictsRequestHeader) GetTimestamp() *timestamp.Timestamp {
- if m != nil {
- return m.Timestamp
+func (x *ResolveConflictsRequestHeader) GetTimestamp() *timestamp.Timestamp {
+ if x != nil {
+ return x.Timestamp
}
return nil
}
// ResolveConflictsRequest is a request for the ResolveConflicts RPC.
type ResolveConflictsRequest struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
// RequestPayload is the payload part of the request. The first message sent
// must always be a ResolveConflictsRequestHeader, whereas all remaining
// requests must be FilesJson requests.
//
- // Types that are valid to be assigned to ResolveConflictsRequestPayload:
+ // Types that are assignable to ResolveConflictsRequestPayload:
// *ResolveConflictsRequest_Header
// *ResolveConflictsRequest_FilesJson
ResolveConflictsRequestPayload isResolveConflictsRequest_ResolveConflictsRequestPayload `protobuf_oneof:"resolve_conflicts_request_payload"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
}
-func (m *ResolveConflictsRequest) Reset() { *m = ResolveConflictsRequest{} }
-func (m *ResolveConflictsRequest) String() string { return proto.CompactTextString(m) }
-func (*ResolveConflictsRequest) ProtoMessage() {}
-func (*ResolveConflictsRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_28fc8937e7d75862, []int{5}
-}
-
-func (m *ResolveConflictsRequest) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_ResolveConflictsRequest.Unmarshal(m, b)
-}
-func (m *ResolveConflictsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_ResolveConflictsRequest.Marshal(b, m, deterministic)
-}
-func (m *ResolveConflictsRequest) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ResolveConflictsRequest.Merge(m, src)
-}
-func (m *ResolveConflictsRequest) XXX_Size() int {
- return xxx_messageInfo_ResolveConflictsRequest.Size(m)
-}
-func (m *ResolveConflictsRequest) XXX_DiscardUnknown() {
- xxx_messageInfo_ResolveConflictsRequest.DiscardUnknown(m)
+func (x *ResolveConflictsRequest) Reset() {
+ *x = ResolveConflictsRequest{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_conflicts_proto_msgTypes[5]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
-var xxx_messageInfo_ResolveConflictsRequest proto.InternalMessageInfo
-
-type isResolveConflictsRequest_ResolveConflictsRequestPayload interface {
- isResolveConflictsRequest_ResolveConflictsRequestPayload()
+func (x *ResolveConflictsRequest) String() string {
+ return protoimpl.X.MessageStringOf(x)
}
-type ResolveConflictsRequest_Header struct {
- Header *ResolveConflictsRequestHeader `protobuf:"bytes,1,opt,name=header,proto3,oneof"`
-}
+func (*ResolveConflictsRequest) ProtoMessage() {}
-type ResolveConflictsRequest_FilesJson struct {
- FilesJson []byte `protobuf:"bytes,2,opt,name=files_json,json=filesJson,proto3,oneof"`
+func (x *ResolveConflictsRequest) ProtoReflect() protoreflect.Message {
+ mi := &file_conflicts_proto_msgTypes[5]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
}
-func (*ResolveConflictsRequest_Header) isResolveConflictsRequest_ResolveConflictsRequestPayload() {}
-
-func (*ResolveConflictsRequest_FilesJson) isResolveConflictsRequest_ResolveConflictsRequestPayload() {
+// Deprecated: Use ResolveConflictsRequest.ProtoReflect.Descriptor instead.
+func (*ResolveConflictsRequest) Descriptor() ([]byte, []int) {
+ return file_conflicts_proto_rawDescGZIP(), []int{5}
}
func (m *ResolveConflictsRequest) GetResolveConflictsRequestPayload() isResolveConflictsRequest_ResolveConflictsRequestPayload {
@@ -454,26 +482,37 @@ func (m *ResolveConflictsRequest) GetResolveConflictsRequestPayload() isResolveC
return nil
}
-func (m *ResolveConflictsRequest) GetHeader() *ResolveConflictsRequestHeader {
- if x, ok := m.GetResolveConflictsRequestPayload().(*ResolveConflictsRequest_Header); ok {
+func (x *ResolveConflictsRequest) GetHeader() *ResolveConflictsRequestHeader {
+ if x, ok := x.GetResolveConflictsRequestPayload().(*ResolveConflictsRequest_Header); ok {
return x.Header
}
return nil
}
-func (m *ResolveConflictsRequest) GetFilesJson() []byte {
- if x, ok := m.GetResolveConflictsRequestPayload().(*ResolveConflictsRequest_FilesJson); ok {
+func (x *ResolveConflictsRequest) GetFilesJson() []byte {
+ if x, ok := x.GetResolveConflictsRequestPayload().(*ResolveConflictsRequest_FilesJson); ok {
return x.FilesJson
}
return nil
}
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*ResolveConflictsRequest) XXX_OneofWrappers() []interface{} {
- return []interface{}{
- (*ResolveConflictsRequest_Header)(nil),
- (*ResolveConflictsRequest_FilesJson)(nil),
- }
+type isResolveConflictsRequest_ResolveConflictsRequestPayload interface {
+ isResolveConflictsRequest_ResolveConflictsRequestPayload()
+}
+
+type ResolveConflictsRequest_Header struct {
+ // Header is the initial message specifying parameters of the RPC call.
+ Header *ResolveConflictsRequestHeader `protobuf:"bytes,1,opt,name=header,proto3,oneof"`
+}
+
+type ResolveConflictsRequest_FilesJson struct {
+ // FilesJson is a JSON-encoded list of conflicts resolutions.
+ FilesJson []byte `protobuf:"bytes,2,opt,name=files_json,json=filesJson,proto3,oneof"`
+}
+
+func (*ResolveConflictsRequest_Header) isResolveConflictsRequest_ResolveConflictsRequestPayload() {}
+
+func (*ResolveConflictsRequest_FilesJson) isResolveConflictsRequest_ResolveConflictsRequestPayload() {
}
// ResolveConflictsResponse is a response of the ResolveConflicts RPC. Conflict
@@ -481,113 +520,331 @@ func (*ResolveConflictsRequest) XXX_OneofWrappers() []interface{} {
// check ResolutionError to verify whether the merge commit was correctly
// computed or not.
type ResolveConflictsResponse struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
// ResolutionError contains a description of why conflict resolution has
// failed.
- ResolutionError string `protobuf:"bytes,1,opt,name=resolution_error,json=resolutionError,proto3" json:"resolution_error,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ ResolutionError string `protobuf:"bytes,1,opt,name=resolution_error,json=resolutionError,proto3" json:"resolution_error,omitempty"`
}
-func (m *ResolveConflictsResponse) Reset() { *m = ResolveConflictsResponse{} }
-func (m *ResolveConflictsResponse) String() string { return proto.CompactTextString(m) }
-func (*ResolveConflictsResponse) ProtoMessage() {}
-func (*ResolveConflictsResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_28fc8937e7d75862, []int{6}
+func (x *ResolveConflictsResponse) Reset() {
+ *x = ResolveConflictsResponse{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_conflicts_proto_msgTypes[6]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
-func (m *ResolveConflictsResponse) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_ResolveConflictsResponse.Unmarshal(m, b)
-}
-func (m *ResolveConflictsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_ResolveConflictsResponse.Marshal(b, m, deterministic)
-}
-func (m *ResolveConflictsResponse) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ResolveConflictsResponse.Merge(m, src)
-}
-func (m *ResolveConflictsResponse) XXX_Size() int {
- return xxx_messageInfo_ResolveConflictsResponse.Size(m)
+func (x *ResolveConflictsResponse) String() string {
+ return protoimpl.X.MessageStringOf(x)
}
-func (m *ResolveConflictsResponse) XXX_DiscardUnknown() {
- xxx_messageInfo_ResolveConflictsResponse.DiscardUnknown(m)
+
+func (*ResolveConflictsResponse) ProtoMessage() {}
+
+func (x *ResolveConflictsResponse) ProtoReflect() protoreflect.Message {
+ mi := &file_conflicts_proto_msgTypes[6]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
}
-var xxx_messageInfo_ResolveConflictsResponse proto.InternalMessageInfo
+// Deprecated: Use ResolveConflictsResponse.ProtoReflect.Descriptor instead.
+func (*ResolveConflictsResponse) Descriptor() ([]byte, []int) {
+ return file_conflicts_proto_rawDescGZIP(), []int{6}
+}
-func (m *ResolveConflictsResponse) GetResolutionError() string {
- if m != nil {
- return m.ResolutionError
+func (x *ResolveConflictsResponse) GetResolutionError() string {
+ if x != nil {
+ return x.ResolutionError
}
return ""
}
-func init() {
- proto.RegisterType((*ListConflictFilesRequest)(nil), "gitaly.ListConflictFilesRequest")
- proto.RegisterType((*ConflictFileHeader)(nil), "gitaly.ConflictFileHeader")
- proto.RegisterType((*ConflictFile)(nil), "gitaly.ConflictFile")
- proto.RegisterType((*ListConflictFilesResponse)(nil), "gitaly.ListConflictFilesResponse")
- proto.RegisterType((*ResolveConflictsRequestHeader)(nil), "gitaly.ResolveConflictsRequestHeader")
- proto.RegisterType((*ResolveConflictsRequest)(nil), "gitaly.ResolveConflictsRequest")
- proto.RegisterType((*ResolveConflictsResponse)(nil), "gitaly.ResolveConflictsResponse")
-}
-
-func init() { proto.RegisterFile("conflicts.proto", fileDescriptor_28fc8937e7d75862) }
-
-var fileDescriptor_28fc8937e7d75862 = []byte{
- // 690 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xc1, 0x4e, 0xdb, 0x4a,
- 0x14, 0x86, 0x99, 0x24, 0x84, 0xe4, 0x60, 0x20, 0x8c, 0xee, 0x15, 0x26, 0x12, 0x22, 0x84, 0x8b,
- 0x94, 0x5b, 0xb5, 0x09, 0xa2, 0x5d, 0xb0, 0x43, 0x0a, 0xa2, 0x45, 0xa8, 0xa8, 0xd5, 0xb4, 0xdd,
- 0x74, 0x63, 0x39, 0xf6, 0xe0, 0x4c, 0x65, 0x7b, 0xdc, 0x99, 0x31, 0x52, 0x9e, 0xa4, 0x5d, 0x76,
- 0xd1, 0x37, 0xe8, 0xa2, 0x6f, 0xd0, 0x57, 0xe8, 0xbb, 0x74, 0x55, 0x79, 0xc6, 0x76, 0x02, 0x49,
- 0xe8, 0xaa, 0x3b, 0xfb, 0x3f, 0xdf, 0x9c, 0x73, 0x66, 0xce, 0x3f, 0x03, 0x5b, 0x1e, 0x8f, 0x6f,
- 0x42, 0xe6, 0x29, 0xd9, 0x4f, 0x04, 0x57, 0x1c, 0xd7, 0x03, 0xa6, 0xdc, 0x70, 0xd2, 0x86, 0x90,
- 0xc5, 0xca, 0x68, 0x6d, 0x4b, 0x8e, 0x5d, 0x41, 0xfd, 0xfc, 0x6f, 0x3f, 0xe0, 0x3c, 0x08, 0xe9,
- 0x40, 0xff, 0x8d, 0xd2, 0x9b, 0x81, 0x62, 0x11, 0x95, 0xca, 0x8d, 0x12, 0x03, 0x74, 0xbf, 0x22,
- 0xb0, 0x5f, 0x32, 0xa9, 0xce, 0xf3, 0xd4, 0xcf, 0x59, 0x48, 0x25, 0xa1, 0x1f, 0x53, 0x2a, 0x15,
- 0x3e, 0x05, 0x10, 0x34, 0xe1, 0x92, 0x29, 0x2e, 0x26, 0x36, 0xea, 0xa0, 0xde, 0xfa, 0x09, 0xee,
- 0x9b, 0xa2, 0x7d, 0x52, 0x46, 0x86, 0xb5, 0xcf, 0x3f, 0x1e, 0x23, 0x32, 0xc3, 0xe2, 0xff, 0x60,
- 0x93, 0xa7, 0xc2, 0xf1, 0x78, 0x14, 0x31, 0xe5, 0x70, 0xe6, 0xdb, 0x95, 0x0e, 0xea, 0x35, 0x89,
- 0xc5, 0x53, 0x71, 0xae, 0xc5, 0x57, 0xcc, 0xc7, 0x3d, 0x68, 0xa9, 0x31, 0x65, 0x77, 0xb8, 0xaa,
- 0xe6, 0x36, 0xb5, 0x5e, 0x92, 0xdd, 0x6f, 0x08, 0xf0, 0x6c, 0x8b, 0x97, 0xd4, 0xf5, 0xa9, 0xc0,
- 0x7b, 0x00, 0x73, 0x25, 0x9a, 0x5e, 0x99, 0x7f, 0x0f, 0xc0, 0xe4, 0x4f, 0x5c, 0x35, 0xd6, 0x99,
- 0x2d, 0xd2, 0xd4, 0xca, 0x6b, 0x57, 0x8d, 0xf1, 0x2e, 0x34, 0xb2, 0x26, 0x75, 0xb0, 0xa6, 0x83,
- 0x6b, 0x3c, 0xbd, 0x13, 0x8a, 0xb8, 0x4f, 0xed, 0xd5, 0x0e, 0xea, 0xad, 0xea, 0xd0, 0x35, 0xf7,
- 0x29, 0x3e, 0x84, 0x0d, 0x37, 0xf6, 0xa8, 0x54, 0x3c, 0x5f, 0x5a, 0xd7, 0x4b, 0xad, 0x42, 0xcc,
- 0xd6, 0x5f, 0xd5, 0x1a, 0xa8, 0x55, 0xe9, 0x4e, 0xc0, 0x9a, 0x6d, 0x1a, 0x3f, 0x83, 0xfa, 0x58,
- 0x37, 0x9e, 0x9f, 0x65, 0xbb, 0x38, 0xcb, 0xf9, 0xad, 0x5d, 0xae, 0x90, 0x9c, 0xc5, 0x6d, 0x58,
- 0xf3, 0x78, 0xac, 0x68, 0xac, 0xf4, 0x0e, 0xad, 0xcb, 0x15, 0x52, 0x08, 0xc3, 0x1d, 0xf8, 0xb7,
- 0x30, 0x85, 0x73, 0xc3, 0x42, 0xea, 0x24, 0xee, 0x24, 0xe4, 0xae, 0xdf, 0x7d, 0x01, 0xbb, 0x0b,
- 0xc6, 0x2a, 0x13, 0x1e, 0x4b, 0x8a, 0x1f, 0xc1, 0x6a, 0x06, 0x4b, 0x1b, 0x75, 0xaa, 0xbd, 0xf5,
- 0x93, 0x7f, 0x16, 0xb5, 0x41, 0x0c, 0xd2, 0xfd, 0x5e, 0x85, 0x3d, 0x42, 0x25, 0x0f, 0x6f, 0x69,
- 0x11, 0x2e, 0xfc, 0x91, 0x0f, 0xe1, 0x6f, 0xbb, 0xe4, 0x0c, 0xb6, 0x95, 0x2b, 0x02, 0xaa, 0x9c,
- 0x99, 0x32, 0xd5, 0x65, 0x65, 0x48, 0xcb, 0xc0, 0x53, 0x65, 0xa1, 0xcd, 0x6a, 0x8b, 0x6c, 0x96,
- 0xcd, 0x56, 0xf2, 0x54, 0x78, 0xd4, 0x19, 0x09, 0x37, 0xf6, 0xc6, 0x7a, 0xf6, 0x16, 0xb1, 0x8c,
- 0x38, 0xd4, 0x5a, 0x06, 0xe5, 0xfd, 0xe4, 0x50, 0x6e, 0x00, 0x23, 0xe6, 0xd0, 0x11, 0x6c, 0xe6,
- 0xd5, 0x22, 0x2a, 0xa5, 0x1b, 0x50, 0x7b, 0x4d, 0x53, 0x1b, 0x46, 0xbd, 0x36, 0x22, 0xee, 0x40,
- 0x2d, 0x95, 0x54, 0xd8, 0x0d, 0xbd, 0x1d, 0xab, 0xd8, 0xce, 0x3b, 0x49, 0x05, 0xd1, 0x11, 0x7c,
- 0x0a, 0xcd, 0xf2, 0xce, 0xda, 0xcd, 0xc2, 0x36, 0xfa, 0x56, 0xf7, 0x8b, 0x5b, 0xdd, 0x7f, 0x5b,
- 0x10, 0x64, 0x0a, 0x77, 0xbf, 0x20, 0xd8, 0x59, 0x32, 0x39, 0x7c, 0x76, 0xcf, 0x89, 0x47, 0xd3,
- 0x83, 0x7c, 0x60, 0xd4, 0x33, 0xa6, 0xdc, 0x07, 0xd0, 0xfe, 0x70, 0x3e, 0x48, 0x1e, 0x97, 0xbe,
- 0x6c, 0x6a, 0xed, 0x4a, 0xf2, 0x78, 0x78, 0x08, 0x07, 0xc2, 0xe4, 0x72, 0xca, 0x67, 0xcb, 0x11,
- 0x26, 0x5b, 0xe9, 0xd2, 0x0b, 0xb0, 0xe7, 0x0b, 0xe6, 0x26, 0xfd, 0x1f, 0x5a, 0x3a, 0x41, 0xaa,
- 0x18, 0x8f, 0x1d, 0x2a, 0x04, 0x37, 0xcd, 0x36, 0xc9, 0xd6, 0x54, 0xbf, 0xc8, 0xe4, 0x93, 0x9f,
- 0x08, 0x5a, 0x65, 0x82, 0x37, 0x54, 0xdc, 0x32, 0x8f, 0xe2, 0x11, 0x6c, 0xcf, 0xdd, 0x00, 0xdc,
- 0x29, 0xf6, 0xb9, 0xec, 0xcd, 0x6b, 0x1f, 0x3c, 0x40, 0x98, 0xce, 0xba, 0xf5, 0x5f, 0x9f, 0x7a,
- 0x95, 0x46, 0xe5, 0x18, 0x61, 0x07, 0x5a, 0xf7, 0xfb, 0xc7, 0xfb, 0x7f, 0x38, 0xca, 0x76, 0x67,
- 0x39, 0x70, 0xa7, 0x00, 0xea, 0xa1, 0xe1, 0xf1, 0xfb, 0x0c, 0x0e, 0xdd, 0x51, 0xdf, 0xe3, 0xd1,
- 0xc0, 0x7c, 0x3e, 0xe1, 0x22, 0x18, 0x98, 0x14, 0xe6, 0x5d, 0x1f, 0x04, 0x3c, 0xff, 0x4f, 0x46,
- 0xa3, 0xba, 0x96, 0x9e, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xf2, 0xc4, 0x6e, 0x87, 0x2d, 0x06,
- 0x00, 0x00,
+var File_conflicts_proto protoreflect.FileDescriptor
+
+var file_conflicts_proto_rawDesc = []byte{
+ 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x12, 0x06, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x1a, 0x0a, 0x6c, 0x69, 0x6e, 0x74, 0x2e,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa4, 0x01, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
+ 0x66, 0x6c, 0x69, 0x63, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+ 0x74, 0x12, 0x38, 0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52,
+ 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x42, 0x04, 0x98, 0xc6, 0x2c, 0x01, 0x52,
+ 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x24, 0x0a, 0x0e, 0x6f,
+ 0x75, 0x72, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f, 0x75, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x4f, 0x69,
+ 0x64, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x68, 0x65, 0x69, 0x72, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69,
+ 0x74, 0x5f, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x68, 0x65,
+ 0x69, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x4f, 0x69, 0x64, 0x22, 0xb3, 0x01, 0x0a, 0x12,
+ 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x48, 0x65, 0x61, 0x64,
+ 0x65, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x6f, 0x69, 0x64,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x4f, 0x69,
+ 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x68, 0x65, 0x69, 0x72, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x74, 0x68, 0x65, 0x69, 0x72, 0x50, 0x61, 0x74, 0x68,
+ 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x75, 0x72, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x0c, 0x52, 0x07, 0x6f, 0x75, 0x72, 0x50, 0x61, 0x74, 0x68, 0x12, 0x19, 0x0a, 0x08, 0x6f,
+ 0x75, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6f,
+ 0x75, 0x72, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x74,
+ 0x6f, 0x72, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x61,
+ 0x6e, 0x63, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x50, 0x61, 0x74, 0x68, 0x4a, 0x04, 0x08, 0x01, 0x10,
+ 0x02, 0x22, 0x79, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x46, 0x69, 0x6c,
+ 0x65, 0x12, 0x34, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x6c,
+ 0x69, 0x63, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52,
+ 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65,
+ 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74,
+ 0x65, 0x6e, 0x74, 0x42, 0x17, 0x0a, 0x15, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x5f,
+ 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x47, 0x0a, 0x19,
+ 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x46, 0x69, 0x6c, 0x65,
+ 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x05, 0x66, 0x69, 0x6c,
+ 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c,
+ 0x79, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x05,
+ 0x66, 0x69, 0x6c, 0x65, 0x73, 0x22, 0xb7, 0x03, 0x0a, 0x1d, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76,
+ 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+ 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x38, 0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73,
+ 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69,
+ 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x42,
+ 0x04, 0x98, 0xc6, 0x2c, 0x01, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72,
+ 0x79, 0x12, 0x24, 0x0a, 0x0e, 0x6f, 0x75, 0x72, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f,
+ 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f, 0x75, 0x72, 0x43, 0x6f,
+ 0x6d, 0x6d, 0x69, 0x74, 0x4f, 0x69, 0x64, 0x12, 0x3f, 0x0a, 0x11, 0x74, 0x61, 0x72, 0x67, 0x65,
+ 0x74, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x70, 0x6f,
+ 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x10, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x65,
+ 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x68, 0x65, 0x69,
+ 0x72, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x0e, 0x74, 0x68, 0x65, 0x69, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x4f,
+ 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x62, 0x72, 0x61,
+ 0x6e, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73, 0x6f, 0x75, 0x72, 0x63,
+ 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x12, 0x23, 0x0a, 0x0d, 0x74, 0x61, 0x72, 0x67, 0x65,
+ 0x74, 0x5f, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c,
+ 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0e,
+ 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x07,
+ 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x4d, 0x65, 0x73, 0x73,
+ 0x61, 0x67, 0x65, 0x12, 0x20, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x0c, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52,
+ 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
+ 0x6d, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+ 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73,
+ 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22,
+ 0xa0, 0x01, 0x0a, 0x17, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x6c,
+ 0x69, 0x63, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x06, 0x68,
+ 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x69,
+ 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x43, 0x6f, 0x6e, 0x66,
+ 0x6c, 0x69, 0x63, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64,
+ 0x65, 0x72, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x0a,
+ 0x66, 0x69, 0x6c, 0x65, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c,
+ 0x48, 0x00, 0x52, 0x09, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x42, 0x23, 0x0a,
+ 0x21, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63,
+ 0x74, 0x73, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f,
+ 0x61, 0x64, 0x22, 0x45, 0x0a, 0x18, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x43, 0x6f, 0x6e,
+ 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x29,
+ 0x0a, 0x10, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x65, 0x72, 0x72,
+ 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x75,
+ 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x32, 0xd7, 0x01, 0x0a, 0x10, 0x43, 0x6f,
+ 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x62,
+ 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x46, 0x69,
+ 0x6c, 0x65, 0x73, 0x12, 0x20, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x4c, 0x69, 0x73,
+ 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65,
+ 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x4c,
+ 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73,
+ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02,
+ 0x30, 0x01, 0x12, 0x5f, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x43, 0x6f, 0x6e,
+ 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x12, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e,
+ 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73,
+ 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79,
+ 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74,
+ 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08,
+ 0x01, 0x28, 0x01, 0x42, 0x30, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f,
+ 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74,
+ 0x61, 0x6c, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74,
+ 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+ file_conflicts_proto_rawDescOnce sync.Once
+ file_conflicts_proto_rawDescData = file_conflicts_proto_rawDesc
+)
+
+func file_conflicts_proto_rawDescGZIP() []byte {
+ file_conflicts_proto_rawDescOnce.Do(func() {
+ file_conflicts_proto_rawDescData = protoimpl.X.CompressGZIP(file_conflicts_proto_rawDescData)
+ })
+ return file_conflicts_proto_rawDescData
+}
+
+var file_conflicts_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_conflicts_proto_goTypes = []interface{}{
+ (*ListConflictFilesRequest)(nil), // 0: gitaly.ListConflictFilesRequest
+ (*ConflictFileHeader)(nil), // 1: gitaly.ConflictFileHeader
+ (*ConflictFile)(nil), // 2: gitaly.ConflictFile
+ (*ListConflictFilesResponse)(nil), // 3: gitaly.ListConflictFilesResponse
+ (*ResolveConflictsRequestHeader)(nil), // 4: gitaly.ResolveConflictsRequestHeader
+ (*ResolveConflictsRequest)(nil), // 5: gitaly.ResolveConflictsRequest
+ (*ResolveConflictsResponse)(nil), // 6: gitaly.ResolveConflictsResponse
+ (*Repository)(nil), // 7: gitaly.Repository
+ (*User)(nil), // 8: gitaly.User
+ (*timestamp.Timestamp)(nil), // 9: google.protobuf.Timestamp
+}
+var file_conflicts_proto_depIdxs = []int32{
+ 7, // 0: gitaly.ListConflictFilesRequest.repository:type_name -> gitaly.Repository
+ 1, // 1: gitaly.ConflictFile.header:type_name -> gitaly.ConflictFileHeader
+ 2, // 2: gitaly.ListConflictFilesResponse.files:type_name -> gitaly.ConflictFile
+ 7, // 3: gitaly.ResolveConflictsRequestHeader.repository:type_name -> gitaly.Repository
+ 7, // 4: gitaly.ResolveConflictsRequestHeader.target_repository:type_name -> gitaly.Repository
+ 8, // 5: gitaly.ResolveConflictsRequestHeader.user:type_name -> gitaly.User
+ 9, // 6: gitaly.ResolveConflictsRequestHeader.timestamp:type_name -> google.protobuf.Timestamp
+ 4, // 7: gitaly.ResolveConflictsRequest.header:type_name -> gitaly.ResolveConflictsRequestHeader
+ 0, // 8: gitaly.ConflictsService.ListConflictFiles:input_type -> gitaly.ListConflictFilesRequest
+ 5, // 9: gitaly.ConflictsService.ResolveConflicts:input_type -> gitaly.ResolveConflictsRequest
+ 3, // 10: gitaly.ConflictsService.ListConflictFiles:output_type -> gitaly.ListConflictFilesResponse
+ 6, // 11: gitaly.ConflictsService.ResolveConflicts:output_type -> gitaly.ResolveConflictsResponse
+ 10, // [10:12] is the sub-list for method output_type
+ 8, // [8:10] is the sub-list for method input_type
+ 8, // [8:8] is the sub-list for extension type_name
+ 8, // [8:8] is the sub-list for extension extendee
+ 0, // [0:8] is the sub-list for field type_name
+}
+
+func init() { file_conflicts_proto_init() }
+func file_conflicts_proto_init() {
+ if File_conflicts_proto != nil {
+ return
+ }
+ file_lint_proto_init()
+ file_shared_proto_init()
+ if !protoimpl.UnsafeEnabled {
+ file_conflicts_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ListConflictFilesRequest); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_conflicts_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ConflictFileHeader); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_conflicts_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ConflictFile); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_conflicts_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ListConflictFilesResponse); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_conflicts_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ResolveConflictsRequestHeader); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_conflicts_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ResolveConflictsRequest); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_conflicts_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ResolveConflictsResponse); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
+ file_conflicts_proto_msgTypes[2].OneofWrappers = []interface{}{
+ (*ConflictFile_Header)(nil),
+ (*ConflictFile_Content)(nil),
+ }
+ file_conflicts_proto_msgTypes[5].OneofWrappers = []interface{}{
+ (*ResolveConflictsRequest_Header)(nil),
+ (*ResolveConflictsRequest_FilesJson)(nil),
+ }
+ type x struct{}
+ out := protoimpl.TypeBuilder{
+ File: protoimpl.DescBuilder{
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+ RawDescriptor: file_conflicts_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 7,
+ NumExtensions: 0,
+ NumServices: 1,
+ },
+ GoTypes: file_conflicts_proto_goTypes,
+ DependencyIndexes: file_conflicts_proto_depIdxs,
+ MessageInfos: file_conflicts_proto_msgTypes,
+ }.Build()
+ File_conflicts_proto = out.File
+ file_conflicts_proto_rawDesc = nil
+ file_conflicts_proto_goTypes = nil
+ file_conflicts_proto_depIdxs = nil
}
// Reference imports to suppress errors if they are not otherwise used.
var _ context.Context
-var _ grpc.ClientConn
+var _ grpc.ClientConnInterface
// 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
+const _ = grpc.SupportPackageIsVersion6
// ConflictsServiceClient is the client API for ConflictsService service.
//
@@ -601,10 +858,10 @@ type ConflictsServiceClient interface {
}
type conflictsServiceClient struct {
- cc *grpc.ClientConn
+ cc grpc.ClientConnInterface
}
-func NewConflictsServiceClient(cc *grpc.ClientConn) ConflictsServiceClient {
+func NewConflictsServiceClient(cc grpc.ClientConnInterface) ConflictsServiceClient {
return &conflictsServiceClient{cc}
}
@@ -687,10 +944,10 @@ type ConflictsServiceServer interface {
type UnimplementedConflictsServiceServer struct {
}
-func (*UnimplementedConflictsServiceServer) ListConflictFiles(req *ListConflictFilesRequest, srv ConflictsService_ListConflictFilesServer) error {
+func (*UnimplementedConflictsServiceServer) ListConflictFiles(*ListConflictFilesRequest, ConflictsService_ListConflictFilesServer) error {
return status.Errorf(codes.Unimplemented, "method ListConflictFiles not implemented")
}
-func (*UnimplementedConflictsServiceServer) ResolveConflicts(srv ConflictsService_ResolveConflictsServer) error {
+func (*UnimplementedConflictsServiceServer) ResolveConflicts(ConflictsService_ResolveConflictsServer) error {
return status.Errorf(codes.Unimplemented, "method ResolveConflicts not implemented")
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 18:13:39 +0300