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

conflicts.pb.go « gitalypb « go « proto - gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
blob: e93c9e9c1393b7649e7a01e1d5dd8d4acd85c6e5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
// Code generated by protoc-gen-go. DO NOT EDIT.
// 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"
)

// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf

// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package

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:"-"`
}

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}
}

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 (m *ListConflictFilesRequest) XXX_Size() int {
	return xxx_messageInfo_ListConflictFilesRequest.Size(m)
}
func (m *ListConflictFilesRequest) XXX_DiscardUnknown() {
	xxx_messageInfo_ListConflictFilesRequest.DiscardUnknown(m)
}

var xxx_messageInfo_ListConflictFilesRequest proto.InternalMessageInfo

func (m *ListConflictFilesRequest) GetRepository() *Repository {
	if m != nil {
		return m.Repository
	}
	return nil
}

func (m *ListConflictFilesRequest) GetOurCommitOid() string {
	if m != nil {
		return m.OurCommitOid
	}
	return ""
}

func (m *ListConflictFilesRequest) GetTheirCommitOid() string {
	if m != nil {
		return m.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}
}

func (m *ConflictFileHeader) XXX_Unmarshal(b []byte) error {
	return xxx_messageInfo_ConflictFileHeader.Unmarshal(m, b)
}
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 (m *ConflictFileHeader) XXX_Size() int {
	return xxx_messageInfo_ConflictFileHeader.Size(m)
}
func (m *ConflictFileHeader) XXX_DiscardUnknown() {
	xxx_messageInfo_ConflictFileHeader.DiscardUnknown(m)
}

var xxx_messageInfo_ConflictFileHeader proto.InternalMessageInfo

func (m *ConflictFileHeader) GetCommitOid() string {
	if m != nil {
		return m.CommitOid
	}
	return ""
}

func (m *ConflictFileHeader) GetTheirPath() []byte {
	if m != nil {
		return m.TheirPath
	}
	return nil
}

func (m *ConflictFileHeader) GetOurPath() []byte {
	if m != nil {
		return m.OurPath
	}
	return nil
}

func (m *ConflictFileHeader) GetOurMode() int32 {
	if m != nil {
		return m.OurMode
	}
	return 0
}

func (m *ConflictFileHeader) GetAncestorPath() []byte {
	if m != nil {
		return m.AncestorPath
	}
	return nil
}

type ConflictFile struct {
	// Types that are valid to be assigned 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:"-"`
}

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 (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)
}

var xxx_messageInfo_ConflictFile proto.InternalMessageInfo

type isConflictFile_ConflictFilePayload interface {
	isConflictFile_ConflictFilePayload()
}

type ConflictFile_Header struct {
	Header *ConflictFileHeader `protobuf:"bytes,1,opt,name=header,proto3,oneof"`
}

type ConflictFile_Content struct {
	Content []byte `protobuf:"bytes,2,opt,name=content,proto3,oneof"`
}

func (*ConflictFile_Header) isConflictFile_ConflictFilePayload() {}

func (*ConflictFile_Content) isConflictFile_ConflictFilePayload() {}

func (m *ConflictFile) GetConflictFilePayload() isConflictFile_ConflictFilePayload {
	if m != nil {
		return m.ConflictFilePayload
	}
	return nil
}

func (m *ConflictFile) GetHeader() *ConflictFileHeader {
	if x, ok := m.GetConflictFilePayload().(*ConflictFile_Header); ok {
		return x.Header
	}
	return nil
}

func (m *ConflictFile) GetContent() []byte {
	if x, ok := m.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 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:"-"`
}

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}
}

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 (m *ListConflictFilesResponse) XXX_Merge(src proto.Message) {
	xxx_messageInfo_ListConflictFilesResponse.Merge(m, src)
}
func (m *ListConflictFilesResponse) XXX_Size() int {
	return xxx_messageInfo_ListConflictFilesResponse.Size(m)
}
func (m *ListConflictFilesResponse) XXX_DiscardUnknown() {
	xxx_messageInfo_ListConflictFilesResponse.DiscardUnknown(m)
}

var xxx_messageInfo_ListConflictFilesResponse proto.InternalMessageInfo

func (m *ListConflictFilesResponse) GetFiles() []*ConflictFile {
	if m != nil {
		return m.Files
	}
	return nil
}

// ResolveConflictsRequestHeader is the first message that must be sent for
// each ResolveConflicts call.
type ResolveConflictsRequestHeader struct {
	// 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"`
	// OurCommitOid is the OID of the commit representing the local commit.
	OurCommitOid string `protobuf:"bytes,2,opt,name=our_commit_oid,json=ourCommitOid,proto3" json:"our_commit_oid,omitempty"`
	// TargetRepository is the repository from which TheirCommitOid shall be
	// retrieved.
	TargetRepository *Repository `protobuf:"bytes,3,opt,name=target_repository,json=targetRepository,proto3" json:"target_repository,omitempty"`
	// TheirCommitOid is the OID of the commit representing the remote commit
	// which is to be merged into the local commit.
	TheirCommitOid string `protobuf:"bytes,4,opt,name=their_commit_oid,json=theirCommitOid,proto3" json:"their_commit_oid,omitempty"`
	// SourceBranch is the branch on which the new commit shall be created.
	SourceBranch []byte `protobuf:"bytes,5,opt,name=source_branch,json=sourceBranch,proto3" json:"source_branch,omitempty"`
	// TargetBranch identifies the branch which will be fetched from
	// TargetRepository in case TheirCommitOid does not exist in Repository.
	TargetBranch []byte `protobuf:"bytes,6,opt,name=target_branch,json=targetBranch,proto3" json:"target_branch,omitempty"`
	// CommitMessage is the message of the newly created merge commit.
	CommitMessage []byte `protobuf:"bytes,7,opt,name=commit_message,json=commitMessage,proto3" json:"commit_message,omitempty"`
	// User is the user used as author and committer of the newly created merge
	// commit.
	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:"-"`
}

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 (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 (m *ResolveConflictsRequestHeader) XXX_DiscardUnknown() {
	xxx_messageInfo_ResolveConflictsRequestHeader.DiscardUnknown(m)
}

var xxx_messageInfo_ResolveConflictsRequestHeader proto.InternalMessageInfo

func (m *ResolveConflictsRequestHeader) GetRepository() *Repository {
	if m != nil {
		return m.Repository
	}
	return nil
}

func (m *ResolveConflictsRequestHeader) GetOurCommitOid() string {
	if m != nil {
		return m.OurCommitOid
	}
	return ""
}

func (m *ResolveConflictsRequestHeader) GetTargetRepository() *Repository {
	if m != nil {
		return m.TargetRepository
	}
	return nil
}

func (m *ResolveConflictsRequestHeader) GetTheirCommitOid() string {
	if m != nil {
		return m.TheirCommitOid
	}
	return ""
}

func (m *ResolveConflictsRequestHeader) GetSourceBranch() []byte {
	if m != nil {
		return m.SourceBranch
	}
	return nil
}

func (m *ResolveConflictsRequestHeader) GetTargetBranch() []byte {
	if m != nil {
		return m.TargetBranch
	}
	return nil
}

func (m *ResolveConflictsRequestHeader) GetCommitMessage() []byte {
	if m != nil {
		return m.CommitMessage
	}
	return nil
}

func (m *ResolveConflictsRequestHeader) GetUser() *User {
	if m != nil {
		return m.User
	}
	return nil
}

func (m *ResolveConflictsRequestHeader) GetTimestamp() *timestamp.Timestamp {
	if m != nil {
		return m.Timestamp
	}
	return nil
}

// ResolveConflictsRequest is a request for the ResolveConflicts RPC.
type ResolveConflictsRequest struct {
	// 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:
	//	*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)
}

var xxx_messageInfo_ResolveConflictsRequest proto.InternalMessageInfo

type isResolveConflictsRequest_ResolveConflictsRequestPayload interface {
	isResolveConflictsRequest_ResolveConflictsRequestPayload()
}

type ResolveConflictsRequest_Header struct {
	Header *ResolveConflictsRequestHeader `protobuf:"bytes,1,opt,name=header,proto3,oneof"`
}

type ResolveConflictsRequest_FilesJson struct {
	FilesJson []byte `protobuf:"bytes,2,opt,name=files_json,json=filesJson,proto3,oneof"`
}

func (*ResolveConflictsRequest_Header) isResolveConflictsRequest_ResolveConflictsRequestPayload() {}

func (*ResolveConflictsRequest_FilesJson) isResolveConflictsRequest_ResolveConflictsRequestPayload() {
}

func (m *ResolveConflictsRequest) GetResolveConflictsRequestPayload() isResolveConflictsRequest_ResolveConflictsRequestPayload {
	if m != nil {
		return m.ResolveConflictsRequestPayload
	}
	return nil
}

func (m *ResolveConflictsRequest) GetHeader() *ResolveConflictsRequestHeader {
	if x, ok := m.GetResolveConflictsRequestPayload().(*ResolveConflictsRequest_Header); ok {
		return x.Header
	}
	return nil
}

func (m *ResolveConflictsRequest) GetFilesJson() []byte {
	if x, ok := m.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),
	}
}

// ResolveConflictsResponse is a response of the ResolveConflicts RPC. Conflict
// resolution may have failed even if the RPC has returned OK. The user must
// check ResolutionError to verify whether the merge commit was correctly
// computed or not.
type ResolveConflictsResponse struct {
	// 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:"-"`
}

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 (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 (m *ResolveConflictsResponse) XXX_DiscardUnknown() {
	xxx_messageInfo_ResolveConflictsResponse.DiscardUnknown(m)
}

var xxx_messageInfo_ResolveConflictsResponse proto.InternalMessageInfo

func (m *ResolveConflictsResponse) GetResolutionError() string {
	if m != nil {
		return m.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,
}

// Reference imports to suppress errors if they are not otherwise used.
var _ context.Context
var _ grpc.ClientConn

// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion4

// ConflictsServiceClient is the client API for ConflictsService service.
//
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
type ConflictsServiceClient interface {
	ListConflictFiles(ctx context.Context, in *ListConflictFilesRequest, opts ...grpc.CallOption) (ConflictsService_ListConflictFilesClient, error)
	// ResolveConflicts tries to resolve a conflicting merge with a set of
	// user-provided merge resolutions. If resolving the conflict succeeds, the
	// result will be a new merge commit.
	ResolveConflicts(ctx context.Context, opts ...grpc.CallOption) (ConflictsService_ResolveConflictsClient, error)
}

type conflictsServiceClient struct {
	cc *grpc.ClientConn
}

func NewConflictsServiceClient(cc *grpc.ClientConn) ConflictsServiceClient {
	return &conflictsServiceClient{cc}
}

func (c *conflictsServiceClient) ListConflictFiles(ctx context.Context, in *ListConflictFilesRequest, opts ...grpc.CallOption) (ConflictsService_ListConflictFilesClient, error) {
	stream, err := c.cc.NewStream(ctx, &_ConflictsService_serviceDesc.Streams[0], "/gitaly.ConflictsService/ListConflictFiles", opts...)
	if err != nil {
		return nil, err
	}
	x := &conflictsServiceListConflictFilesClient{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 ConflictsService_ListConflictFilesClient interface {
	Recv() (*ListConflictFilesResponse, error)
	grpc.ClientStream
}

type conflictsServiceListConflictFilesClient struct {
	grpc.ClientStream
}

func (x *conflictsServiceListConflictFilesClient) Recv() (*ListConflictFilesResponse, error) {
	m := new(ListConflictFilesResponse)
	if err := x.ClientStream.RecvMsg(m); err != nil {
		return nil, err
	}
	return m, nil
}

func (c *conflictsServiceClient) ResolveConflicts(ctx context.Context, opts ...grpc.CallOption) (ConflictsService_ResolveConflictsClient, error) {
	stream, err := c.cc.NewStream(ctx, &_ConflictsService_serviceDesc.Streams[1], "/gitaly.ConflictsService/ResolveConflicts", opts...)
	if err != nil {
		return nil, err
	}
	x := &conflictsServiceResolveConflictsClient{stream}
	return x, nil
}

type ConflictsService_ResolveConflictsClient interface {
	Send(*ResolveConflictsRequest) error
	CloseAndRecv() (*ResolveConflictsResponse, error)
	grpc.ClientStream
}

type conflictsServiceResolveConflictsClient struct {
	grpc.ClientStream
}

func (x *conflictsServiceResolveConflictsClient) Send(m *ResolveConflictsRequest) error {
	return x.ClientStream.SendMsg(m)
}

func (x *conflictsServiceResolveConflictsClient) CloseAndRecv() (*ResolveConflictsResponse, error) {
	if err := x.ClientStream.CloseSend(); err != nil {
		return nil, err
	}
	m := new(ResolveConflictsResponse)
	if err := x.ClientStream.RecvMsg(m); err != nil {
		return nil, err
	}
	return m, nil
}

// ConflictsServiceServer is the server API for ConflictsService service.
type ConflictsServiceServer interface {
	ListConflictFiles(*ListConflictFilesRequest, ConflictsService_ListConflictFilesServer) error
	// ResolveConflicts tries to resolve a conflicting merge with a set of
	// user-provided merge resolutions. If resolving the conflict succeeds, the
	// result will be a new merge commit.
	ResolveConflicts(ConflictsService_ResolveConflictsServer) error
}

// UnimplementedConflictsServiceServer can be embedded to have forward compatible implementations.
type UnimplementedConflictsServiceServer struct {
}

func (*UnimplementedConflictsServiceServer) ListConflictFiles(req *ListConflictFilesRequest, srv ConflictsService_ListConflictFilesServer) error {
	return status.Errorf(codes.Unimplemented, "method ListConflictFiles not implemented")
}
func (*UnimplementedConflictsServiceServer) ResolveConflicts(srv ConflictsService_ResolveConflictsServer) error {
	return status.Errorf(codes.Unimplemented, "method ResolveConflicts not implemented")
}

func RegisterConflictsServiceServer(s *grpc.Server, srv ConflictsServiceServer) {
	s.RegisterService(&_ConflictsService_serviceDesc, srv)
}

func _ConflictsService_ListConflictFiles_Handler(srv interface{}, stream grpc.ServerStream) error {
	m := new(ListConflictFilesRequest)
	if err := stream.RecvMsg(m); err != nil {
		return err
	}
	return srv.(ConflictsServiceServer).ListConflictFiles(m, &conflictsServiceListConflictFilesServer{stream})
}

type ConflictsService_ListConflictFilesServer interface {
	Send(*ListConflictFilesResponse) error
	grpc.ServerStream
}

type conflictsServiceListConflictFilesServer struct {
	grpc.ServerStream
}

func (x *conflictsServiceListConflictFilesServer) Send(m *ListConflictFilesResponse) error {
	return x.ServerStream.SendMsg(m)
}

func _ConflictsService_ResolveConflicts_Handler(srv interface{}, stream grpc.ServerStream) error {
	return srv.(ConflictsServiceServer).ResolveConflicts(&conflictsServiceResolveConflictsServer{stream})
}

type ConflictsService_ResolveConflictsServer interface {
	SendAndClose(*ResolveConflictsResponse) error
	Recv() (*ResolveConflictsRequest, error)
	grpc.ServerStream
}

type conflictsServiceResolveConflictsServer struct {
	grpc.ServerStream
}

func (x *conflictsServiceResolveConflictsServer) SendAndClose(m *ResolveConflictsResponse) error {
	return x.ServerStream.SendMsg(m)
}

func (x *conflictsServiceResolveConflictsServer) Recv() (*ResolveConflictsRequest, error) {
	m := new(ResolveConflictsRequest)
	if err := x.ServerStream.RecvMsg(m); err != nil {
		return nil, err
	}
	return m, nil
}

var _ConflictsService_serviceDesc = grpc.ServiceDesc{
	ServiceName: "gitaly.ConflictsService",
	HandlerType: (*ConflictsServiceServer)(nil),
	Methods:     []grpc.MethodDesc{},
	Streams: []grpc.StreamDesc{
		{
			StreamName:    "ListConflictFiles",
			Handler:       _ConflictsService_ListConflictFiles_Handler,
			ServerStreams: true,
		},
		{
			StreamName:    "ResolveConflicts",
			Handler:       _ConflictsService_ResolveConflicts_Handler,
			ClientStreams: true,
		},
	},
	Metadata: "conflicts.proto",
}