#3 feat(proto): merge request mergeability, its Watch event and the merge commit mode

M docs/services.md +2 -2


@@ -5,10 +5,10 @@
5	5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|
6	6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|
7	7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|
8		-	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest`, `MarkRead` \|
	8	+	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest` (modes fast-forward, squash, merge commit), `MarkRead`. Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` when it changes (feature `merge_requests.mergeability`) \|
9	9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|
10	10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|
11		-	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content) \|
	11	+	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content). Event 22: `merge_request_mergeability` \|
12	12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|
13	13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|
14	14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|


@@ -5,10 +5,10 @@
5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|	5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|
6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|	6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|
7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|	7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|
8	-	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest`, `MarkRead` \|	8	+	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest` (modes fast-forward, squash, merge commit), `MarkRead`. Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` when it changes (feature `merge_requests.mergeability`) \|
9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|	9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|
10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|	10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|
11	-	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content) \|	11	+	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content). Event 22: `merge_request_mergeability` \|
12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|	12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|
13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|	13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|
14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|	14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|

M gen/ermite/ermiteconnect/merge_request.connect.go +12 -6


@@ -127,9 +127,12 @@ type MergeRequestServiceClient interface {
127	127		// never merged unseen. Fails with invalid_argument if head_id is empty or
128	128		// not a commit id, and with failed_precondition if the merge request is not
129	129		// open, if the source branch no longer points to head_id ("branch moved,
130		-	// read again"), if the target is not an ancestor of the head (rebase and
131		-	// push again), if the mode is not allowed by RepoSettings, or if a check
132		-	// fails and RepoSettings.failing_checks_block is set. Merges of one
	130	+	// read again"), if the mode is fast-forward and the target is not an
	131	+	// ancestor of the head (rebase and push again, or merge with squash or
	132	+	// merge commit), if the mode is squash or merge commit and the head
	133	+	// conflicts with the target or shares no history with it (rebase and push
	134	+	// again), if the mode is not allowed by RepoSettings, or if a check fails
	135	+	// and RepoSettings.failing_checks_block is set. Merges of one
133	136		// repository run one at a time. Repeating a call that succeeded fails with
134	137		// failed_precondition (not open). On success the server publishes
135	138		// MergeRequestMerged then Pushed for the target branch.

@@ -339,9 +342,12 @@ type MergeRequestServiceHandler interface {
339	342		// never merged unseen. Fails with invalid_argument if head_id is empty or
340	343		// not a commit id, and with failed_precondition if the merge request is not
341	344		// open, if the source branch no longer points to head_id ("branch moved,
342		-	// read again"), if the target is not an ancestor of the head (rebase and
343		-	// push again), if the mode is not allowed by RepoSettings, or if a check
344		-	// fails and RepoSettings.failing_checks_block is set. Merges of one
	345	+	// read again"), if the mode is fast-forward and the target is not an
	346	+	// ancestor of the head (rebase and push again, or merge with squash or
	347	+	// merge commit), if the mode is squash or merge commit and the head
	348	+	// conflicts with the target or shares no history with it (rebase and push
	349	+	// again), if the mode is not allowed by RepoSettings, or if a check fails
	350	+	// and RepoSettings.failing_checks_block is set. Merges of one
345	351		// repository run one at a time. Repeating a call that succeeded fails with
346	352		// failed_precondition (not open). On success the server publishes
347	353		// MergeRequestMerged then Pushed for the target branch.

 	// never merged unseen. Fails with invalid_argument if head_id is empty or
 	// not a commit id, and with failed_precondition if the merge request is not
 	// open, if the source branch no longer points to head_id ("branch moved,
-	// read again"), if the target is not an ancestor of the head (rebase and
+	// read again"), if the mode is fast-forward and the target is not an
-	// push again), if the mode is not allowed by RepoSettings, or if a check
+	// ancestor of the head (rebase and push again, or merge with squash or
-	// fails and RepoSettings.failing_checks_block is set. Merges of one
+	// merge commit), if the mode is squash or merge commit and the head
+	// conflicts with the target or shares no history with it (rebase and push
+	// again), if the mode is not allowed by RepoSettings, or if a check fails
+	// and RepoSettings.failing_checks_block is set. Merges of one
 	// repository run one at a time. Repeating a call that succeeded fails with
 	// failed_precondition (not open). On success the server publishes
 	// MergeRequestMerged then Pushed for the target branch.
 	// never merged unseen. Fails with invalid_argument if head_id is empty or
 	// not a commit id, and with failed_precondition if the merge request is not
 	// open, if the source branch no longer points to head_id ("branch moved,
-	// read again"), if the target is not an ancestor of the head (rebase and
+	// read again"), if the mode is fast-forward and the target is not an
-	// push again), if the mode is not allowed by RepoSettings, or if a check
+	// ancestor of the head (rebase and push again, or merge with squash or
-	// fails and RepoSettings.failing_checks_block is set. Merges of one
+	// merge commit), if the mode is squash or merge commit and the head
+	// conflicts with the target or shares no history with it (rebase and push
+	// again), if the mode is not allowed by RepoSettings, or if a check fails
+	// and RepoSettings.failing_checks_block is set. Merges of one
 	// repository run one at a time. Repeating a call that succeeded fails with
 	// failed_precondition (not open). On success the server publishes
 	// MergeRequestMerged then Pushed for the target branch.

M gen/ermite/ermiteconnect/server.connect.go +2 -2


@@ -53,7 +53,7 @@ type ServerServiceClient interface {
53	53		// it first to check compatibility.
54	54		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)
55	55		// GetSigningKey returns the public key with which the server signs the
56		-	// commits it creates (squash merges, see MergeMode). It needs no
	56	+	// commits it creates (squash and merge commits, see MergeMode). It needs no
57	57		// authentication: the key is public, and anyone verifying a commit needs it.
58	58		// Servers that implement it list "signing_key" in
59	59		// GetVersionResponse.features.

@@ -132,7 +132,7 @@ type ServerServiceHandler interface {
132	132		// it first to check compatibility.
133	133		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)
134	134		// GetSigningKey returns the public key with which the server signs the
135		-	// commits it creates (squash merges, see MergeMode). It needs no
	135	+	// commits it creates (squash and merge commits, see MergeMode). It needs no
136	136		// authentication: the key is public, and anyone verifying a commit needs it.
137	137		// Servers that implement it list "signing_key" in
138	138		// GetVersionResponse.features.


@@ -53,7 +53,7 @@ type ServerServiceClient interface {
53		// it first to check compatibility.	53		// it first to check compatibility.
54		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)	54		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)
55		// GetSigningKey returns the public key with which the server signs the	55		// GetSigningKey returns the public key with which the server signs the
56	-	// commits it creates (squash merges, see MergeMode). It needs no	56	+	// commits it creates (squash and merge commits, see MergeMode). It needs no
57		// authentication: the key is public, and anyone verifying a commit needs it.	57		// authentication: the key is public, and anyone verifying a commit needs it.
58		// Servers that implement it list "signing_key" in	58		// Servers that implement it list "signing_key" in
59		// GetVersionResponse.features.	59		// GetVersionResponse.features.

@@ -132,7 +132,7 @@ type ServerServiceHandler interface {
132		// it first to check compatibility.	132		// it first to check compatibility.
133		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)	133		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)
134		// GetSigningKey returns the public key with which the server signs the	134		// GetSigningKey returns the public key with which the server signs the
135	-	// commits it creates (squash merges, see MergeMode). It needs no	135	+	// commits it creates (squash and merge commits, see MergeMode). It needs no
136		// authentication: the key is public, and anyone verifying a commit needs it.	136		// authentication: the key is public, and anyone verifying a commit needs it.
137		// Servers that implement it list "signing_key" in	137		// Servers that implement it list "signing_key" in
138		// GetVersionResponse.features.	138		// GetVersionResponse.features.

M gen/ermite/event.pb.go +207 -112 generated file: collapsed

load diff

M gen/ermite/merge_request.pb.go +380 -162


@@ -191,6 +191,186 @@ func (Verdict) EnumDescriptor() ([]byte, []int) {
191	191		return file_ermite_merge_request_proto_rawDescGZIP(), []int{2}
192	192		}
193	193
	194	+	// MergeabilityState tells whether the head of an open merge request can be
	195	+	// merged into its target.
	196	+	type MergeabilityState int32
	197	+
	198	+	const (
	199	+	// Not set.
	200	+	MergeabilityState_MERGEABILITY_STATE_UNSPECIFIED MergeabilityState = 0
	201	+	// The server has no result yet for the current tips of both branches. It
	202	+	// is replaced by another state when the check completes.
	203	+	MergeabilityState_MERGEABILITY_STATE_CHECKING MergeabilityState = 1
	204	+	// The target is an ancestor of the head: every mode can merge.
	205	+	MergeabilityState_MERGEABILITY_STATE_UP_TO_DATE MergeabilityState = 2
	206	+	// The target has commits the head lacks, but the head merges cleanly:
	207	+	// squash and merge commit can merge, fast-forward cannot.
	208	+	MergeabilityState_MERGEABILITY_STATE_BEHIND MergeabilityState = 3
	209	+	// The head does not merge cleanly into the target, or the branches share no
	210	+	// history: no mode can merge.
	211	+	MergeabilityState_MERGEABILITY_STATE_CONFLICT MergeabilityState = 4
	212	+	)
	213	+
	214	+	// Enum value maps for MergeabilityState.
	215	+	var (
	216	+	MergeabilityState_name = map[int32]string{
	217	+	0: "MERGEABILITY_STATE_UNSPECIFIED",
	218	+	1: "MERGEABILITY_STATE_CHECKING",
	219	+	2: "MERGEABILITY_STATE_UP_TO_DATE",
	220	+	3: "MERGEABILITY_STATE_BEHIND",
	221	+	4: "MERGEABILITY_STATE_CONFLICT",
	222	+	}
	223	+	MergeabilityState_value = map[string]int32{
	224	+	"MERGEABILITY_STATE_UNSPECIFIED": 0,
	225	+	"MERGEABILITY_STATE_CHECKING": 1,
	226	+	"MERGEABILITY_STATE_UP_TO_DATE": 2,
	227	+	"MERGEABILITY_STATE_BEHIND": 3,
	228	+	"MERGEABILITY_STATE_CONFLICT": 4,
	229	+	}
	230	+	)
	231	+
	232	+	func (x MergeabilityState) Enum() *MergeabilityState {
	233	+	p := new(MergeabilityState)
	234	+	*p = x
	235	+	return p
	236	+	}
	237	+
	238	+	func (x MergeabilityState) String() string {
	239	+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
	240	+	}
	241	+
	242	+	func (MergeabilityState) Descriptor() protoreflect.EnumDescriptor {
	243	+	return file_ermite_merge_request_proto_enumTypes[3].Descriptor()
	244	+	}
	245	+
	246	+	func (MergeabilityState) Type() protoreflect.EnumType {
	247	+	return &file_ermite_merge_request_proto_enumTypes[3]
	248	+	}
	249	+
	250	+	func (x MergeabilityState) Number() protoreflect.EnumNumber {
	251	+	return protoreflect.EnumNumber(x)
	252	+	}
	253	+
	254	+	// Deprecated: Use MergeabilityState.Descriptor instead.
	255	+	func (MergeabilityState) EnumDescriptor() ([]byte, []int) {
	256	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{3}
	257	+	}
	258	+
	259	+	// Mergeability is the result of checking an open merge request against the
	260	+	// tips of its branches.
	261	+	type Mergeability struct {
	262	+	state protoimpl.MessageState `protogen:"open.v1"`
	263	+	// State is the result.
	264	+	State MergeabilityState `protobuf:"varint,1,opt,name=state,proto3,enum=ermite.MergeabilityState" json:"state,omitempty"`
	265	+	// TargetId is the commit the target branch pointed to when checked. Empty
	266	+	// while CHECKING.
	267	+	TargetId string `protobuf:"bytes,2,opt,name=target_id,json=targetId,proto3" json:"target_id,omitempty"`
	268	+	// HeadId is the commit the source branch pointed to when checked. Empty
	269	+	// while CHECKING.
	270	+	HeadId string `protobuf:"bytes,3,opt,name=head_id,json=headId,proto3" json:"head_id,omitempty"`
	271	+	// Behind is the number of commits of the target that the head lacks. Set
	272	+	// only when state is BEHIND.
	273	+	Behind int32 `protobuf:"varint,4,opt,name=behind,proto3" json:"behind,omitempty"`
	274	+	// BehindCapped says that Behind is a lower bound: the server stops counting
	275	+	// at 1,000.
	276	+	BehindCapped bool `protobuf:"varint,5,opt,name=behind_capped,json=behindCapped,proto3" json:"behind_capped,omitempty"`
	277	+	// ConflictPaths are the paths that conflict, at most 20. Set only when
	278	+	// state is CONFLICT; empty when the branches share no history.
	279	+	ConflictPaths []string `protobuf:"bytes,6,rep,name=conflict_paths,json=conflictPaths,proto3" json:"conflict_paths,omitempty"`
	280	+	// ConflictPathsTruncated says that more paths conflict than listed.
	281	+	ConflictPathsTruncated bool `protobuf:"varint,7,opt,name=conflict_paths_truncated,json=conflictPathsTruncated,proto3" json:"conflict_paths_truncated,omitempty"`
	282	+	// CheckedAt is when the server computed the result. Unset while CHECKING.
	283	+	CheckedAt *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=checked_at,json=checkedAt,proto3" json:"checked_at,omitempty"`
	284	+	unknownFields protoimpl.UnknownFields
	285	+	sizeCache protoimpl.SizeCache
	286	+	}
	287	+
	288	+	func (x *Mergeability) Reset() {
	289	+	*x = Mergeability{}
	290	+	mi := &file_ermite_merge_request_proto_msgTypes[0]
	291	+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
	292	+	ms.StoreMessageInfo(mi)
	293	+	}
	294	+
	295	+	func (x *Mergeability) String() string {
	296	+	return protoimpl.X.MessageStringOf(x)
	297	+	}
	298	+
	299	+	func (*Mergeability) ProtoMessage() {}
	300	+
	301	+	func (x *Mergeability) ProtoReflect() protoreflect.Message {
	302	+	mi := &file_ermite_merge_request_proto_msgTypes[0]
	303	+	if x != nil {
	304	+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
	305	+	if ms.LoadMessageInfo() == nil {
	306	+	ms.StoreMessageInfo(mi)
	307	+	}
	308	+	return ms
	309	+	}
	310	+	return mi.MessageOf(x)
	311	+	}
	312	+
	313	+	// Deprecated: Use Mergeability.ProtoReflect.Descriptor instead.
	314	+	func (*Mergeability) Descriptor() ([]byte, []int) {
	315	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{0}
	316	+	}
	317	+
	318	+	func (x *Mergeability) GetState() MergeabilityState {
	319	+	if x != nil {
	320	+	return x.State
	321	+	}
	322	+	return MergeabilityState_MERGEABILITY_STATE_UNSPECIFIED
	323	+	}
	324	+
	325	+	func (x *Mergeability) GetTargetId() string {
	326	+	if x != nil {
	327	+	return x.TargetId
	328	+	}
	329	+	return ""
	330	+	}
	331	+
	332	+	func (x *Mergeability) GetHeadId() string {
	333	+	if x != nil {
	334	+	return x.HeadId
	335	+	}
	336	+	return ""
	337	+	}
	338	+
	339	+	func (x *Mergeability) GetBehind() int32 {
	340	+	if x != nil {
	341	+	return x.Behind
	342	+	}
	343	+	return 0
	344	+	}
	345	+
	346	+	func (x *Mergeability) GetBehindCapped() bool {
	347	+	if x != nil {
	348	+	return x.BehindCapped
	349	+	}
	350	+	return false
	351	+	}
	352	+
	353	+	func (x *Mergeability) GetConflictPaths() []string {
	354	+	if x != nil {
	355	+	return x.ConflictPaths
	356	+	}
	357	+	return nil
	358	+	}
	359	+
	360	+	func (x *Mergeability) GetConflictPathsTruncated() bool {
	361	+	if x != nil {
	362	+	return x.ConflictPathsTruncated
	363	+	}
	364	+	return false
	365	+	}
	366	+
	367	+	func (x Mergeability) GetCheckedAt() timestamppb.Timestamp {
	368	+	if x != nil {
	369	+	return x.CheckedAt
	370	+	}
	371	+	return nil
	372	+	}
	373	+
194	374		// MergeRequest asks to merge one branch of a repository into another branch
195	375		// of the same repository. It is about a branch, not about who wrote it.
196	376		type MergeRequest struct {

@@ -229,19 +409,26 @@ type MergeRequest struct {
229	409		// merged or closed it is the head at that moment.
230	410		HeadId string `protobuf:"bytes,11,opt,name=head_id,json=headId,proto3" json:"head_id,omitempty"`
231	411		// MergedCommitId is the id of the commit the target branch points to after
232		-	// the merge: the head for a fast-forward, the new commit for a squash.
	412	+	// the merge: the head for a fast-forward, the new commit for a squash or a
	413	+	// merge commit.
233	414		// Empty unless state is MERGED.
234	415		MergedCommitId string `protobuf:"bytes,12,opt,name=merged_commit_id,json=mergedCommitId,proto3" json:"merged_commit_id,omitempty"`
235	416		// MergeMode is how the merge request was merged. MERGE_MODE_UNSPECIFIED
236	417		// unless state is MERGED.
237		-	MergeMode MergeMode `protobuf:"varint,13,opt,name=merge_mode,json=mergeMode,proto3,enum=ermite.MergeMode" json:"merge_mode,omitempty"`
	418	+	MergeMode MergeMode `protobuf:"varint,13,opt,name=merge_mode,json=mergeMode,proto3,enum=ermite.MergeMode" json:"merge_mode,omitempty"`
	419	+	// Mergeability tells whether the head can be merged into the target. Set
	420	+	// while the merge request is OPEN, with state CHECKING until the server has
	421	+	// a result for the current tips; never set once merged or closed. It is a
	422	+	// hint: MergeMergeRequest checks again. Set only by servers with the
	423	+	// "merge_requests.mergeability" feature.
	424	+	Mergeability *Mergeability `protobuf:"bytes,14,opt,name=mergeability,proto3" json:"mergeability,omitempty"`
238	425		unknownFields protoimpl.UnknownFields
239	426		sizeCache protoimpl.SizeCache
240	427		}
241	428
242	429		func (x *MergeRequest) Reset() {
243	430		*x = MergeRequest{}
244		-	mi := &file_ermite_merge_request_proto_msgTypes[0]
	431	+	mi := &file_ermite_merge_request_proto_msgTypes[1]
245	432		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
246	433		ms.StoreMessageInfo(mi)
247	434		}

@@ -253,7 +440,7 @@ func (x *MergeRequest) String() string {
253	440		func (*MergeRequest) ProtoMessage() {}
254	441
255	442		func (x *MergeRequest) ProtoReflect() protoreflect.Message {
256		-	mi := &file_ermite_merge_request_proto_msgTypes[0]
	443	+	mi := &file_ermite_merge_request_proto_msgTypes[1]
257	444		if x != nil {
258	445		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
259	446		if ms.LoadMessageInfo() == nil {

@@ -266,7 +453,7 @@ func (x *MergeRequest) ProtoReflect() protoreflect.Message {
266	453
267	454		// Deprecated: Use MergeRequest.ProtoReflect.Descriptor instead.
268	455		func (*MergeRequest) Descriptor() ([]byte, []int) {
269		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{0}
	456	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{1}
270	457		}
271	458
272	459		func (x *MergeRequest) GetRepo() string {

@@ -360,6 +547,13 @@ func (x *MergeRequest) GetMergeMode() MergeMode {
360	547		return MergeMode_MERGE_MODE_UNSPECIFIED
361	548		}
362	549
	550	+	func (x MergeRequest) GetMergeability() Mergeability {
	551	+	if x != nil {
	552	+	return x.Mergeability
	553	+	}
	554	+	return nil
	555	+	}
	556	+
363	557		// Comment is a note on a merge request, either general or attached to a line
364	558		// of its diff.
365	559		type Comment struct {

@@ -412,7 +606,7 @@ type Comment struct {
412	606
413	607		func (x *Comment) Reset() {
414	608		*x = Comment{}
415		-	mi := &file_ermite_merge_request_proto_msgTypes[1]
	609	+	mi := &file_ermite_merge_request_proto_msgTypes[2]
416	610		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
417	611		ms.StoreMessageInfo(mi)
418	612		}

@@ -424,7 +618,7 @@ func (x *Comment) String() string {
424	618		func (*Comment) ProtoMessage() {}
425	619
426	620		func (x *Comment) ProtoReflect() protoreflect.Message {
427		-	mi := &file_ermite_merge_request_proto_msgTypes[1]
	621	+	mi := &file_ermite_merge_request_proto_msgTypes[2]
428	622		if x != nil {
429	623		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
430	624		if ms.LoadMessageInfo() == nil {

@@ -437,7 +631,7 @@ func (x *Comment) ProtoReflect() protoreflect.Message {
437	631
438	632		// Deprecated: Use Comment.ProtoReflect.Descriptor instead.
439	633		func (*Comment) Descriptor() ([]byte, []int) {
440		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{1}
	634	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{2}
441	635		}
442	636
443	637		func (x *Comment) GetId() string {

@@ -561,7 +755,7 @@ type AuthorVerdict struct {
561	755
562	756		func (x *AuthorVerdict) Reset() {
563	757		*x = AuthorVerdict{}
564		-	mi := &file_ermite_merge_request_proto_msgTypes[2]
	758	+	mi := &file_ermite_merge_request_proto_msgTypes[3]
565	759		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
566	760		ms.StoreMessageInfo(mi)
567	761		}

@@ -573,7 +767,7 @@ func (x *AuthorVerdict) String() string {
573	767		func (*AuthorVerdict) ProtoMessage() {}
574	768
575	769		func (x *AuthorVerdict) ProtoReflect() protoreflect.Message {
576		-	mi := &file_ermite_merge_request_proto_msgTypes[2]
	770	+	mi := &file_ermite_merge_request_proto_msgTypes[3]
577	771		if x != nil {
578	772		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
579	773		if ms.LoadMessageInfo() == nil {

@@ -586,7 +780,7 @@ func (x *AuthorVerdict) ProtoReflect() protoreflect.Message {
586	780
587	781		// Deprecated: Use AuthorVerdict.ProtoReflect.Descriptor instead.
588	782		func (*AuthorVerdict) Descriptor() ([]byte, []int) {
589		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{2}
	783	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{3}
590	784		}
591	785
592	786		func (x *AuthorVerdict) GetAuthor() string {

@@ -653,7 +847,7 @@ type CreateMergeRequestRequest struct {
653	847
654	848		func (x *CreateMergeRequestRequest) Reset() {
655	849		*x = CreateMergeRequestRequest{}
656		-	mi := &file_ermite_merge_request_proto_msgTypes[3]
	850	+	mi := &file_ermite_merge_request_proto_msgTypes[4]
657	851		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
658	852		ms.StoreMessageInfo(mi)
659	853		}

@@ -665,7 +859,7 @@ func (x *CreateMergeRequestRequest) String() string {
665	859		func (*CreateMergeRequestRequest) ProtoMessage() {}
666	860
667	861		func (x *CreateMergeRequestRequest) ProtoReflect() protoreflect.Message {
668		-	mi := &file_ermite_merge_request_proto_msgTypes[3]
	862	+	mi := &file_ermite_merge_request_proto_msgTypes[4]
669	863		if x != nil {
670	864		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
671	865		if ms.LoadMessageInfo() == nil {

@@ -678,7 +872,7 @@ func (x *CreateMergeRequestRequest) ProtoReflect() protoreflect.Message {
678	872
679	873		// Deprecated: Use CreateMergeRequestRequest.ProtoReflect.Descriptor instead.
680	874		func (*CreateMergeRequestRequest) Descriptor() ([]byte, []int) {
681		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{3}
	875	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{4}
682	876		}
683	877
684	878		func (x *CreateMergeRequestRequest) GetRepo() string {

@@ -727,7 +921,7 @@ type CreateMergeRequestResponse struct {
727	921
728	922		func (x *CreateMergeRequestResponse) Reset() {
729	923		*x = CreateMergeRequestResponse{}
730		-	mi := &file_ermite_merge_request_proto_msgTypes[4]
	924	+	mi := &file_ermite_merge_request_proto_msgTypes[5]
731	925		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
732	926		ms.StoreMessageInfo(mi)
733	927		}

@@ -739,7 +933,7 @@ func (x *CreateMergeRequestResponse) String() string {
739	933		func (*CreateMergeRequestResponse) ProtoMessage() {}
740	934
741	935		func (x *CreateMergeRequestResponse) ProtoReflect() protoreflect.Message {
742		-	mi := &file_ermite_merge_request_proto_msgTypes[4]
	936	+	mi := &file_ermite_merge_request_proto_msgTypes[5]
743	937		if x != nil {
744	938		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
745	939		if ms.LoadMessageInfo() == nil {

@@ -752,7 +946,7 @@ func (x *CreateMergeRequestResponse) ProtoReflect() protoreflect.Message {
752	946
753	947		// Deprecated: Use CreateMergeRequestResponse.ProtoReflect.Descriptor instead.
754	948		func (*CreateMergeRequestResponse) Descriptor() ([]byte, []int) {
755		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{4}
	949	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{5}
756	950		}
757	951
758	952		func (x CreateMergeRequestResponse) GetMergeRequest() MergeRequest {

@@ -782,7 +976,7 @@ type ListMergeRequestsRequest struct {
782	976
783	977		func (x *ListMergeRequestsRequest) Reset() {
784	978		*x = ListMergeRequestsRequest{}
785		-	mi := &file_ermite_merge_request_proto_msgTypes[5]
	979	+	mi := &file_ermite_merge_request_proto_msgTypes[6]
786	980		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
787	981		ms.StoreMessageInfo(mi)
788	982		}

@@ -794,7 +988,7 @@ func (x *ListMergeRequestsRequest) String() string {
794	988		func (*ListMergeRequestsRequest) ProtoMessage() {}
795	989
796	990		func (x *ListMergeRequestsRequest) ProtoReflect() protoreflect.Message {
797		-	mi := &file_ermite_merge_request_proto_msgTypes[5]
	991	+	mi := &file_ermite_merge_request_proto_msgTypes[6]
798	992		if x != nil {
799	993		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
800	994		if ms.LoadMessageInfo() == nil {

@@ -807,7 +1001,7 @@ func (x *ListMergeRequestsRequest) ProtoReflect() protoreflect.Message {
807	1001
808	1002		// Deprecated: Use ListMergeRequestsRequest.ProtoReflect.Descriptor instead.
809	1003		func (*ListMergeRequestsRequest) Descriptor() ([]byte, []int) {
810		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{5}
	1004	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{6}
811	1005		}
812	1006
813	1007		func (x *ListMergeRequestsRequest) GetRepo() string {

@@ -852,7 +1046,7 @@ type ListMergeRequestsResponse struct {
852	1046
853	1047		func (x *ListMergeRequestsResponse) Reset() {
854	1048		*x = ListMergeRequestsResponse{}
855		-	mi := &file_ermite_merge_request_proto_msgTypes[6]
	1049	+	mi := &file_ermite_merge_request_proto_msgTypes[7]
856	1050		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
857	1051		ms.StoreMessageInfo(mi)
858	1052		}

@@ -864,7 +1058,7 @@ func (x *ListMergeRequestsResponse) String() string {
864	1058		func (*ListMergeRequestsResponse) ProtoMessage() {}
865	1059
866	1060		func (x *ListMergeRequestsResponse) ProtoReflect() protoreflect.Message {
867		-	mi := &file_ermite_merge_request_proto_msgTypes[6]
	1061	+	mi := &file_ermite_merge_request_proto_msgTypes[7]
868	1062		if x != nil {
869	1063		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
870	1064		if ms.LoadMessageInfo() == nil {

@@ -877,7 +1071,7 @@ func (x *ListMergeRequestsResponse) ProtoReflect() protoreflect.Message {
877	1071
878	1072		// Deprecated: Use ListMergeRequestsResponse.ProtoReflect.Descriptor instead.
879	1073		func (*ListMergeRequestsResponse) Descriptor() ([]byte, []int) {
880		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{6}
	1074	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{7}
881	1075		}
882	1076
883	1077		func (x ListMergeRequestsResponse) GetMergeRequests() []MergeRequest {

@@ -914,7 +1108,7 @@ type GetMergeRequestRequest struct {
914	1108
915	1109		func (x *GetMergeRequestRequest) Reset() {
916	1110		*x = GetMergeRequestRequest{}
917		-	mi := &file_ermite_merge_request_proto_msgTypes[7]
	1111	+	mi := &file_ermite_merge_request_proto_msgTypes[8]
918	1112		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
919	1113		ms.StoreMessageInfo(mi)
920	1114		}

@@ -926,7 +1120,7 @@ func (x *GetMergeRequestRequest) String() string {
926	1120		func (*GetMergeRequestRequest) ProtoMessage() {}
927	1121
928	1122		func (x *GetMergeRequestRequest) ProtoReflect() protoreflect.Message {
929		-	mi := &file_ermite_merge_request_proto_msgTypes[7]
	1123	+	mi := &file_ermite_merge_request_proto_msgTypes[8]
930	1124		if x != nil {
931	1125		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
932	1126		if ms.LoadMessageInfo() == nil {

@@ -939,7 +1133,7 @@ func (x *GetMergeRequestRequest) ProtoReflect() protoreflect.Message {
939	1133
940	1134		// Deprecated: Use GetMergeRequestRequest.ProtoReflect.Descriptor instead.
941	1135		func (*GetMergeRequestRequest) Descriptor() ([]byte, []int) {
942		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{7}
	1136	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{8}
943	1137		}
944	1138
945	1139		func (x *GetMergeRequestRequest) GetRepo() string {

@@ -1005,7 +1199,7 @@ type GetMergeRequestResponse struct {
1005	1199
1006	1200		func (x *GetMergeRequestResponse) Reset() {
1007	1201		*x = GetMergeRequestResponse{}
1008		-	mi := &file_ermite_merge_request_proto_msgTypes[8]
	1202	+	mi := &file_ermite_merge_request_proto_msgTypes[9]
1009	1203		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1010	1204		ms.StoreMessageInfo(mi)
1011	1205		}

@@ -1017,7 +1211,7 @@ func (x *GetMergeRequestResponse) String() string {
1017	1211		func (*GetMergeRequestResponse) ProtoMessage() {}
1018	1212
1019	1213		func (x *GetMergeRequestResponse) ProtoReflect() protoreflect.Message {
1020		-	mi := &file_ermite_merge_request_proto_msgTypes[8]
	1214	+	mi := &file_ermite_merge_request_proto_msgTypes[9]
1021	1215		if x != nil {
1022	1216		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1023	1217		if ms.LoadMessageInfo() == nil {

@@ -1030,7 +1224,7 @@ func (x *GetMergeRequestResponse) ProtoReflect() protoreflect.Message {
1030	1224
1031	1225		// Deprecated: Use GetMergeRequestResponse.ProtoReflect.Descriptor instead.
1032	1226		func (*GetMergeRequestResponse) Descriptor() ([]byte, []int) {
1033		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{8}
	1227	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{9}
1034	1228		}
1035	1229
1036	1230		func (x GetMergeRequestResponse) GetMergeRequest() MergeRequest {

@@ -1139,7 +1333,7 @@ type AddCommentRequest struct {
1139	1333
1140	1334		func (x *AddCommentRequest) Reset() {
1141	1335		*x = AddCommentRequest{}
1142		-	mi := &file_ermite_merge_request_proto_msgTypes[9]
	1336	+	mi := &file_ermite_merge_request_proto_msgTypes[10]
1143	1337		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1144	1338		ms.StoreMessageInfo(mi)
1145	1339		}

@@ -1151,7 +1345,7 @@ func (x *AddCommentRequest) String() string {
1151	1345		func (*AddCommentRequest) ProtoMessage() {}
1152	1346
1153	1347		func (x *AddCommentRequest) ProtoReflect() protoreflect.Message {
1154		-	mi := &file_ermite_merge_request_proto_msgTypes[9]
	1348	+	mi := &file_ermite_merge_request_proto_msgTypes[10]
1155	1349		if x != nil {
1156	1350		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1157	1351		if ms.LoadMessageInfo() == nil {

@@ -1164,7 +1358,7 @@ func (x *AddCommentRequest) ProtoReflect() protoreflect.Message {
1164	1358
1165	1359		// Deprecated: Use AddCommentRequest.ProtoReflect.Descriptor instead.
1166	1360		func (*AddCommentRequest) Descriptor() ([]byte, []int) {
1167		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{9}
	1361	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{10}
1168	1362		}
1169	1363
1170	1364		func (x *AddCommentRequest) GetRepo() string {

@@ -1241,7 +1435,7 @@ type AddCommentResponse struct {
1241	1435
1242	1436		func (x *AddCommentResponse) Reset() {
1243	1437		*x = AddCommentResponse{}
1244		-	mi := &file_ermite_merge_request_proto_msgTypes[10]
	1438	+	mi := &file_ermite_merge_request_proto_msgTypes[11]
1245	1439		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1246	1440		ms.StoreMessageInfo(mi)
1247	1441		}

@@ -1253,7 +1447,7 @@ func (x *AddCommentResponse) String() string {
1253	1447		func (*AddCommentResponse) ProtoMessage() {}
1254	1448
1255	1449		func (x *AddCommentResponse) ProtoReflect() protoreflect.Message {
1256		-	mi := &file_ermite_merge_request_proto_msgTypes[10]
	1450	+	mi := &file_ermite_merge_request_proto_msgTypes[11]
1257	1451		if x != nil {
1258	1452		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1259	1453		if ms.LoadMessageInfo() == nil {

@@ -1266,7 +1460,7 @@ func (x *AddCommentResponse) ProtoReflect() protoreflect.Message {
1266	1460
1267	1461		// Deprecated: Use AddCommentResponse.ProtoReflect.Descriptor instead.
1268	1462		func (*AddCommentResponse) Descriptor() ([]byte, []int) {
1269		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{10}
	1463	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{11}
1270	1464		}
1271	1465
1272	1466		func (x AddCommentResponse) GetComment() Comment {

@@ -1294,7 +1488,7 @@ type EditCommentRequest struct {
1294	1488
1295	1489		func (x *EditCommentRequest) Reset() {
1296	1490		*x = EditCommentRequest{}
1297		-	mi := &file_ermite_merge_request_proto_msgTypes[11]
	1491	+	mi := &file_ermite_merge_request_proto_msgTypes[12]
1298	1492		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1299	1493		ms.StoreMessageInfo(mi)
1300	1494		}

@@ -1306,7 +1500,7 @@ func (x *EditCommentRequest) String() string {
1306	1500		func (*EditCommentRequest) ProtoMessage() {}
1307	1501
1308	1502		func (x *EditCommentRequest) ProtoReflect() protoreflect.Message {
1309		-	mi := &file_ermite_merge_request_proto_msgTypes[11]
	1503	+	mi := &file_ermite_merge_request_proto_msgTypes[12]
1310	1504		if x != nil {
1311	1505		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1312	1506		if ms.LoadMessageInfo() == nil {

@@ -1319,7 +1513,7 @@ func (x *EditCommentRequest) ProtoReflect() protoreflect.Message {
1319	1513
1320	1514		// Deprecated: Use EditCommentRequest.ProtoReflect.Descriptor instead.
1321	1515		func (*EditCommentRequest) Descriptor() ([]byte, []int) {
1322		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{11}
	1516	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{12}
1323	1517		}
1324	1518
1325	1519		func (x *EditCommentRequest) GetRepo() string {

@@ -1361,7 +1555,7 @@ type EditCommentResponse struct {
1361	1555
1362	1556		func (x *EditCommentResponse) Reset() {
1363	1557		*x = EditCommentResponse{}
1364		-	mi := &file_ermite_merge_request_proto_msgTypes[12]
	1558	+	mi := &file_ermite_merge_request_proto_msgTypes[13]
1365	1559		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1366	1560		ms.StoreMessageInfo(mi)
1367	1561		}

@@ -1373,7 +1567,7 @@ func (x *EditCommentResponse) String() string {
1373	1567		func (*EditCommentResponse) ProtoMessage() {}
1374	1568
1375	1569		func (x *EditCommentResponse) ProtoReflect() protoreflect.Message {
1376		-	mi := &file_ermite_merge_request_proto_msgTypes[12]
	1570	+	mi := &file_ermite_merge_request_proto_msgTypes[13]
1377	1571		if x != nil {
1378	1572		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1379	1573		if ms.LoadMessageInfo() == nil {

@@ -1386,7 +1580,7 @@ func (x *EditCommentResponse) ProtoReflect() protoreflect.Message {
1386	1580
1387	1581		// Deprecated: Use EditCommentResponse.ProtoReflect.Descriptor instead.
1388	1582		func (*EditCommentResponse) Descriptor() ([]byte, []int) {
1389		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{12}
	1583	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{13}
1390	1584		}
1391	1585
1392	1586		func (x EditCommentResponse) GetComment() Comment {

@@ -1411,7 +1605,7 @@ type DeleteCommentRequest struct {
1411	1605
1412	1606		func (x *DeleteCommentRequest) Reset() {
1413	1607		*x = DeleteCommentRequest{}
1414		-	mi := &file_ermite_merge_request_proto_msgTypes[13]
	1608	+	mi := &file_ermite_merge_request_proto_msgTypes[14]
1415	1609		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1416	1610		ms.StoreMessageInfo(mi)
1417	1611		}

@@ -1423,7 +1617,7 @@ func (x *DeleteCommentRequest) String() string {
1423	1617		func (*DeleteCommentRequest) ProtoMessage() {}
1424	1618
1425	1619		func (x *DeleteCommentRequest) ProtoReflect() protoreflect.Message {
1426		-	mi := &file_ermite_merge_request_proto_msgTypes[13]
	1620	+	mi := &file_ermite_merge_request_proto_msgTypes[14]
1427	1621		if x != nil {
1428	1622		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1429	1623		if ms.LoadMessageInfo() == nil {

@@ -1436,7 +1630,7 @@ func (x *DeleteCommentRequest) ProtoReflect() protoreflect.Message {
1436	1630
1437	1631		// Deprecated: Use DeleteCommentRequest.ProtoReflect.Descriptor instead.
1438	1632		func (*DeleteCommentRequest) Descriptor() ([]byte, []int) {
1439		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{13}
	1633	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{14}
1440	1634		}
1441	1635
1442	1636		func (x *DeleteCommentRequest) GetRepo() string {

@@ -1471,7 +1665,7 @@ type DeleteCommentResponse struct {
1471	1665
1472	1666		func (x *DeleteCommentResponse) Reset() {
1473	1667		*x = DeleteCommentResponse{}
1474		-	mi := &file_ermite_merge_request_proto_msgTypes[14]
	1668	+	mi := &file_ermite_merge_request_proto_msgTypes[15]
1475	1669		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1476	1670		ms.StoreMessageInfo(mi)
1477	1671		}

@@ -1483,7 +1677,7 @@ func (x *DeleteCommentResponse) String() string {
1483	1677		func (*DeleteCommentResponse) ProtoMessage() {}
1484	1678
1485	1679		func (x *DeleteCommentResponse) ProtoReflect() protoreflect.Message {
1486		-	mi := &file_ermite_merge_request_proto_msgTypes[14]
	1680	+	mi := &file_ermite_merge_request_proto_msgTypes[15]
1487	1681		if x != nil {
1488	1682		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1489	1683		if ms.LoadMessageInfo() == nil {

@@ -1496,7 +1690,7 @@ func (x *DeleteCommentResponse) ProtoReflect() protoreflect.Message {
1496	1690
1497	1691		// Deprecated: Use DeleteCommentResponse.ProtoReflect.Descriptor instead.
1498	1692		func (*DeleteCommentResponse) Descriptor() ([]byte, []int) {
1499		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{14}
	1693	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{15}
1500	1694		}
1501	1695
1502	1696		func (x DeleteCommentResponse) GetComment() Comment {

@@ -1523,7 +1717,7 @@ type ResolveCommentRequest struct {
1523	1717
1524	1718		func (x *ResolveCommentRequest) Reset() {
1525	1719		*x = ResolveCommentRequest{}
1526		-	mi := &file_ermite_merge_request_proto_msgTypes[15]
	1720	+	mi := &file_ermite_merge_request_proto_msgTypes[16]
1527	1721		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1528	1722		ms.StoreMessageInfo(mi)
1529	1723		}

@@ -1535,7 +1729,7 @@ func (x *ResolveCommentRequest) String() string {
1535	1729		func (*ResolveCommentRequest) ProtoMessage() {}
1536	1730
1537	1731		func (x *ResolveCommentRequest) ProtoReflect() protoreflect.Message {
1538		-	mi := &file_ermite_merge_request_proto_msgTypes[15]
	1732	+	mi := &file_ermite_merge_request_proto_msgTypes[16]
1539	1733		if x != nil {
1540	1734		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1541	1735		if ms.LoadMessageInfo() == nil {

@@ -1548,7 +1742,7 @@ func (x *ResolveCommentRequest) ProtoReflect() protoreflect.Message {
1548	1742
1549	1743		// Deprecated: Use ResolveCommentRequest.ProtoReflect.Descriptor instead.
1550	1744		func (*ResolveCommentRequest) Descriptor() ([]byte, []int) {
1551		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{15}
	1745	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{16}
1552	1746		}
1553	1747
1554	1748		func (x *ResolveCommentRequest) GetRepo() string {

@@ -1590,7 +1784,7 @@ type ResolveCommentResponse struct {
1590	1784
1591	1785		func (x *ResolveCommentResponse) Reset() {
1592	1786		*x = ResolveCommentResponse{}
1593		-	mi := &file_ermite_merge_request_proto_msgTypes[16]
	1787	+	mi := &file_ermite_merge_request_proto_msgTypes[17]
1594	1788		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1595	1789		ms.StoreMessageInfo(mi)
1596	1790		}

@@ -1602,7 +1796,7 @@ func (x *ResolveCommentResponse) String() string {
1602	1796		func (*ResolveCommentResponse) ProtoMessage() {}
1603	1797
1604	1798		func (x *ResolveCommentResponse) ProtoReflect() protoreflect.Message {
1605		-	mi := &file_ermite_merge_request_proto_msgTypes[16]
	1799	+	mi := &file_ermite_merge_request_proto_msgTypes[17]
1606	1800		if x != nil {
1607	1801		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1608	1802		if ms.LoadMessageInfo() == nil {

@@ -1615,7 +1809,7 @@ func (x *ResolveCommentResponse) ProtoReflect() protoreflect.Message {
1615	1809
1616	1810		// Deprecated: Use ResolveCommentResponse.ProtoReflect.Descriptor instead.
1617	1811		func (*ResolveCommentResponse) Descriptor() ([]byte, []int) {
1618		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{16}
	1812	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{17}
1619	1813		}
1620	1814
1621	1815		func (x ResolveCommentResponse) GetComment() Comment {

@@ -1638,7 +1832,7 @@ type CloseMergeRequestRequest struct {
1638	1832
1639	1833		func (x *CloseMergeRequestRequest) Reset() {
1640	1834		*x = CloseMergeRequestRequest{}
1641		-	mi := &file_ermite_merge_request_proto_msgTypes[17]
	1835	+	mi := &file_ermite_merge_request_proto_msgTypes[18]
1642	1836		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1643	1837		ms.StoreMessageInfo(mi)
1644	1838		}

@@ -1650,7 +1844,7 @@ func (x *CloseMergeRequestRequest) String() string {
1650	1844		func (*CloseMergeRequestRequest) ProtoMessage() {}
1651	1845
1652	1846		func (x *CloseMergeRequestRequest) ProtoReflect() protoreflect.Message {
1653		-	mi := &file_ermite_merge_request_proto_msgTypes[17]
	1847	+	mi := &file_ermite_merge_request_proto_msgTypes[18]
1654	1848		if x != nil {
1655	1849		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1656	1850		if ms.LoadMessageInfo() == nil {

@@ -1663,7 +1857,7 @@ func (x *CloseMergeRequestRequest) ProtoReflect() protoreflect.Message {
1663	1857
1664	1858		// Deprecated: Use CloseMergeRequestRequest.ProtoReflect.Descriptor instead.
1665	1859		func (*CloseMergeRequestRequest) Descriptor() ([]byte, []int) {
1666		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{17}
	1860	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{18}
1667	1861		}
1668	1862
1669	1863		func (x *CloseMergeRequestRequest) GetRepo() string {

@@ -1691,7 +1885,7 @@ type CloseMergeRequestResponse struct {
1691	1885
1692	1886		func (x *CloseMergeRequestResponse) Reset() {
1693	1887		*x = CloseMergeRequestResponse{}
1694		-	mi := &file_ermite_merge_request_proto_msgTypes[18]
	1888	+	mi := &file_ermite_merge_request_proto_msgTypes[19]
1695	1889		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1696	1890		ms.StoreMessageInfo(mi)
1697	1891		}

@@ -1703,7 +1897,7 @@ func (x *CloseMergeRequestResponse) String() string {
1703	1897		func (*CloseMergeRequestResponse) ProtoMessage() {}
1704	1898
1705	1899		func (x *CloseMergeRequestResponse) ProtoReflect() protoreflect.Message {
1706		-	mi := &file_ermite_merge_request_proto_msgTypes[18]
	1900	+	mi := &file_ermite_merge_request_proto_msgTypes[19]
1707	1901		if x != nil {
1708	1902		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1709	1903		if ms.LoadMessageInfo() == nil {

@@ -1716,7 +1910,7 @@ func (x *CloseMergeRequestResponse) ProtoReflect() protoreflect.Message {
1716	1910
1717	1911		// Deprecated: Use CloseMergeRequestResponse.ProtoReflect.Descriptor instead.
1718	1912		func (*CloseMergeRequestResponse) Descriptor() ([]byte, []int) {
1719		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{18}
	1913	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{19}
1720	1914		}
1721	1915
1722	1916		func (x CloseMergeRequestResponse) GetMergeRequest() MergeRequest {

@@ -1752,7 +1946,7 @@ type MergeMergeRequestRequest struct {
1752	1946
1753	1947		func (x *MergeMergeRequestRequest) Reset() {
1754	1948		*x = MergeMergeRequestRequest{}
1755		-	mi := &file_ermite_merge_request_proto_msgTypes[19]
	1949	+	mi := &file_ermite_merge_request_proto_msgTypes[20]
1756	1950		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1757	1951		ms.StoreMessageInfo(mi)
1758	1952		}

@@ -1764,7 +1958,7 @@ func (x *MergeMergeRequestRequest) String() string {
1764	1958		func (*MergeMergeRequestRequest) ProtoMessage() {}
1765	1959
1766	1960		func (x *MergeMergeRequestRequest) ProtoReflect() protoreflect.Message {
1767		-	mi := &file_ermite_merge_request_proto_msgTypes[19]
	1961	+	mi := &file_ermite_merge_request_proto_msgTypes[20]
1768	1962		if x != nil {
1769	1963		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1770	1964		if ms.LoadMessageInfo() == nil {

@@ -1777,7 +1971,7 @@ func (x *MergeMergeRequestRequest) ProtoReflect() protoreflect.Message {
1777	1971
1778	1972		// Deprecated: Use MergeMergeRequestRequest.ProtoReflect.Descriptor instead.
1779	1973		func (*MergeMergeRequestRequest) Descriptor() ([]byte, []int) {
1780		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{19}
	1974	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{20}
1781	1975		}
1782	1976
1783	1977		func (x *MergeMergeRequestRequest) GetRepo() string {

@@ -1822,9 +2016,11 @@ type MergeMergeRequestResponse struct {
1822	2016		// merged_commit_id set to the new tip of the target branch and merge_mode
1823	2017		// set to the mode used.
1824	2018		MergeRequest *MergeRequest `protobuf:"bytes,1,opt,name=merge_request,json=mergeRequest,proto3" json:"merge_request,omitempty"`
1825		-	// SourceBranchDeleted is true when delete_source_branch was set and the
1826		-	// branch is gone. It is false when the deletion failed after the merge (the
1827		-	// branch moved in between, say): the merge stands and the branch is kept.
	2019	+	// SourceBranchDeleted is true when delete_source_branch was set: the server
	2020	+	// deletes the branch after answering. The deletion is skipped, and the
	2021	+	// branch kept, if the branch moved or another open merge request uses it
	2022	+	// by then; the merge stands either way. Watch reports the deletion with a
	2023	+	// Pushed event for the source branch.
1828	2024		SourceBranchDeleted bool `protobuf:"varint,2,opt,name=source_branch_deleted,json=sourceBranchDeleted,proto3" json:"source_branch_deleted,omitempty"`
1829	2025		unknownFields protoimpl.UnknownFields
1830	2026		sizeCache protoimpl.SizeCache

@@ -1832,7 +2028,7 @@ type MergeMergeRequestResponse struct {
1832	2028
1833	2029		func (x *MergeMergeRequestResponse) Reset() {
1834	2030		*x = MergeMergeRequestResponse{}
1835		-	mi := &file_ermite_merge_request_proto_msgTypes[20]
	2031	+	mi := &file_ermite_merge_request_proto_msgTypes[21]
1836	2032		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1837	2033		ms.StoreMessageInfo(mi)
1838	2034		}

@@ -1844,7 +2040,7 @@ func (x *MergeMergeRequestResponse) String() string {
1844	2040		func (*MergeMergeRequestResponse) ProtoMessage() {}
1845	2041
1846	2042		func (x *MergeMergeRequestResponse) ProtoReflect() protoreflect.Message {
1847		-	mi := &file_ermite_merge_request_proto_msgTypes[20]
	2043	+	mi := &file_ermite_merge_request_proto_msgTypes[21]
1848	2044		if x != nil {
1849	2045		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1850	2046		if ms.LoadMessageInfo() == nil {

@@ -1857,7 +2053,7 @@ func (x *MergeMergeRequestResponse) ProtoReflect() protoreflect.Message {
1857	2053
1858	2054		// Deprecated: Use MergeMergeRequestResponse.ProtoReflect.Descriptor instead.
1859	2055		func (*MergeMergeRequestResponse) Descriptor() ([]byte, []int) {
1860		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{20}
	2056	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{21}
1861	2057		}
1862	2058
1863	2059		func (x MergeMergeRequestResponse) GetMergeRequest() MergeRequest {

@@ -1891,7 +2087,7 @@ type MarkReadRequest struct {
1891	2087
1892	2088		func (x *MarkReadRequest) Reset() {
1893	2089		*x = MarkReadRequest{}
1894		-	mi := &file_ermite_merge_request_proto_msgTypes[21]
	2090	+	mi := &file_ermite_merge_request_proto_msgTypes[22]
1895	2091		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1896	2092		ms.StoreMessageInfo(mi)
1897	2093		}

@@ -1903,7 +2099,7 @@ func (x *MarkReadRequest) String() string {
1903	2099		func (*MarkReadRequest) ProtoMessage() {}
1904	2100
1905	2101		func (x *MarkReadRequest) ProtoReflect() protoreflect.Message {
1906		-	mi := &file_ermite_merge_request_proto_msgTypes[21]
	2102	+	mi := &file_ermite_merge_request_proto_msgTypes[22]
1907	2103		if x != nil {
1908	2104		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1909	2105		if ms.LoadMessageInfo() == nil {

@@ -1916,7 +2112,7 @@ func (x *MarkReadRequest) ProtoReflect() protoreflect.Message {
1916	2112
1917	2113		// Deprecated: Use MarkReadRequest.ProtoReflect.Descriptor instead.
1918	2114		func (*MarkReadRequest) Descriptor() ([]byte, []int) {
1919		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{21}
	2115	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{22}
1920	2116		}
1921	2117
1922	2118		func (x *MarkReadRequest) GetRepo() string {

@@ -1949,7 +2145,7 @@ type MarkReadResponse struct {
1949	2145
1950	2146		func (x *MarkReadResponse) Reset() {
1951	2147		*x = MarkReadResponse{}
1952		-	mi := &file_ermite_merge_request_proto_msgTypes[22]
	2148	+	mi := &file_ermite_merge_request_proto_msgTypes[23]
1953	2149		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1954	2150		ms.StoreMessageInfo(mi)
1955	2151		}

@@ -1961,7 +2157,7 @@ func (x *MarkReadResponse) String() string {
1961	2157		func (*MarkReadResponse) ProtoMessage() {}
1962	2158
1963	2159		func (x *MarkReadResponse) ProtoReflect() protoreflect.Message {
1964		-	mi := &file_ermite_merge_request_proto_msgTypes[22]
	2160	+	mi := &file_ermite_merge_request_proto_msgTypes[23]
1965	2161		if x != nil {
1966	2162		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1967	2163		if ms.LoadMessageInfo() == nil {

@@ -1974,14 +2170,24 @@ func (x *MarkReadResponse) ProtoReflect() protoreflect.Message {
1974	2170
1975	2171		// Deprecated: Use MarkReadResponse.ProtoReflect.Descriptor instead.
1976	2172		func (*MarkReadResponse) Descriptor() ([]byte, []int) {
1977		-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{22}
	2173	+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{23}
1978	2174		}
1979	2175
1980	2176		var File_ermite_merge_request_proto protoreflect.FileDescriptor
1981	2177
1982	2178		const file_ermite_merge_request_proto_rawDesc = "" +
1983	2179		"\n" +
1984		-	"\x1aermite/merge_request.proto\x12\x06ermite\x1a\x10ermite/git.proto\x1a\x12ermite/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xf0\x03\n" +
	2180	+	"\x1aermite/merge_request.proto\x12\x06ermite\x1a\x10ermite/git.proto\x1a\x12ermite/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xce\x02\n" +
	2181	+	"\fMergeability\x12/\n" +
	2182	+	"\x05state\x18\x01 \x01(\x0e2\x19.ermite.MergeabilityStateR\x05state\x12\x1b\n" +
	2183	+	"\ttarget_id\x18\x02 \x01(\tR\btargetId\x12\x17\n" +
	2184	+	"\ahead_id\x18\x03 \x01(\tR\x06headId\x12\x16\n" +
	2185	+	"\x06behind\x18\x04 \x01(\x05R\x06behind\x12#\n" +
	2186	+	"\rbehind_capped\x18\x05 \x01(\bR\fbehindCapped\x12%\n" +
	2187	+	"\x0econflict_paths\x18\x06 \x03(\tR\rconflictPaths\x128\n" +
	2188	+	"\x18conflict_paths_truncated\x18\a \x01(\bR\x16conflictPathsTruncated\x129\n" +
	2189	+	"\n" +
	2190	+	"checked_at\x18\b \x01(\v2\x1a.google.protobuf.TimestampR\tcheckedAt\"\xaa\x04\n" +
1985	2191		"\fMergeRequest\x12\x12\n" +
1986	2192		"\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" +
1987	2193		"\x06number\x18\x02 \x01(\x03R\x06number\x12\x14\n" +

@@ -1999,7 +2205,8 @@ const file_ermite_merge_request_proto_rawDesc = "" +
1999	2205		"\ahead_id\x18\v \x01(\tR\x06headId\x12(\n" +
2000	2206		"\x10merged_commit_id\x18\f \x01(\tR\x0emergedCommitId\x120\n" +
2001	2207		"\n" +
2002		-	"merge_mode\x18\r \x01(\x0e2\x11.ermite.MergeModeR\tmergeMode\"\xbf\x03\n" +
	2208	+	"merge_mode\x18\r \x01(\x0e2\x11.ermite.MergeModeR\tmergeMode\x128\n" +
	2209	+	"\fmergeability\x18\x0e \x01(\v2\x14.ermite.MergeabilityR\fmergeability\"\xbf\x03\n" +
2003	2210		"\aComment\x12\x0e\n" +
2004	2211		"\x02id\x18\x01 \x01(\tR\x02id\x12\x16\n" +
2005	2212		"\x06author\x18\x02 \x01(\tR\x06author\x12\x12\n" +

@@ -2129,7 +2336,13 @@ const file_ermite_merge_request_proto_rawDesc = "" +
2129	2336		"\aVerdict\x12\x17\n" +
2130	2337		"\x13VERDICT_UNSPECIFIED\x10\x00\x12\x13\n" +
2131	2338		"\x0fVERDICT_APPROVE\x10\x01\x12\x1d\n" +
2132		-	"\x19VERDICT_CHANGES_REQUESTED\x10\x022\xbf\x06\n" +
	2339	+	"\x19VERDICT_CHANGES_REQUESTED\x10\x02*\xbb\x01\n" +
	2340	+	"\x11MergeabilityState\x12\"\n" +
	2341	+	"\x1eMERGEABILITY_STATE_UNSPECIFIED\x10\x00\x12\x1f\n" +
	2342	+	"\x1bMERGEABILITY_STATE_CHECKING\x10\x01\x12!\n" +
	2343	+	"\x1dMERGEABILITY_STATE_UP_TO_DATE\x10\x02\x12\x1d\n" +
	2344	+	"\x19MERGEABILITY_STATE_BEHIND\x10\x03\x12\x1f\n" +
	2345	+	"\x1bMERGEABILITY_STATE_CONFLICT\x10\x042\xbf\x06\n" +
2133	2346		"\x13MergeRequestService\x12[\n" +
2134	2347		"\x12CreateMergeRequest\x12!.ermite.CreateMergeRequestRequest\x1a\".ermite.CreateMergeRequestResponse\x12X\n" +
2135	2348		"\x11ListMergeRequests\x12 .ermite.ListMergeRequestsRequest\x1a!.ermite.ListMergeRequestsResponse\x12R\n" +

@@ -2157,95 +2370,100 @@ func file_ermite_merge_request_proto_rawDescGZIP() []byte {
2157	2370		return file_ermite_merge_request_proto_rawDescData
2158	2371		}
2159	2372
2160		-	var file_ermite_merge_request_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
2161		-	var file_ermite_merge_request_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
	2373	+	var file_ermite_merge_request_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
	2374	+	var file_ermite_merge_request_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
2162	2375		var file_ermite_merge_request_proto_goTypes = []any{
2163	2376		(MergeRequestState)(0), // 0: ermite.MergeRequestState
2164	2377		(DiffSide)(0), // 1: ermite.DiffSide
2165	2378		(Verdict)(0), // 2: ermite.Verdict
2166		-	(*MergeRequest)(nil), // 3: ermite.MergeRequest
2167		-	(*Comment)(nil), // 4: ermite.Comment
2168		-	(*AuthorVerdict)(nil), // 5: ermite.AuthorVerdict
2169		-	(*CreateMergeRequestRequest)(nil), // 6: ermite.CreateMergeRequestRequest
2170		-	(*CreateMergeRequestResponse)(nil), // 7: ermite.CreateMergeRequestResponse
2171		-	(*ListMergeRequestsRequest)(nil), // 8: ermite.ListMergeRequestsRequest
2172		-	(*ListMergeRequestsResponse)(nil), // 9: ermite.ListMergeRequestsResponse
2173		-	(*GetMergeRequestRequest)(nil), // 10: ermite.GetMergeRequestRequest
2174		-	(*GetMergeRequestResponse)(nil), // 11: ermite.GetMergeRequestResponse
2175		-	(*AddCommentRequest)(nil), // 12: ermite.AddCommentRequest
2176		-	(*AddCommentResponse)(nil), // 13: ermite.AddCommentResponse
2177		-	(*EditCommentRequest)(nil), // 14: ermite.EditCommentRequest
2178		-	(*EditCommentResponse)(nil), // 15: ermite.EditCommentResponse
2179		-	(*DeleteCommentRequest)(nil), // 16: ermite.DeleteCommentRequest
2180		-	(*DeleteCommentResponse)(nil), // 17: ermite.DeleteCommentResponse
2181		-	(*ResolveCommentRequest)(nil), // 18: ermite.ResolveCommentRequest
2182		-	(*ResolveCommentResponse)(nil), // 19: ermite.ResolveCommentResponse
2183		-	(*CloseMergeRequestRequest)(nil), // 20: ermite.CloseMergeRequestRequest
2184		-	(*CloseMergeRequestResponse)(nil), // 21: ermite.CloseMergeRequestResponse
2185		-	(*MergeMergeRequestRequest)(nil), // 22: ermite.MergeMergeRequestRequest
2186		-	(*MergeMergeRequestResponse)(nil), // 23: ermite.MergeMergeRequestResponse
2187		-	(*MarkReadRequest)(nil), // 24: ermite.MarkReadRequest
2188		-	(*MarkReadResponse)(nil), // 25: ermite.MarkReadResponse
2189		-	(*timestamppb.Timestamp)(nil), // 26: google.protobuf.Timestamp
2190		-	(MergeMode)(0), // 27: ermite.MergeMode
2191		-	(*Commit)(nil), // 28: ermite.Commit
2192		-	(*DiffStats)(nil), // 29: ermite.DiffStats
2193		-	(*Diff)(nil), // 30: ermite.Diff
	2379	+	(MergeabilityState)(0), // 3: ermite.MergeabilityState
	2380	+	(*Mergeability)(nil), // 4: ermite.Mergeability
	2381	+	(*MergeRequest)(nil), // 5: ermite.MergeRequest
	2382	+	(*Comment)(nil), // 6: ermite.Comment
	2383	+	(*AuthorVerdict)(nil), // 7: ermite.AuthorVerdict
	2384	+	(*CreateMergeRequestRequest)(nil), // 8: ermite.CreateMergeRequestRequest
	2385	+	(*CreateMergeRequestResponse)(nil), // 9: ermite.CreateMergeRequestResponse
	2386	+	(*ListMergeRequestsRequest)(nil), // 10: ermite.ListMergeRequestsRequest
	2387	+	(*ListMergeRequestsResponse)(nil), // 11: ermite.ListMergeRequestsResponse
	2388	+	(*GetMergeRequestRequest)(nil), // 12: ermite.GetMergeRequestRequest
	2389	+	(*GetMergeRequestResponse)(nil), // 13: ermite.GetMergeRequestResponse
	2390	+	(*AddCommentRequest)(nil), // 14: ermite.AddCommentRequest
	2391	+	(*AddCommentResponse)(nil), // 15: ermite.AddCommentResponse
	2392	+	(*EditCommentRequest)(nil), // 16: ermite.EditCommentRequest
	2393	+	(*EditCommentResponse)(nil), // 17: ermite.EditCommentResponse
	2394	+	(*DeleteCommentRequest)(nil), // 18: ermite.DeleteCommentRequest
	2395	+	(*DeleteCommentResponse)(nil), // 19: ermite.DeleteCommentResponse
	2396	+	(*ResolveCommentRequest)(nil), // 20: ermite.ResolveCommentRequest
	2397	+	(*ResolveCommentResponse)(nil), // 21: ermite.ResolveCommentResponse
	2398	+	(*CloseMergeRequestRequest)(nil), // 22: ermite.CloseMergeRequestRequest
	2399	+	(*CloseMergeRequestResponse)(nil), // 23: ermite.CloseMergeRequestResponse
	2400	+	(*MergeMergeRequestRequest)(nil), // 24: ermite.MergeMergeRequestRequest
	2401	+	(*MergeMergeRequestResponse)(nil), // 25: ermite.MergeMergeRequestResponse
	2402	+	(*MarkReadRequest)(nil), // 26: ermite.MarkReadRequest
	2403	+	(*MarkReadResponse)(nil), // 27: ermite.MarkReadResponse
	2404	+	(*timestamppb.Timestamp)(nil), // 28: google.protobuf.Timestamp
	2405	+	(MergeMode)(0), // 29: ermite.MergeMode
	2406	+	(*Commit)(nil), // 30: ermite.Commit
	2407	+	(*DiffStats)(nil), // 31: ermite.DiffStats
	2408	+	(*Diff)(nil), // 32: ermite.Diff
2194	2409		}
2195	2410		var file_ermite_merge_request_proto_depIdxs = []int32{
2196		-	0, // 0: ermite.MergeRequest.state:type_name -> ermite.MergeRequestState
2197		-	26, // 1: ermite.MergeRequest.created_at:type_name -> google.protobuf.Timestamp
2198		-	26, // 2: ermite.MergeRequest.updated_at:type_name -> google.protobuf.Timestamp
2199		-	27, // 3: ermite.MergeRequest.merge_mode:type_name -> ermite.MergeMode
2200		-	1, // 4: ermite.Comment.side:type_name -> ermite.DiffSide
2201		-	26, // 5: ermite.Comment.created_at:type_name -> google.protobuf.Timestamp
2202		-	2, // 6: ermite.Comment.verdict:type_name -> ermite.Verdict
2203		-	26, // 7: ermite.Comment.edited_at:type_name -> google.protobuf.Timestamp
2204		-	2, // 8: ermite.AuthorVerdict.verdict:type_name -> ermite.Verdict
2205		-	26, // 9: ermite.AuthorVerdict.created_at:type_name -> google.protobuf.Timestamp
2206		-	3, // 10: ermite.CreateMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
2207		-	0, // 11: ermite.ListMergeRequestsRequest.state:type_name -> ermite.MergeRequestState
2208		-	3, // 12: ermite.ListMergeRequestsResponse.merge_requests:type_name -> ermite.MergeRequest
2209		-	3, // 13: ermite.GetMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
2210		-	28, // 14: ermite.GetMergeRequestResponse.commits:type_name -> ermite.Commit
2211		-	29, // 15: ermite.GetMergeRequestResponse.stats:type_name -> ermite.DiffStats
2212		-	30, // 16: ermite.GetMergeRequestResponse.diff:type_name -> ermite.Diff
2213		-	4, // 17: ermite.GetMergeRequestResponse.comments:type_name -> ermite.Comment
2214		-	5, // 18: ermite.GetMergeRequestResponse.verdicts:type_name -> ermite.AuthorVerdict
2215		-	1, // 19: ermite.AddCommentRequest.side:type_name -> ermite.DiffSide
2216		-	2, // 20: ermite.AddCommentRequest.verdict:type_name -> ermite.Verdict
2217		-	4, // 21: ermite.AddCommentResponse.comment:type_name -> ermite.Comment
2218		-	4, // 22: ermite.EditCommentResponse.comment:type_name -> ermite.Comment
2219		-	4, // 23: ermite.DeleteCommentResponse.comment:type_name -> ermite.Comment
2220		-	4, // 24: ermite.ResolveCommentResponse.comment:type_name -> ermite.Comment
2221		-	3, // 25: ermite.CloseMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
2222		-	27, // 26: ermite.MergeMergeRequestRequest.mode:type_name -> ermite.MergeMode
2223		-	3, // 27: ermite.MergeMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
2224		-	6, // 28: ermite.MergeRequestService.CreateMergeRequest:input_type -> ermite.CreateMergeRequestRequest
2225		-	8, // 29: ermite.MergeRequestService.ListMergeRequests:input_type -> ermite.ListMergeRequestsRequest
2226		-	10, // 30: ermite.MergeRequestService.GetMergeRequest:input_type -> ermite.GetMergeRequestRequest
2227		-	12, // 31: ermite.MergeRequestService.AddComment:input_type -> ermite.AddCommentRequest
2228		-	14, // 32: ermite.MergeRequestService.EditComment:input_type -> ermite.EditCommentRequest
2229		-	16, // 33: ermite.MergeRequestService.DeleteComment:input_type -> ermite.DeleteCommentRequest
2230		-	18, // 34: ermite.MergeRequestService.ResolveComment:input_type -> ermite.ResolveCommentRequest
2231		-	20, // 35: ermite.MergeRequestService.CloseMergeRequest:input_type -> ermite.CloseMergeRequestRequest
2232		-	22, // 36: ermite.MergeRequestService.MergeMergeRequest:input_type -> ermite.MergeMergeRequestRequest
2233		-	24, // 37: ermite.MergeRequestService.MarkRead:input_type -> ermite.MarkReadRequest
2234		-	7, // 38: ermite.MergeRequestService.CreateMergeRequest:output_type -> ermite.CreateMergeRequestResponse
2235		-	9, // 39: ermite.MergeRequestService.ListMergeRequests:output_type -> ermite.ListMergeRequestsResponse
2236		-	11, // 40: ermite.MergeRequestService.GetMergeRequest:output_type -> ermite.GetMergeRequestResponse
2237		-	13, // 41: ermite.MergeRequestService.AddComment:output_type -> ermite.AddCommentResponse
2238		-	15, // 42: ermite.MergeRequestService.EditComment:output_type -> ermite.EditCommentResponse
2239		-	17, // 43: ermite.MergeRequestService.DeleteComment:output_type -> ermite.DeleteCommentResponse
2240		-	19, // 44: ermite.MergeRequestService.ResolveComment:output_type -> ermite.ResolveCommentResponse
2241		-	21, // 45: ermite.MergeRequestService.CloseMergeRequest:output_type -> ermite.CloseMergeRequestResponse
2242		-	23, // 46: ermite.MergeRequestService.MergeMergeRequest:output_type -> ermite.MergeMergeRequestResponse
2243		-	25, // 47: ermite.MergeRequestService.MarkRead:output_type -> ermite.MarkReadResponse
2244		-	38, // [38:48] is the sub-list for method output_type
2245		-	28, // [28:38] is the sub-list for method input_type
2246		-	28, // [28:28] is the sub-list for extension type_name
2247		-	28, // [28:28] is the sub-list for extension extendee
2248		-	0, // [0:28] is the sub-list for field type_name
	2411	+	3, // 0: ermite.Mergeability.state:type_name -> ermite.MergeabilityState
	2412	+	28, // 1: ermite.Mergeability.checked_at:type_name -> google.protobuf.Timestamp
	2413	+	0, // 2: ermite.MergeRequest.state:type_name -> ermite.MergeRequestState
	2414	+	28, // 3: ermite.MergeRequest.created_at:type_name -> google.protobuf.Timestamp
	2415	+	28, // 4: ermite.MergeRequest.updated_at:type_name -> google.protobuf.Timestamp
	2416	+	29, // 5: ermite.MergeRequest.merge_mode:type_name -> ermite.MergeMode
	2417	+	4, // 6: ermite.MergeRequest.mergeability:type_name -> ermite.Mergeability
	2418	+	1, // 7: ermite.Comment.side:type_name -> ermite.DiffSide
	2419	+	28, // 8: ermite.Comment.created_at:type_name -> google.protobuf.Timestamp
	2420	+	2, // 9: ermite.Comment.verdict:type_name -> ermite.Verdict
	2421	+	28, // 10: ermite.Comment.edited_at:type_name -> google.protobuf.Timestamp
	2422	+	2, // 11: ermite.AuthorVerdict.verdict:type_name -> ermite.Verdict
	2423	+	28, // 12: ermite.AuthorVerdict.created_at:type_name -> google.protobuf.Timestamp
	2424	+	5, // 13: ermite.CreateMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
	2425	+	0, // 14: ermite.ListMergeRequestsRequest.state:type_name -> ermite.MergeRequestState
	2426	+	5, // 15: ermite.ListMergeRequestsResponse.merge_requests:type_name -> ermite.MergeRequest
	2427	+	5, // 16: ermite.GetMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
	2428	+	30, // 17: ermite.GetMergeRequestResponse.commits:type_name -> ermite.Commit
	2429	+	31, // 18: ermite.GetMergeRequestResponse.stats:type_name -> ermite.DiffStats
	2430	+	32, // 19: ermite.GetMergeRequestResponse.diff:type_name -> ermite.Diff
	2431	+	6, // 20: ermite.GetMergeRequestResponse.comments:type_name -> ermite.Comment
	2432	+	7, // 21: ermite.GetMergeRequestResponse.verdicts:type_name -> ermite.AuthorVerdict
	2433	+	1, // 22: ermite.AddCommentRequest.side:type_name -> ermite.DiffSide
	2434	+	2, // 23: ermite.AddCommentRequest.verdict:type_name -> ermite.Verdict
	2435	+	6, // 24: ermite.AddCommentResponse.comment:type_name -> ermite.Comment
	2436	+	6, // 25: ermite.EditCommentResponse.comment:type_name -> ermite.Comment
	2437	+	6, // 26: ermite.DeleteCommentResponse.comment:type_name -> ermite.Comment
	2438	+	6, // 27: ermite.ResolveCommentResponse.comment:type_name -> ermite.Comment
	2439	+	5, // 28: ermite.CloseMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
	2440	+	29, // 29: ermite.MergeMergeRequestRequest.mode:type_name -> ermite.MergeMode
	2441	+	5, // 30: ermite.MergeMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
	2442	+	8, // 31: ermite.MergeRequestService.CreateMergeRequest:input_type -> ermite.CreateMergeRequestRequest
	2443	+	10, // 32: ermite.MergeRequestService.ListMergeRequests:input_type -> ermite.ListMergeRequestsRequest
	2444	+	12, // 33: ermite.MergeRequestService.GetMergeRequest:input_type -> ermite.GetMergeRequestRequest
	2445	+	14, // 34: ermite.MergeRequestService.AddComment:input_type -> ermite.AddCommentRequest
	2446	+	16, // 35: ermite.MergeRequestService.EditComment:input_type -> ermite.EditCommentRequest
	2447	+	18, // 36: ermite.MergeRequestService.DeleteComment:input_type -> ermite.DeleteCommentRequest
	2448	+	20, // 37: ermite.MergeRequestService.ResolveComment:input_type -> ermite.ResolveCommentRequest
	2449	+	22, // 38: ermite.MergeRequestService.CloseMergeRequest:input_type -> ermite.CloseMergeRequestRequest
	2450	+	24, // 39: ermite.MergeRequestService.MergeMergeRequest:input_type -> ermite.MergeMergeRequestRequest
	2451	+	26, // 40: ermite.MergeRequestService.MarkRead:input_type -> ermite.MarkReadRequest
	2452	+	9, // 41: ermite.MergeRequestService.CreateMergeRequest:output_type -> ermite.CreateMergeRequestResponse
	2453	+	11, // 42: ermite.MergeRequestService.ListMergeRequests:output_type -> ermite.ListMergeRequestsResponse
	2454	+	13, // 43: ermite.MergeRequestService.GetMergeRequest:output_type -> ermite.GetMergeRequestResponse
	2455	+	15, // 44: ermite.MergeRequestService.AddComment:output_type -> ermite.AddCommentResponse
	2456	+	17, // 45: ermite.MergeRequestService.EditComment:output_type -> ermite.EditCommentResponse
	2457	+	19, // 46: ermite.MergeRequestService.DeleteComment:output_type -> ermite.DeleteCommentResponse
	2458	+	21, // 47: ermite.MergeRequestService.ResolveComment:output_type -> ermite.ResolveCommentResponse
	2459	+	23, // 48: ermite.MergeRequestService.CloseMergeRequest:output_type -> ermite.CloseMergeRequestResponse
	2460	+	25, // 49: ermite.MergeRequestService.MergeMergeRequest:output_type -> ermite.MergeMergeRequestResponse
	2461	+	27, // 50: ermite.MergeRequestService.MarkRead:output_type -> ermite.MarkReadResponse
	2462	+	41, // [41:51] is the sub-list for method output_type
	2463	+	31, // [31:41] is the sub-list for method input_type
	2464	+	31, // [31:31] is the sub-list for extension type_name
	2465	+	31, // [31:31] is the sub-list for extension extendee
	2466	+	0, // [0:31] is the sub-list for field type_name
2249	2467		}
2250	2468
2251	2469		func init() { file_ermite_merge_request_proto_init() }

@@ -2260,8 +2478,8 @@ func file_ermite_merge_request_proto_init() {
2260	2478		File: protoimpl.DescBuilder{
2261	2479		GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
2262	2480		RawDescriptor: unsafe.Slice(unsafe.StringData(file_ermite_merge_request_proto_rawDesc), len(file_ermite_merge_request_proto_rawDesc)),
2263		-	NumEnums: 3,
2264		-	NumMessages: 23,
	2481	+	NumEnums: 4,
	2482	+	NumMessages: 24,
2265	2483		NumExtensions: 0,
2266	2484		NumServices: 1,
2267	2485		},

 	return file_ermite_merge_request_proto_rawDescGZIP(), []int{2}
 }
+// MergeabilityState tells whether the head of an open merge request can be
+// merged into its target.
+type MergeabilityState int32
+const (
+	// Not set.
+	MergeabilityState_MERGEABILITY_STATE_UNSPECIFIED MergeabilityState = 0
+	// The server has no result yet for the current tips of both branches. It
+	// is replaced by another state when the check completes.
+	MergeabilityState_MERGEABILITY_STATE_CHECKING MergeabilityState = 1
+	// The target is an ancestor of the head: every mode can merge.
+	MergeabilityState_MERGEABILITY_STATE_UP_TO_DATE MergeabilityState = 2
+	// The target has commits the head lacks, but the head merges cleanly:
+	// squash and merge commit can merge, fast-forward cannot.
+	MergeabilityState_MERGEABILITY_STATE_BEHIND MergeabilityState = 3
+	// The head does not merge cleanly into the target, or the branches share no
+	// history: no mode can merge.
+	MergeabilityState_MERGEABILITY_STATE_CONFLICT MergeabilityState = 4
+)
+// Enum value maps for MergeabilityState.
+var (
+	MergeabilityState_name = map[int32]string{
+		0: "MERGEABILITY_STATE_UNSPECIFIED",
+		1: "MERGEABILITY_STATE_CHECKING",
+		2: "MERGEABILITY_STATE_UP_TO_DATE",
+		3: "MERGEABILITY_STATE_BEHIND",
+		4: "MERGEABILITY_STATE_CONFLICT",
+	}
+	MergeabilityState_value = map[string]int32{
+		"MERGEABILITY_STATE_UNSPECIFIED": 0,
+		"MERGEABILITY_STATE_CHECKING":    1,
+		"MERGEABILITY_STATE_UP_TO_DATE":  2,
+		"MERGEABILITY_STATE_BEHIND":      3,
+		"MERGEABILITY_STATE_CONFLICT":    4,
+	}
+)
+func (x MergeabilityState) Enum() *MergeabilityState {
+	p := new(MergeabilityState)
+	*p = x
+	return p
+}
+func (x MergeabilityState) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+func (MergeabilityState) Descriptor() protoreflect.EnumDescriptor {
+	return file_ermite_merge_request_proto_enumTypes[3].Descriptor()
+}
+func (MergeabilityState) Type() protoreflect.EnumType {
+	return &file_ermite_merge_request_proto_enumTypes[3]
+}
+func (x MergeabilityState) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+// Deprecated: Use MergeabilityState.Descriptor instead.
+func (MergeabilityState) EnumDescriptor() ([]byte, []int) {
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{3}
+}
+// Mergeability is the result of checking an open merge request against the
+// tips of its branches.
+type Mergeability struct {
+	state protoimpl.MessageState `protogen:"open.v1"`
+	// State is the result.
+	State MergeabilityState `protobuf:"varint,1,opt,name=state,proto3,enum=ermite.MergeabilityState" json:"state,omitempty"`
+	// TargetId is the commit the target branch pointed to when checked. Empty
+	// while CHECKING.
+	TargetId string `protobuf:"bytes,2,opt,name=target_id,json=targetId,proto3" json:"target_id,omitempty"`
+	// HeadId is the commit the source branch pointed to when checked. Empty
+	// while CHECKING.
+	HeadId string `protobuf:"bytes,3,opt,name=head_id,json=headId,proto3" json:"head_id,omitempty"`
+	// Behind is the number of commits of the target that the head lacks. Set
+	// only when state is BEHIND.
+	Behind int32 `protobuf:"varint,4,opt,name=behind,proto3" json:"behind,omitempty"`
+	// BehindCapped says that Behind is a lower bound: the server stops counting
+	// at 1,000.
+	BehindCapped bool `protobuf:"varint,5,opt,name=behind_capped,json=behindCapped,proto3" json:"behind_capped,omitempty"`
+	// ConflictPaths are the paths that conflict, at most 20. Set only when
+	// state is CONFLICT; empty when the branches share no history.
+	ConflictPaths []string `protobuf:"bytes,6,rep,name=conflict_paths,json=conflictPaths,proto3" json:"conflict_paths,omitempty"`
+	// ConflictPathsTruncated says that more paths conflict than listed.
+	ConflictPathsTruncated bool `protobuf:"varint,7,opt,name=conflict_paths_truncated,json=conflictPathsTruncated,proto3" json:"conflict_paths_truncated,omitempty"`
+	// CheckedAt is when the server computed the result. Unset while CHECKING.
+	CheckedAt     *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=checked_at,json=checkedAt,proto3" json:"checked_at,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+func (x *Mergeability) Reset() {
+	*x = Mergeability{}
+	mi := &file_ermite_merge_request_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+func (x *Mergeability) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+func (*Mergeability) ProtoMessage() {}
+func (x *Mergeability) ProtoReflect() protoreflect.Message {
+	mi := &file_ermite_merge_request_proto_msgTypes[0]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+// Deprecated: Use Mergeability.ProtoReflect.Descriptor instead.
+func (*Mergeability) Descriptor() ([]byte, []int) {
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{0}
+}
+func (x *Mergeability) GetState() MergeabilityState {
+	if x != nil {
+		return x.State
+	}
+	return MergeabilityState_MERGEABILITY_STATE_UNSPECIFIED
+}
+func (x *Mergeability) GetTargetId() string {
+	if x != nil {
+		return x.TargetId
+	}
+	return ""
+}
+func (x *Mergeability) GetHeadId() string {
+	if x != nil {
+		return x.HeadId
+	}
+	return ""
+}
+func (x *Mergeability) GetBehind() int32 {
+	if x != nil {
+		return x.Behind
+	}
+	return 0
+}
+func (x *Mergeability) GetBehindCapped() bool {
+	if x != nil {
+		return x.BehindCapped
+	}
+	return false
+}
+func (x *Mergeability) GetConflictPaths() []string {
+	if x != nil {
+		return x.ConflictPaths
+	}
+	return nil
+}
+func (x *Mergeability) GetConflictPathsTruncated() bool {
+	if x != nil {
+		return x.ConflictPathsTruncated
+	}
+	return false
+}
+func (x *Mergeability) GetCheckedAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.CheckedAt
+	}
+	return nil
+}
 // MergeRequest asks to merge one branch of a repository into another branch
 // of the same repository. It is about a branch, not about who wrote it.
 type MergeRequest struct {
 	// merged or closed it is the head at that moment.
 	HeadId string `protobuf:"bytes,11,opt,name=head_id,json=headId,proto3" json:"head_id,omitempty"`
 	// MergedCommitId is the id of the commit the target branch points to after
-	// the merge: the head for a fast-forward, the new commit for a squash.
+	// the merge: the head for a fast-forward, the new commit for a squash or a
+	// merge commit.
 	// Empty unless state is MERGED.
 	MergedCommitId string `protobuf:"bytes,12,opt,name=merged_commit_id,json=mergedCommitId,proto3" json:"merged_commit_id,omitempty"`
 	// MergeMode is how the merge request was merged. MERGE_MODE_UNSPECIFIED
 	// unless state is MERGED.
-	MergeMode     MergeMode `protobuf:"varint,13,opt,name=merge_mode,json=mergeMode,proto3,enum=ermite.MergeMode" json:"merge_mode,omitempty"`
+	MergeMode MergeMode `protobuf:"varint,13,opt,name=merge_mode,json=mergeMode,proto3,enum=ermite.MergeMode" json:"merge_mode,omitempty"`
+	// Mergeability tells whether the head can be merged into the target. Set
+	// while the merge request is OPEN, with state CHECKING until the server has
+	// a result for the current tips; never set once merged or closed. It is a
+	// hint: MergeMergeRequest checks again. Set only by servers with the
+	// "merge_requests.mergeability" feature.
+	Mergeability  *Mergeability `protobuf:"bytes,14,opt,name=mergeability,proto3" json:"mergeability,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 func (x *MergeRequest) Reset() {
 	*x = MergeRequest{}
-	mi := &file_ermite_merge_request_proto_msgTypes[0]
+	mi := &file_ermite_merge_request_proto_msgTypes[1]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*MergeRequest) ProtoMessage() {}
 func (x *MergeRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[0]
+	mi := &file_ermite_merge_request_proto_msgTypes[1]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use MergeRequest.ProtoReflect.Descriptor instead.
 func (*MergeRequest) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{0}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{1}
 }
 func (x *MergeRequest) GetRepo() string {
 	return MergeMode_MERGE_MODE_UNSPECIFIED
 }
+func (x *MergeRequest) GetMergeability() *Mergeability {
+	if x != nil {
+		return x.Mergeability
+	}
+	return nil
+}
 // Comment is a note on a merge request, either general or attached to a line
 // of its diff.
 type Comment struct {
 func (x *Comment) Reset() {
 	*x = Comment{}
-	mi := &file_ermite_merge_request_proto_msgTypes[1]
+	mi := &file_ermite_merge_request_proto_msgTypes[2]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*Comment) ProtoMessage() {}
 func (x *Comment) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[1]
+	mi := &file_ermite_merge_request_proto_msgTypes[2]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use Comment.ProtoReflect.Descriptor instead.
 func (*Comment) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{1}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{2}
 }
 func (x *Comment) GetId() string {
 func (x *AuthorVerdict) Reset() {
 	*x = AuthorVerdict{}
-	mi := &file_ermite_merge_request_proto_msgTypes[2]
+	mi := &file_ermite_merge_request_proto_msgTypes[3]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*AuthorVerdict) ProtoMessage() {}
 func (x *AuthorVerdict) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[2]
+	mi := &file_ermite_merge_request_proto_msgTypes[3]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use AuthorVerdict.ProtoReflect.Descriptor instead.
 func (*AuthorVerdict) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{2}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{3}
 }
 func (x *AuthorVerdict) GetAuthor() string {
 func (x *CreateMergeRequestRequest) Reset() {
 	*x = CreateMergeRequestRequest{}
-	mi := &file_ermite_merge_request_proto_msgTypes[3]
+	mi := &file_ermite_merge_request_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*CreateMergeRequestRequest) ProtoMessage() {}
 func (x *CreateMergeRequestRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[3]
+	mi := &file_ermite_merge_request_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use CreateMergeRequestRequest.ProtoReflect.Descriptor instead.
 func (*CreateMergeRequestRequest) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{3}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{4}
 }
 func (x *CreateMergeRequestRequest) GetRepo() string {
 func (x *CreateMergeRequestResponse) Reset() {
 	*x = CreateMergeRequestResponse{}
-	mi := &file_ermite_merge_request_proto_msgTypes[4]
+	mi := &file_ermite_merge_request_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*CreateMergeRequestResponse) ProtoMessage() {}
 func (x *CreateMergeRequestResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[4]
+	mi := &file_ermite_merge_request_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use CreateMergeRequestResponse.ProtoReflect.Descriptor instead.
 func (*CreateMergeRequestResponse) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{4}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{5}
 }
 func (x *CreateMergeRequestResponse) GetMergeRequest() *MergeRequest {
 func (x *ListMergeRequestsRequest) Reset() {
 	*x = ListMergeRequestsRequest{}
-	mi := &file_ermite_merge_request_proto_msgTypes[5]
+	mi := &file_ermite_merge_request_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*ListMergeRequestsRequest) ProtoMessage() {}
 func (x *ListMergeRequestsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[5]
+	mi := &file_ermite_merge_request_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use ListMergeRequestsRequest.ProtoReflect.Descriptor instead.
 func (*ListMergeRequestsRequest) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{5}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{6}
 }
 func (x *ListMergeRequestsRequest) GetRepo() string {
 func (x *ListMergeRequestsResponse) Reset() {
 	*x = ListMergeRequestsResponse{}
-	mi := &file_ermite_merge_request_proto_msgTypes[6]
+	mi := &file_ermite_merge_request_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*ListMergeRequestsResponse) ProtoMessage() {}
 func (x *ListMergeRequestsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[6]
+	mi := &file_ermite_merge_request_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use ListMergeRequestsResponse.ProtoReflect.Descriptor instead.
 func (*ListMergeRequestsResponse) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{6}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{7}
 }
 func (x *ListMergeRequestsResponse) GetMergeRequests() []*MergeRequest {
 func (x *GetMergeRequestRequest) Reset() {
 	*x = GetMergeRequestRequest{}
-	mi := &file_ermite_merge_request_proto_msgTypes[7]
+	mi := &file_ermite_merge_request_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*GetMergeRequestRequest) ProtoMessage() {}
 func (x *GetMergeRequestRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[7]
+	mi := &file_ermite_merge_request_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use GetMergeRequestRequest.ProtoReflect.Descriptor instead.
 func (*GetMergeRequestRequest) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{7}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{8}
 }
 func (x *GetMergeRequestRequest) GetRepo() string {
 func (x *GetMergeRequestResponse) Reset() {
 	*x = GetMergeRequestResponse{}
-	mi := &file_ermite_merge_request_proto_msgTypes[8]
+	mi := &file_ermite_merge_request_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*GetMergeRequestResponse) ProtoMessage() {}
 func (x *GetMergeRequestResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[8]
+	mi := &file_ermite_merge_request_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use GetMergeRequestResponse.ProtoReflect.Descriptor instead.
 func (*GetMergeRequestResponse) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{8}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{9}
 }
 func (x *GetMergeRequestResponse) GetMergeRequest() *MergeRequest {
 func (x *AddCommentRequest) Reset() {
 	*x = AddCommentRequest{}
-	mi := &file_ermite_merge_request_proto_msgTypes[9]
+	mi := &file_ermite_merge_request_proto_msgTypes[10]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*AddCommentRequest) ProtoMessage() {}
 func (x *AddCommentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[9]
+	mi := &file_ermite_merge_request_proto_msgTypes[10]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use AddCommentRequest.ProtoReflect.Descriptor instead.
 func (*AddCommentRequest) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{9}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{10}
 }
 func (x *AddCommentRequest) GetRepo() string {
 func (x *AddCommentResponse) Reset() {
 	*x = AddCommentResponse{}
-	mi := &file_ermite_merge_request_proto_msgTypes[10]
+	mi := &file_ermite_merge_request_proto_msgTypes[11]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*AddCommentResponse) ProtoMessage() {}
 func (x *AddCommentResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[10]
+	mi := &file_ermite_merge_request_proto_msgTypes[11]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use AddCommentResponse.ProtoReflect.Descriptor instead.
 func (*AddCommentResponse) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{10}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{11}
 }
 func (x *AddCommentResponse) GetComment() *Comment {
 func (x *EditCommentRequest) Reset() {
 	*x = EditCommentRequest{}
-	mi := &file_ermite_merge_request_proto_msgTypes[11]
+	mi := &file_ermite_merge_request_proto_msgTypes[12]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*EditCommentRequest) ProtoMessage() {}
 func (x *EditCommentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[11]
+	mi := &file_ermite_merge_request_proto_msgTypes[12]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use EditCommentRequest.ProtoReflect.Descriptor instead.
 func (*EditCommentRequest) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{11}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{12}
 }
 func (x *EditCommentRequest) GetRepo() string {
 func (x *EditCommentResponse) Reset() {
 	*x = EditCommentResponse{}
-	mi := &file_ermite_merge_request_proto_msgTypes[12]
+	mi := &file_ermite_merge_request_proto_msgTypes[13]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*EditCommentResponse) ProtoMessage() {}
 func (x *EditCommentResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[12]
+	mi := &file_ermite_merge_request_proto_msgTypes[13]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use EditCommentResponse.ProtoReflect.Descriptor instead.
 func (*EditCommentResponse) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{12}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{13}
 }
 func (x *EditCommentResponse) GetComment() *Comment {
 func (x *DeleteCommentRequest) Reset() {
 	*x = DeleteCommentRequest{}
-	mi := &file_ermite_merge_request_proto_msgTypes[13]
+	mi := &file_ermite_merge_request_proto_msgTypes[14]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*DeleteCommentRequest) ProtoMessage() {}
 func (x *DeleteCommentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[13]
+	mi := &file_ermite_merge_request_proto_msgTypes[14]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use DeleteCommentRequest.ProtoReflect.Descriptor instead.
 func (*DeleteCommentRequest) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{13}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{14}
 }
 func (x *DeleteCommentRequest) GetRepo() string {
 func (x *DeleteCommentResponse) Reset() {
 	*x = DeleteCommentResponse{}
-	mi := &file_ermite_merge_request_proto_msgTypes[14]
+	mi := &file_ermite_merge_request_proto_msgTypes[15]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*DeleteCommentResponse) ProtoMessage() {}
 func (x *DeleteCommentResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[14]
+	mi := &file_ermite_merge_request_proto_msgTypes[15]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use DeleteCommentResponse.ProtoReflect.Descriptor instead.
 func (*DeleteCommentResponse) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{14}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{15}
 }
 func (x *DeleteCommentResponse) GetComment() *Comment {
 func (x *ResolveCommentRequest) Reset() {
 	*x = ResolveCommentRequest{}
-	mi := &file_ermite_merge_request_proto_msgTypes[15]
+	mi := &file_ermite_merge_request_proto_msgTypes[16]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*ResolveCommentRequest) ProtoMessage() {}
 func (x *ResolveCommentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[15]
+	mi := &file_ermite_merge_request_proto_msgTypes[16]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use ResolveCommentRequest.ProtoReflect.Descriptor instead.
 func (*ResolveCommentRequest) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{15}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{16}
 }
 func (x *ResolveCommentRequest) GetRepo() string {
 func (x *ResolveCommentResponse) Reset() {
 	*x = ResolveCommentResponse{}
-	mi := &file_ermite_merge_request_proto_msgTypes[16]
+	mi := &file_ermite_merge_request_proto_msgTypes[17]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*ResolveCommentResponse) ProtoMessage() {}
 func (x *ResolveCommentResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[16]
+	mi := &file_ermite_merge_request_proto_msgTypes[17]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use ResolveCommentResponse.ProtoReflect.Descriptor instead.
 func (*ResolveCommentResponse) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{16}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{17}
 }
 func (x *ResolveCommentResponse) GetComment() *Comment {
 func (x *CloseMergeRequestRequest) Reset() {
 	*x = CloseMergeRequestRequest{}
-	mi := &file_ermite_merge_request_proto_msgTypes[17]
+	mi := &file_ermite_merge_request_proto_msgTypes[18]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*CloseMergeRequestRequest) ProtoMessage() {}
 func (x *CloseMergeRequestRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[17]
+	mi := &file_ermite_merge_request_proto_msgTypes[18]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use CloseMergeRequestRequest.ProtoReflect.Descriptor instead.
 func (*CloseMergeRequestRequest) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{17}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{18}
 }
 func (x *CloseMergeRequestRequest) GetRepo() string {
 func (x *CloseMergeRequestResponse) Reset() {
 	*x = CloseMergeRequestResponse{}
-	mi := &file_ermite_merge_request_proto_msgTypes[18]
+	mi := &file_ermite_merge_request_proto_msgTypes[19]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*CloseMergeRequestResponse) ProtoMessage() {}
 func (x *CloseMergeRequestResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[18]
+	mi := &file_ermite_merge_request_proto_msgTypes[19]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use CloseMergeRequestResponse.ProtoReflect.Descriptor instead.
 func (*CloseMergeRequestResponse) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{18}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{19}
 }
 func (x *CloseMergeRequestResponse) GetMergeRequest() *MergeRequest {
 func (x *MergeMergeRequestRequest) Reset() {
 	*x = MergeMergeRequestRequest{}
-	mi := &file_ermite_merge_request_proto_msgTypes[19]
+	mi := &file_ermite_merge_request_proto_msgTypes[20]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*MergeMergeRequestRequest) ProtoMessage() {}
 func (x *MergeMergeRequestRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[19]
+	mi := &file_ermite_merge_request_proto_msgTypes[20]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use MergeMergeRequestRequest.ProtoReflect.Descriptor instead.
 func (*MergeMergeRequestRequest) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{19}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{20}
 }
 func (x *MergeMergeRequestRequest) GetRepo() string {
 	// merged_commit_id set to the new tip of the target branch and merge_mode
 	// set to the mode used.
 	MergeRequest *MergeRequest `protobuf:"bytes,1,opt,name=merge_request,json=mergeRequest,proto3" json:"merge_request,omitempty"`
-	// SourceBranchDeleted is true when delete_source_branch was set and the
+	// SourceBranchDeleted is true when delete_source_branch was set: the server
-	// branch is gone. It is false when the deletion failed after the merge (the
+	// deletes the branch after answering. The deletion is skipped, and the
-	// branch moved in between, say): the merge stands and the branch is kept.
+	// branch kept, if the branch moved or another open merge request uses it
+	// by then; the merge stands either way. Watch reports the deletion with a
+	// Pushed event for the source branch.
 	SourceBranchDeleted bool `protobuf:"varint,2,opt,name=source_branch_deleted,json=sourceBranchDeleted,proto3" json:"source_branch_deleted,omitempty"`
 	unknownFields       protoimpl.UnknownFields
 	sizeCache           protoimpl.SizeCache
 func (x *MergeMergeRequestResponse) Reset() {
 	*x = MergeMergeRequestResponse{}
-	mi := &file_ermite_merge_request_proto_msgTypes[20]
+	mi := &file_ermite_merge_request_proto_msgTypes[21]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*MergeMergeRequestResponse) ProtoMessage() {}
 func (x *MergeMergeRequestResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[20]
+	mi := &file_ermite_merge_request_proto_msgTypes[21]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use MergeMergeRequestResponse.ProtoReflect.Descriptor instead.
 func (*MergeMergeRequestResponse) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{20}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{21}
 }
 func (x *MergeMergeRequestResponse) GetMergeRequest() *MergeRequest {
 func (x *MarkReadRequest) Reset() {
 	*x = MarkReadRequest{}
-	mi := &file_ermite_merge_request_proto_msgTypes[21]
+	mi := &file_ermite_merge_request_proto_msgTypes[22]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*MarkReadRequest) ProtoMessage() {}
 func (x *MarkReadRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[21]
+	mi := &file_ermite_merge_request_proto_msgTypes[22]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use MarkReadRequest.ProtoReflect.Descriptor instead.
 func (*MarkReadRequest) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{21}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{22}
 }
 func (x *MarkReadRequest) GetRepo() string {
 func (x *MarkReadResponse) Reset() {
 	*x = MarkReadResponse{}
-	mi := &file_ermite_merge_request_proto_msgTypes[22]
+	mi := &file_ermite_merge_request_proto_msgTypes[23]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*MarkReadResponse) ProtoMessage() {}
 func (x *MarkReadResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_merge_request_proto_msgTypes[22]
+	mi := &file_ermite_merge_request_proto_msgTypes[23]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use MarkReadResponse.ProtoReflect.Descriptor instead.
 func (*MarkReadResponse) Descriptor() ([]byte, []int) {
-	return file_ermite_merge_request_proto_rawDescGZIP(), []int{22}
+	return file_ermite_merge_request_proto_rawDescGZIP(), []int{23}
 }
 var File_ermite_merge_request_proto protoreflect.FileDescriptor
 const file_ermite_merge_request_proto_rawDesc = "" +
 	"\n" +
-	"\x1aermite/merge_request.proto\x12\x06ermite\x1a\x10ermite/git.proto\x1a\x12ermite/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xf0\x03\n" +
+	"\x1aermite/merge_request.proto\x12\x06ermite\x1a\x10ermite/git.proto\x1a\x12ermite/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xce\x02\n" +
+	"\fMergeability\x12/\n" +
+	"\x05state\x18\x01 \x01(\x0e2\x19.ermite.MergeabilityStateR\x05state\x12\x1b\n" +
+	"\ttarget_id\x18\x02 \x01(\tR\btargetId\x12\x17\n" +
+	"\ahead_id\x18\x03 \x01(\tR\x06headId\x12\x16\n" +
+	"\x06behind\x18\x04 \x01(\x05R\x06behind\x12#\n" +
+	"\rbehind_capped\x18\x05 \x01(\bR\fbehindCapped\x12%\n" +
+	"\x0econflict_paths\x18\x06 \x03(\tR\rconflictPaths\x128\n" +
+	"\x18conflict_paths_truncated\x18\a \x01(\bR\x16conflictPathsTruncated\x129\n" +
+	"\n" +
+	"checked_at\x18\b \x01(\v2\x1a.google.protobuf.TimestampR\tcheckedAt\"\xaa\x04\n" +
 	"\fMergeRequest\x12\x12\n" +
 	"\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" +
 	"\x06number\x18\x02 \x01(\x03R\x06number\x12\x14\n" +
 	"\ahead_id\x18\v \x01(\tR\x06headId\x12(\n" +
 	"\x10merged_commit_id\x18\f \x01(\tR\x0emergedCommitId\x120\n" +
 	"\n" +
-	"merge_mode\x18\r \x01(\x0e2\x11.ermite.MergeModeR\tmergeMode\"\xbf\x03\n" +
+	"merge_mode\x18\r \x01(\x0e2\x11.ermite.MergeModeR\tmergeMode\x128\n" +
+	"\fmergeability\x18\x0e \x01(\v2\x14.ermite.MergeabilityR\fmergeability\"\xbf\x03\n" +
 	"\aComment\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x16\n" +
 	"\x06author\x18\x02 \x01(\tR\x06author\x12\x12\n" +
 	"\aVerdict\x12\x17\n" +
 	"\x13VERDICT_UNSPECIFIED\x10\x00\x12\x13\n" +
 	"\x0fVERDICT_APPROVE\x10\x01\x12\x1d\n" +
-	"\x19VERDICT_CHANGES_REQUESTED\x10\x022\xbf\x06\n" +
+	"\x19VERDICT_CHANGES_REQUESTED\x10\x02*\xbb\x01\n" +
+	"\x11MergeabilityState\x12\"\n" +
+	"\x1eMERGEABILITY_STATE_UNSPECIFIED\x10\x00\x12\x1f\n" +
+	"\x1bMERGEABILITY_STATE_CHECKING\x10\x01\x12!\n" +
+	"\x1dMERGEABILITY_STATE_UP_TO_DATE\x10\x02\x12\x1d\n" +
+	"\x19MERGEABILITY_STATE_BEHIND\x10\x03\x12\x1f\n" +
+	"\x1bMERGEABILITY_STATE_CONFLICT\x10\x042\xbf\x06\n" +
 	"\x13MergeRequestService\x12[\n" +
 	"\x12CreateMergeRequest\x12!.ermite.CreateMergeRequestRequest\x1a\".ermite.CreateMergeRequestResponse\x12X\n" +
 	"\x11ListMergeRequests\x12 .ermite.ListMergeRequestsRequest\x1a!.ermite.ListMergeRequestsResponse\x12R\n" +
 	return file_ermite_merge_request_proto_rawDescData
 }
-var file_ermite_merge_request_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
+var file_ermite_merge_request_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
-var file_ermite_merge_request_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
+var file_ermite_merge_request_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
 var file_ermite_merge_request_proto_goTypes = []any{
 	(MergeRequestState)(0),             // 0: ermite.MergeRequestState
 	(DiffSide)(0),                      // 1: ermite.DiffSide
 	(Verdict)(0),                       // 2: ermite.Verdict
-	(*MergeRequest)(nil),               // 3: ermite.MergeRequest
+	(MergeabilityState)(0),             // 3: ermite.MergeabilityState
-	(*Comment)(nil),                    // 4: ermite.Comment
+	(*Mergeability)(nil),               // 4: ermite.Mergeability
-	(*AuthorVerdict)(nil),              // 5: ermite.AuthorVerdict
+	(*MergeRequest)(nil),               // 5: ermite.MergeRequest
-	(*CreateMergeRequestRequest)(nil),  // 6: ermite.CreateMergeRequestRequest
+	(*Comment)(nil),                    // 6: ermite.Comment
-	(*CreateMergeRequestResponse)(nil), // 7: ermite.CreateMergeRequestResponse
+	(*AuthorVerdict)(nil),              // 7: ermite.AuthorVerdict
-	(*ListMergeRequestsRequest)(nil),   // 8: ermite.ListMergeRequestsRequest
+	(*CreateMergeRequestRequest)(nil),  // 8: ermite.CreateMergeRequestRequest
-	(*ListMergeRequestsResponse)(nil),  // 9: ermite.ListMergeRequestsResponse
+	(*CreateMergeRequestResponse)(nil), // 9: ermite.CreateMergeRequestResponse
-	(*GetMergeRequestRequest)(nil),     // 10: ermite.GetMergeRequestRequest
+	(*ListMergeRequestsRequest)(nil),   // 10: ermite.ListMergeRequestsRequest
-	(*GetMergeRequestResponse)(nil),    // 11: ermite.GetMergeRequestResponse
+	(*ListMergeRequestsResponse)(nil),  // 11: ermite.ListMergeRequestsResponse
-	(*AddCommentRequest)(nil),          // 12: ermite.AddCommentRequest
+	(*GetMergeRequestRequest)(nil),     // 12: ermite.GetMergeRequestRequest
-	(*AddCommentResponse)(nil),         // 13: ermite.AddCommentResponse
+	(*GetMergeRequestResponse)(nil),    // 13: ermite.GetMergeRequestResponse
-	(*EditCommentRequest)(nil),         // 14: ermite.EditCommentRequest
+	(*AddCommentRequest)(nil),          // 14: ermite.AddCommentRequest
-	(*EditCommentResponse)(nil),        // 15: ermite.EditCommentResponse
+	(*AddCommentResponse)(nil),         // 15: ermite.AddCommentResponse
-	(*DeleteCommentRequest)(nil),       // 16: ermite.DeleteCommentRequest
+	(*EditCommentRequest)(nil),         // 16: ermite.EditCommentRequest
-	(*DeleteCommentResponse)(nil),      // 17: ermite.DeleteCommentResponse
+	(*EditCommentResponse)(nil),        // 17: ermite.EditCommentResponse
-	(*ResolveCommentRequest)(nil),      // 18: ermite.ResolveCommentRequest
+	(*DeleteCommentRequest)(nil),       // 18: ermite.DeleteCommentRequest
-	(*ResolveCommentResponse)(nil),     // 19: ermite.ResolveCommentResponse
+	(*DeleteCommentResponse)(nil),      // 19: ermite.DeleteCommentResponse
-	(*CloseMergeRequestRequest)(nil),   // 20: ermite.CloseMergeRequestRequest
+	(*ResolveCommentRequest)(nil),      // 20: ermite.ResolveCommentRequest
-	(*CloseMergeRequestResponse)(nil),  // 21: ermite.CloseMergeRequestResponse
+	(*ResolveCommentResponse)(nil),     // 21: ermite.ResolveCommentResponse
-	(*MergeMergeRequestRequest)(nil),   // 22: ermite.MergeMergeRequestRequest
+	(*CloseMergeRequestRequest)(nil),   // 22: ermite.CloseMergeRequestRequest
-	(*MergeMergeRequestResponse)(nil),  // 23: ermite.MergeMergeRequestResponse
+	(*CloseMergeRequestResponse)(nil),  // 23: ermite.CloseMergeRequestResponse
-	(*MarkReadRequest)(nil),            // 24: ermite.MarkReadRequest
+	(*MergeMergeRequestRequest)(nil),   // 24: ermite.MergeMergeRequestRequest
-	(*MarkReadResponse)(nil),           // 25: ermite.MarkReadResponse
+	(*MergeMergeRequestResponse)(nil),  // 25: ermite.MergeMergeRequestResponse
-	(*timestamppb.Timestamp)(nil),      // 26: google.protobuf.Timestamp
+	(*MarkReadRequest)(nil),            // 26: ermite.MarkReadRequest
-	(MergeMode)(0),                     // 27: ermite.MergeMode
+	(*MarkReadResponse)(nil),           // 27: ermite.MarkReadResponse
-	(*Commit)(nil),                     // 28: ermite.Commit
+	(*timestamppb.Timestamp)(nil),      // 28: google.protobuf.Timestamp
-	(*DiffStats)(nil),                  // 29: ermite.DiffStats
+	(MergeMode)(0),                     // 29: ermite.MergeMode
-	(*Diff)(nil),                       // 30: ermite.Diff
+	(*Commit)(nil),                     // 30: ermite.Commit
+	(*DiffStats)(nil),                  // 31: ermite.DiffStats
+	(*Diff)(nil),                       // 32: ermite.Diff
 }
 var file_ermite_merge_request_proto_depIdxs = []int32{
-	0,  // 0: ermite.MergeRequest.state:type_name -> ermite.MergeRequestState
+	3,  // 0: ermite.Mergeability.state:type_name -> ermite.MergeabilityState
-	26, // 1: ermite.MergeRequest.created_at:type_name -> google.protobuf.Timestamp
+	28, // 1: ermite.Mergeability.checked_at:type_name -> google.protobuf.Timestamp
-	26, // 2: ermite.MergeRequest.updated_at:type_name -> google.protobuf.Timestamp
+	0,  // 2: ermite.MergeRequest.state:type_name -> ermite.MergeRequestState
-	27, // 3: ermite.MergeRequest.merge_mode:type_name -> ermite.MergeMode
+	28, // 3: ermite.MergeRequest.created_at:type_name -> google.protobuf.Timestamp
-	1,  // 4: ermite.Comment.side:type_name -> ermite.DiffSide
+	28, // 4: ermite.MergeRequest.updated_at:type_name -> google.protobuf.Timestamp
-	26, // 5: ermite.Comment.created_at:type_name -> google.protobuf.Timestamp
+	29, // 5: ermite.MergeRequest.merge_mode:type_name -> ermite.MergeMode
-	2,  // 6: ermite.Comment.verdict:type_name -> ermite.Verdict
+	4,  // 6: ermite.MergeRequest.mergeability:type_name -> ermite.Mergeability
-	26, // 7: ermite.Comment.edited_at:type_name -> google.protobuf.Timestamp
+	1,  // 7: ermite.Comment.side:type_name -> ermite.DiffSide
-	2,  // 8: ermite.AuthorVerdict.verdict:type_name -> ermite.Verdict
+	28, // 8: ermite.Comment.created_at:type_name -> google.protobuf.Timestamp
-	26, // 9: ermite.AuthorVerdict.created_at:type_name -> google.protobuf.Timestamp
+	2,  // 9: ermite.Comment.verdict:type_name -> ermite.Verdict
-	3,  // 10: ermite.CreateMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
+	28, // 10: ermite.Comment.edited_at:type_name -> google.protobuf.Timestamp
-	0,  // 11: ermite.ListMergeRequestsRequest.state:type_name -> ermite.MergeRequestState
+	2,  // 11: ermite.AuthorVerdict.verdict:type_name -> ermite.Verdict
-	3,  // 12: ermite.ListMergeRequestsResponse.merge_requests:type_name -> ermite.MergeRequest
+	28, // 12: ermite.AuthorVerdict.created_at:type_name -> google.protobuf.Timestamp
-	3,  // 13: ermite.GetMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
+	5,  // 13: ermite.CreateMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
-	28, // 14: ermite.GetMergeRequestResponse.commits:type_name -> ermite.Commit
+	0,  // 14: ermite.ListMergeRequestsRequest.state:type_name -> ermite.MergeRequestState
-	29, // 15: ermite.GetMergeRequestResponse.stats:type_name -> ermite.DiffStats
+	5,  // 15: ermite.ListMergeRequestsResponse.merge_requests:type_name -> ermite.MergeRequest
-	30, // 16: ermite.GetMergeRequestResponse.diff:type_name -> ermite.Diff
+	5,  // 16: ermite.GetMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
-	4,  // 17: ermite.GetMergeRequestResponse.comments:type_name -> ermite.Comment
+	30, // 17: ermite.GetMergeRequestResponse.commits:type_name -> ermite.Commit
-	5,  // 18: ermite.GetMergeRequestResponse.verdicts:type_name -> ermite.AuthorVerdict
+	31, // 18: ermite.GetMergeRequestResponse.stats:type_name -> ermite.DiffStats
-	1,  // 19: ermite.AddCommentRequest.side:type_name -> ermite.DiffSide
+	32, // 19: ermite.GetMergeRequestResponse.diff:type_name -> ermite.Diff
-	2,  // 20: ermite.AddCommentRequest.verdict:type_name -> ermite.Verdict
+	6,  // 20: ermite.GetMergeRequestResponse.comments:type_name -> ermite.Comment
-	4,  // 21: ermite.AddCommentResponse.comment:type_name -> ermite.Comment
+	7,  // 21: ermite.GetMergeRequestResponse.verdicts:type_name -> ermite.AuthorVerdict
-	4,  // 22: ermite.EditCommentResponse.comment:type_name -> ermite.Comment
+	1,  // 22: ermite.AddCommentRequest.side:type_name -> ermite.DiffSide
-	4,  // 23: ermite.DeleteCommentResponse.comment:type_name -> ermite.Comment
+	2,  // 23: ermite.AddCommentRequest.verdict:type_name -> ermite.Verdict
-	4,  // 24: ermite.ResolveCommentResponse.comment:type_name -> ermite.Comment
+	6,  // 24: ermite.AddCommentResponse.comment:type_name -> ermite.Comment
-	3,  // 25: ermite.CloseMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
+	6,  // 25: ermite.EditCommentResponse.comment:type_name -> ermite.Comment
-	27, // 26: ermite.MergeMergeRequestRequest.mode:type_name -> ermite.MergeMode
+	6,  // 26: ermite.DeleteCommentResponse.comment:type_name -> ermite.Comment
-	3,  // 27: ermite.MergeMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
+	6,  // 27: ermite.ResolveCommentResponse.comment:type_name -> ermite.Comment
-	6,  // 28: ermite.MergeRequestService.CreateMergeRequest:input_type -> ermite.CreateMergeRequestRequest
+	5,  // 28: ermite.CloseMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
-	8,  // 29: ermite.MergeRequestService.ListMergeRequests:input_type -> ermite.ListMergeRequestsRequest
+	29, // 29: ermite.MergeMergeRequestRequest.mode:type_name -> ermite.MergeMode
-	10, // 30: ermite.MergeRequestService.GetMergeRequest:input_type -> ermite.GetMergeRequestRequest
+	5,  // 30: ermite.MergeMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest
-	12, // 31: ermite.MergeRequestService.AddComment:input_type -> ermite.AddCommentRequest
+	8,  // 31: ermite.MergeRequestService.CreateMergeRequest:input_type -> ermite.CreateMergeRequestRequest
-	14, // 32: ermite.MergeRequestService.EditComment:input_type -> ermite.EditCommentRequest
+	10, // 32: ermite.MergeRequestService.ListMergeRequests:input_type -> ermite.ListMergeRequestsRequest
-	16, // 33: ermite.MergeRequestService.DeleteComment:input_type -> ermite.DeleteCommentRequest
+	12, // 33: ermite.MergeRequestService.GetMergeRequest:input_type -> ermite.GetMergeRequestRequest
-	18, // 34: ermite.MergeRequestService.ResolveComment:input_type -> ermite.ResolveCommentRequest
+	14, // 34: ermite.MergeRequestService.AddComment:input_type -> ermite.AddCommentRequest
-	20, // 35: ermite.MergeRequestService.CloseMergeRequest:input_type -> ermite.CloseMergeRequestRequest
+	16, // 35: ermite.MergeRequestService.EditComment:input_type -> ermite.EditCommentRequest
-	22, // 36: ermite.MergeRequestService.MergeMergeRequest:input_type -> ermite.MergeMergeRequestRequest
+	18, // 36: ermite.MergeRequestService.DeleteComment:input_type -> ermite.DeleteCommentRequest
-	24, // 37: ermite.MergeRequestService.MarkRead:input_type -> ermite.MarkReadRequest
+	20, // 37: ermite.MergeRequestService.ResolveComment:input_type -> ermite.ResolveCommentRequest
-	7,  // 38: ermite.MergeRequestService.CreateMergeRequest:output_type -> ermite.CreateMergeRequestResponse
+	22, // 38: ermite.MergeRequestService.CloseMergeRequest:input_type -> ermite.CloseMergeRequestRequest
-	9,  // 39: ermite.MergeRequestService.ListMergeRequests:output_type -> ermite.ListMergeRequestsResponse
+	24, // 39: ermite.MergeRequestService.MergeMergeRequest:input_type -> ermite.MergeMergeRequestRequest
-	11, // 40: ermite.MergeRequestService.GetMergeRequest:output_type -> ermite.GetMergeRequestResponse
+	26, // 40: ermite.MergeRequestService.MarkRead:input_type -> ermite.MarkReadRequest
-	13, // 41: ermite.MergeRequestService.AddComment:output_type -> ermite.AddCommentResponse
+	9,  // 41: ermite.MergeRequestService.CreateMergeRequest:output_type -> ermite.CreateMergeRequestResponse
-	15, // 42: ermite.MergeRequestService.EditComment:output_type -> ermite.EditCommentResponse
+	11, // 42: ermite.MergeRequestService.ListMergeRequests:output_type -> ermite.ListMergeRequestsResponse
-	17, // 43: ermite.MergeRequestService.DeleteComment:output_type -> ermite.DeleteCommentResponse
+	13, // 43: ermite.MergeRequestService.GetMergeRequest:output_type -> ermite.GetMergeRequestResponse
-	19, // 44: ermite.MergeRequestService.ResolveComment:output_type -> ermite.ResolveCommentResponse
+	15, // 44: ermite.MergeRequestService.AddComment:output_type -> ermite.AddCommentResponse
-	21, // 45: ermite.MergeRequestService.CloseMergeRequest:output_type -> ermite.CloseMergeRequestResponse
+	17, // 45: ermite.MergeRequestService.EditComment:output_type -> ermite.EditCommentResponse
-	23, // 46: ermite.MergeRequestService.MergeMergeRequest:output_type -> ermite.MergeMergeRequestResponse
+	19, // 46: ermite.MergeRequestService.DeleteComment:output_type -> ermite.DeleteCommentResponse
-	25, // 47: ermite.MergeRequestService.MarkRead:output_type -> ermite.MarkReadResponse
+	21, // 47: ermite.MergeRequestService.ResolveComment:output_type -> ermite.ResolveCommentResponse
-	38, // [38:48] is the sub-list for method output_type
+	23, // 48: ermite.MergeRequestService.CloseMergeRequest:output_type -> ermite.CloseMergeRequestResponse
-	28, // [28:38] is the sub-list for method input_type
+	25, // 49: ermite.MergeRequestService.MergeMergeRequest:output_type -> ermite.MergeMergeRequestResponse
-	28, // [28:28] is the sub-list for extension type_name
+	27, // 50: ermite.MergeRequestService.MarkRead:output_type -> ermite.MarkReadResponse
-	28, // [28:28] is the sub-list for extension extendee
+	41, // [41:51] is the sub-list for method output_type
-	0,  // [0:28] is the sub-list for field type_name
+	31, // [31:41] is the sub-list for method input_type
+	31, // [31:31] is the sub-list for extension type_name
+	31, // [31:31] is the sub-list for extension extendee
+	0,  // [0:31] is the sub-list for field type_name
 }
 func init() { file_ermite_merge_request_proto_init() }
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_ermite_merge_request_proto_rawDesc), len(file_ermite_merge_request_proto_rawDesc)),
-			NumEnums:      3,
+			NumEnums:      4,
-			NumMessages:   23,
+			NumMessages:   24,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

M gen/ermite/repo.pb.go +2 -2 generated file: collapsed

load diff

M gen/ermite/server.pb.go +4 -1 generated file: collapsed

load diff

M gen/ermite/types.pb.go +20 -7 generated file: collapsed

load diff

M gen_test.go +6 -0


@@ -114,6 +114,12 @@ func TestEnumNumbers(t *testing.T) {
114	114		if got := ermite.MergeMode_MERGE_MODE_SQUASH; got != 2 {
115	115		t.Errorf("MERGE_MODE_SQUASH = %d, want 2", got)
116	116		}
	117	+	if got := ermite.MergeMode_MERGE_MODE_MERGE_COMMIT; got != 3 {
	118	+	t.Errorf("MERGE_MODE_MERGE_COMMIT = %d, want 3", got)
	119	+	}
	120	+	if got := ermite.MergeabilityState_MERGEABILITY_STATE_CONFLICT; got != 4 {
	121	+	t.Errorf("MERGEABILITY_STATE_CONFLICT = %d, want 4", got)
	122	+	}
117	123		if got := ermite.MergeRequestState_MERGE_REQUEST_STATE_CLOSED; got != 3 {
118	124		t.Errorf("MERGE_REQUEST_STATE_CLOSED = %d, want 3", got)
119	125		}


@@ -114,6 +114,12 @@ func TestEnumNumbers(t *testing.T) {
114	if got := ermite.MergeMode_MERGE_MODE_SQUASH; got != 2 {	114		if got := ermite.MergeMode_MERGE_MODE_SQUASH; got != 2 {
115	t.Errorf("MERGE_MODE_SQUASH = %d, want 2", got)	115		t.Errorf("MERGE_MODE_SQUASH = %d, want 2", got)
116	}	116		}
		117	+	if got := ermite.MergeMode_MERGE_MODE_MERGE_COMMIT; got != 3 {
		118	+	t.Errorf("MERGE_MODE_MERGE_COMMIT = %d, want 3", got)
		119	+	}
		120	+	if got := ermite.MergeabilityState_MERGEABILITY_STATE_CONFLICT; got != 4 {
		121	+	t.Errorf("MERGEABILITY_STATE_CONFLICT = %d, want 4", got)
		122	+	}
117	if got := ermite.MergeRequestState_MERGE_REQUEST_STATE_CLOSED; got != 3 {	123		if got := ermite.MergeRequestState_MERGE_REQUEST_STATE_CLOSED; got != 3 {
118	t.Errorf("MERGE_REQUEST_STATE_CLOSED = %d, want 3", got)	124		t.Errorf("MERGE_REQUEST_STATE_CLOSED = %d, want 3", got)
119	}	125		}

M proto/ermite/event.proto +15 -0


@@ -132,6 +132,9 @@ message Event {
132	132		// IssueSubmitted: an issue is awaiting moderation. Delivered only on the
133	133		// "owner" topic, never on "home" or "repo:<name>", and carries no content.
134	134		IssueSubmitted issue_submitted = 21;
	135	+	// MergeRequestMergeability: the mergeability of an open merge request
	136	+	// changed.
	137	+	MergeRequestMergeability merge_request_mergeability = 22;
135	138		}
136	139		}
137	140

@@ -184,6 +187,18 @@ message MergeRequestMerged {
184	187		MergeRequest merge_request = 1;
185	188		}
186	189
	190	+	// MergeRequestMergeability reports the mergeability of an open merge request.
	191	+	// It is published when the state changes, or when a check settles a result
	192	+	// that readers had not seen yet (they saw CHECKING), not on every push.
	193	+	message MergeRequestMergeability {
	194	+	// Repo is the name of the repository.
	195	+	string repo = 1;
	196	+	// Number is the number of the merge request.
	197	+	int64 number = 2;
	198	+	// Mergeability is the new result.
	199	+	Mergeability mergeability = 3;
	200	+	}
	201	+
187	202		// MergeRequestClosed reports a merge request closed without merging.
188	203		message MergeRequestClosed {
189	204		// MergeRequest is the merge request after closing.


@@ -132,6 +132,9 @@ message Event {
132	// IssueSubmitted: an issue is awaiting moderation. Delivered only on the	132		// IssueSubmitted: an issue is awaiting moderation. Delivered only on the
133	// "owner" topic, never on "home" or "repo:<name>", and carries no content.	133		// "owner" topic, never on "home" or "repo:<name>", and carries no content.
134	IssueSubmitted issue_submitted = 21;	134		IssueSubmitted issue_submitted = 21;
		135	+	// MergeRequestMergeability: the mergeability of an open merge request
		136	+	// changed.
		137	+	MergeRequestMergeability merge_request_mergeability = 22;
135	}	138		}
136	}	139		}
137		140

@@ -184,6 +187,18 @@ message MergeRequestMerged {
184	MergeRequest merge_request = 1;	187		MergeRequest merge_request = 1;
185	}	188		}
186		189
		190	+	// MergeRequestMergeability reports the mergeability of an open merge request.
		191	+	// It is published when the state changes, or when a check settles a result
		192	+	// that readers had not seen yet (they saw CHECKING), not on every push.
		193	+	message MergeRequestMergeability {
		194	+	// Repo is the name of the repository.
		195	+	string repo = 1;
		196	+	// Number is the number of the merge request.
		197	+	int64 number = 2;
		198	+	// Mergeability is the new result.
		199	+	Mergeability mergeability = 3;
		200	+	}
		201	+
187	// MergeRequestClosed reports a merge request closed without merging.	202		// MergeRequestClosed reports a merge request closed without merging.
188	message MergeRequestClosed {	203		message MergeRequestClosed {
189	// MergeRequest is the merge request after closing.	204		// MergeRequest is the merge request after closing.

M proto/ermite/merge_request.proto +63 -7


@@ -44,6 +44,50 @@ enum Verdict {
44	44		VERDICT_CHANGES_REQUESTED = 2;
45	45		}
46	46
	47	+	// MergeabilityState tells whether the head of an open merge request can be
	48	+	// merged into its target.
	49	+	enum MergeabilityState {
	50	+	// Not set.
	51	+	MERGEABILITY_STATE_UNSPECIFIED = 0;
	52	+	// The server has no result yet for the current tips of both branches. It
	53	+	// is replaced by another state when the check completes.
	54	+	MERGEABILITY_STATE_CHECKING = 1;
	55	+	// The target is an ancestor of the head: every mode can merge.
	56	+	MERGEABILITY_STATE_UP_TO_DATE = 2;
	57	+	// The target has commits the head lacks, but the head merges cleanly:
	58	+	// squash and merge commit can merge, fast-forward cannot.
	59	+	MERGEABILITY_STATE_BEHIND = 3;
	60	+	// The head does not merge cleanly into the target, or the branches share no
	61	+	// history: no mode can merge.
	62	+	MERGEABILITY_STATE_CONFLICT = 4;
	63	+	}
	64	+
	65	+	// Mergeability is the result of checking an open merge request against the
	66	+	// tips of its branches.
	67	+	message Mergeability {
	68	+	// State is the result.
	69	+	MergeabilityState state = 1;
	70	+	// TargetId is the commit the target branch pointed to when checked. Empty
	71	+	// while CHECKING.
	72	+	string target_id = 2;
	73	+	// HeadId is the commit the source branch pointed to when checked. Empty
	74	+	// while CHECKING.
	75	+	string head_id = 3;
	76	+	// Behind is the number of commits of the target that the head lacks. Set
	77	+	// only when state is BEHIND.
	78	+	int32 behind = 4;
	79	+	// BehindCapped says that Behind is a lower bound: the server stops counting
	80	+	// at 1,000.
	81	+	bool behind_capped = 5;
	82	+	// ConflictPaths are the paths that conflict, at most 20. Set only when
	83	+	// state is CONFLICT; empty when the branches share no history.
	84	+	repeated string conflict_paths = 6;
	85	+	// ConflictPathsTruncated says that more paths conflict than listed.
	86	+	bool conflict_paths_truncated = 7;
	87	+	// CheckedAt is when the server computed the result. Unset while CHECKING.
	88	+	google.protobuf.Timestamp checked_at = 8;
	89	+	}
	90	+
47	91		// MergeRequest asks to merge one branch of a repository into another branch
48	92		// of the same repository. It is about a branch, not about who wrote it.
49	93		message MergeRequest {

@@ -81,12 +125,19 @@ message MergeRequest {
81	125		// merged or closed it is the head at that moment.
82	126		string head_id = 11;
83	127		// MergedCommitId is the id of the commit the target branch points to after
84		-	// the merge: the head for a fast-forward, the new commit for a squash.
	128	+	// the merge: the head for a fast-forward, the new commit for a squash or a
	129	+	// merge commit.
85	130		// Empty unless state is MERGED.
86	131		string merged_commit_id = 12;
87	132		// MergeMode is how the merge request was merged. MERGE_MODE_UNSPECIFIED
88	133		// unless state is MERGED.
89	134		MergeMode merge_mode = 13;
	135	+	// Mergeability tells whether the head can be merged into the target. Set
	136	+	// while the merge request is OPEN, with state CHECKING until the server has
	137	+	// a result for the current tips; never set once merged or closed. It is a
	138	+	// hint: MergeMergeRequest checks again. Set only by servers with the
	139	+	// "merge_requests.mergeability" feature.
	140	+	Mergeability mergeability = 14;
90	141		}
91	142
92	143		// Comment is a note on a merge request, either general or attached to a line

@@ -233,9 +284,12 @@ service MergeRequestService {
233	284		// never merged unseen. Fails with invalid_argument if head_id is empty or
234	285		// not a commit id, and with failed_precondition if the merge request is not
235	286		// open, if the source branch no longer points to head_id ("branch moved,
236		-	// read again"), if the target is not an ancestor of the head (rebase and
237		-	// push again), if the mode is not allowed by RepoSettings, or if a check
238		-	// fails and RepoSettings.failing_checks_block is set. Merges of one
	287	+	// read again"), if the mode is fast-forward and the target is not an
	288	+	// ancestor of the head (rebase and push again, or merge with squash or
	289	+	// merge commit), if the mode is squash or merge commit and the head
	290	+	// conflicts with the target or shares no history with it (rebase and push
	291	+	// again), if the mode is not allowed by RepoSettings, or if a check fails
	292	+	// and RepoSettings.failing_checks_block is set. Merges of one
239	293		// repository run one at a time. Repeating a call that succeeded fails with
240	294		// failed_precondition (not open). On success the server publishes
241	295		// MergeRequestMerged then Pushed for the target branch.

@@ -477,9 +531,11 @@ message MergeMergeRequestResponse {
477	531		// merged_commit_id set to the new tip of the target branch and merge_mode
478	532		// set to the mode used.
479	533		MergeRequest merge_request = 1;
480		-	// SourceBranchDeleted is true when delete_source_branch was set and the
481		-	// branch is gone. It is false when the deletion failed after the merge (the
482		-	// branch moved in between, say): the merge stands and the branch is kept.
	534	+	// SourceBranchDeleted is true when delete_source_branch was set: the server
	535	+	// deletes the branch after answering. The deletion is skipped, and the
	536	+	// branch kept, if the branch moved or another open merge request uses it
	537	+	// by then; the merge stands either way. Watch reports the deletion with a
	538	+	// Pushed event for the source branch.
483	539		bool source_branch_deleted = 2;
484	540		}
485	541


@@ -44,6 +44,50 @@ enum Verdict {
44		VERDICT_CHANGES_REQUESTED = 2;	44		VERDICT_CHANGES_REQUESTED = 2;
45		}	45		}
46			46
			47	+	// MergeabilityState tells whether the head of an open merge request can be
			48	+	// merged into its target.
			49	+	enum MergeabilityState {
			50	+	// Not set.
			51	+	MERGEABILITY_STATE_UNSPECIFIED = 0;
			52	+	// The server has no result yet for the current tips of both branches. It
			53	+	// is replaced by another state when the check completes.
			54	+	MERGEABILITY_STATE_CHECKING = 1;
			55	+	// The target is an ancestor of the head: every mode can merge.
			56	+	MERGEABILITY_STATE_UP_TO_DATE = 2;
			57	+	// The target has commits the head lacks, but the head merges cleanly:
			58	+	// squash and merge commit can merge, fast-forward cannot.
			59	+	MERGEABILITY_STATE_BEHIND = 3;
			60	+	// The head does not merge cleanly into the target, or the branches share no
			61	+	// history: no mode can merge.
			62	+	MERGEABILITY_STATE_CONFLICT = 4;
			63	+	}
			64	+
			65	+	// Mergeability is the result of checking an open merge request against the
			66	+	// tips of its branches.
			67	+	message Mergeability {
			68	+	// State is the result.
			69	+	MergeabilityState state = 1;
			70	+	// TargetId is the commit the target branch pointed to when checked. Empty
			71	+	// while CHECKING.
			72	+	string target_id = 2;
			73	+	// HeadId is the commit the source branch pointed to when checked. Empty
			74	+	// while CHECKING.
			75	+	string head_id = 3;
			76	+	// Behind is the number of commits of the target that the head lacks. Set
			77	+	// only when state is BEHIND.
			78	+	int32 behind = 4;
			79	+	// BehindCapped says that Behind is a lower bound: the server stops counting
			80	+	// at 1,000.
			81	+	bool behind_capped = 5;
			82	+	// ConflictPaths are the paths that conflict, at most 20. Set only when
			83	+	// state is CONFLICT; empty when the branches share no history.
			84	+	repeated string conflict_paths = 6;
			85	+	// ConflictPathsTruncated says that more paths conflict than listed.
			86	+	bool conflict_paths_truncated = 7;
			87	+	// CheckedAt is when the server computed the result. Unset while CHECKING.
			88	+	google.protobuf.Timestamp checked_at = 8;
			89	+	}
			90	+
47		// MergeRequest asks to merge one branch of a repository into another branch	91		// MergeRequest asks to merge one branch of a repository into another branch
48		// of the same repository. It is about a branch, not about who wrote it.	92		// of the same repository. It is about a branch, not about who wrote it.
49		message MergeRequest {	93		message MergeRequest {

@@ -81,12 +125,19 @@ message MergeRequest {
81		// merged or closed it is the head at that moment.	125		// merged or closed it is the head at that moment.
82		string head_id = 11;	126		string head_id = 11;
83		// MergedCommitId is the id of the commit the target branch points to after	127		// MergedCommitId is the id of the commit the target branch points to after
84	-	// the merge: the head for a fast-forward, the new commit for a squash.	128	+	// the merge: the head for a fast-forward, the new commit for a squash or a
			129	+	// merge commit.
85		// Empty unless state is MERGED.	130		// Empty unless state is MERGED.
86		string merged_commit_id = 12;	131		string merged_commit_id = 12;
87		// MergeMode is how the merge request was merged. MERGE_MODE_UNSPECIFIED	132		// MergeMode is how the merge request was merged. MERGE_MODE_UNSPECIFIED
88		// unless state is MERGED.	133		// unless state is MERGED.
89		MergeMode merge_mode = 13;	134		MergeMode merge_mode = 13;
			135	+	// Mergeability tells whether the head can be merged into the target. Set
			136	+	// while the merge request is OPEN, with state CHECKING until the server has
			137	+	// a result for the current tips; never set once merged or closed. It is a
			138	+	// hint: MergeMergeRequest checks again. Set only by servers with the
			139	+	// "merge_requests.mergeability" feature.
			140	+	Mergeability mergeability = 14;
90		}	141		}
91			142
92		// Comment is a note on a merge request, either general or attached to a line	143		// Comment is a note on a merge request, either general or attached to a line

@@ -233,9 +284,12 @@ service MergeRequestService {
233		// never merged unseen. Fails with invalid_argument if head_id is empty or	284		// never merged unseen. Fails with invalid_argument if head_id is empty or
234		// not a commit id, and with failed_precondition if the merge request is not	285		// not a commit id, and with failed_precondition if the merge request is not
235		// open, if the source branch no longer points to head_id ("branch moved,	286		// open, if the source branch no longer points to head_id ("branch moved,
236	-	// read again"), if the target is not an ancestor of the head (rebase and	287	+	// read again"), if the mode is fast-forward and the target is not an
237	-	// push again), if the mode is not allowed by RepoSettings, or if a check	288	+	// ancestor of the head (rebase and push again, or merge with squash or
238	-	// fails and RepoSettings.failing_checks_block is set. Merges of one	289	+	// merge commit), if the mode is squash or merge commit and the head
			290	+	// conflicts with the target or shares no history with it (rebase and push
			291	+	// again), if the mode is not allowed by RepoSettings, or if a check fails
			292	+	// and RepoSettings.failing_checks_block is set. Merges of one
239		// repository run one at a time. Repeating a call that succeeded fails with	293		// repository run one at a time. Repeating a call that succeeded fails with
240		// failed_precondition (not open). On success the server publishes	294		// failed_precondition (not open). On success the server publishes
241		// MergeRequestMerged then Pushed for the target branch.	295		// MergeRequestMerged then Pushed for the target branch.

@@ -477,9 +531,11 @@ message MergeMergeRequestResponse {
477		// merged_commit_id set to the new tip of the target branch and merge_mode	531		// merged_commit_id set to the new tip of the target branch and merge_mode
478		// set to the mode used.	532		// set to the mode used.
479		MergeRequest merge_request = 1;	533		MergeRequest merge_request = 1;
480	-	// SourceBranchDeleted is true when delete_source_branch was set and the	534	+	// SourceBranchDeleted is true when delete_source_branch was set: the server
481	-	// branch is gone. It is false when the deletion failed after the merge (the	535	+	// deletes the branch after answering. The deletion is skipped, and the
482	-	// branch moved in between, say): the merge stands and the branch is kept.	536	+	// branch kept, if the branch moved or another open merge request uses it
			537	+	// by then; the merge stands either way. Watch reports the deletion with a
			538	+	// Pushed event for the source branch.
483		bool source_branch_deleted = 2;	539		bool source_branch_deleted = 2;
484		}	540		}
485			541

M proto/ermite/repo.proto +2 -2


@@ -37,8 +37,8 @@ enum IssuesMode {
37	37		message RepoSettings {
38	38		// AllowedMergeModes are the modes with which a merge request of the
39	39		// repository may be merged. It is never empty in a response and has no
40		-	// duplicate. Both MERGE_MODE_FAST_FORWARD and MERGE_MODE_SQUASH are allowed
41		-	// by default. MERGE_MODE_UNSPECIFIED is rejected.
	40	+	// duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is
	41	+	// rejected.
42	42		repeated MergeMode allowed_merge_modes = 1;
43	43		// FailingChecksBlock says whether a merge request whose checks fail cannot be
44	44		// merged. It is true at creation of the repository and always stored


@@ -37,8 +37,8 @@ enum IssuesMode {
37		message RepoSettings {	37		message RepoSettings {
38		// AllowedMergeModes are the modes with which a merge request of the	38		// AllowedMergeModes are the modes with which a merge request of the
39		// repository may be merged. It is never empty in a response and has no	39		// repository may be merged. It is never empty in a response and has no
40	-	// duplicate. Both MERGE_MODE_FAST_FORWARD and MERGE_MODE_SQUASH are allowed	40	+	// duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is
41	-	// by default. MERGE_MODE_UNSPECIFIED is rejected.	41	+	// rejected.
42		repeated MergeMode allowed_merge_modes = 1;	42		repeated MergeMode allowed_merge_modes = 1;
43		// FailingChecksBlock says whether a merge request whose checks fail cannot be	43		// FailingChecksBlock says whether a merge request whose checks fail cannot be
44		// merged. It is true at creation of the repository and always stored	44		// merged. It is true at creation of the repository and always stored

M proto/ermite/server.proto +5 -2


@@ -13,7 +13,7 @@ service ServerService {
13	13		// it first to check compatibility.
14	14		rpc GetVersion(GetVersionRequest) returns (GetVersionResponse);
15	15		// GetSigningKey returns the public key with which the server signs the
16		-	// commits it creates (squash merges, see MergeMode). It needs no
	16	+	// commits it creates (squash and merge commits, see MergeMode). It needs no
17	17		// authentication: the key is public, and anyone verifying a commit needs it.
18	18		// Servers that implement it list "signing_key" in
19	19		// GetVersionResponse.features.

@@ -57,7 +57,10 @@ message GetVersionResponse {
57	57		// secrets, vars, environment, permissions and trusted fields and Run.trusted),
58	58		// "ci.dispatch" (RunService.DispatchWorkflow), "ci.concurrency"
59	59		// (CI_STATUS_PENDING and RunJob.concurrency_group), "ci.cache" (Job.cache)
60		-	// and "ci.artifacts" (JobArtifactService and ArtifactService).
	60	+	// and "ci.artifacts" (JobArtifactService and ArtifactService). The merge
	61	+	// request identifier "merge_requests.mergeability" covers
	62	+	// MergeRequest.mergeability, the MergeRequestMergeability event and
	63	+	// MERGE_MODE_MERGE_COMMIT.
61	64		repeated string features = 2;
62	65		}
63	66

   // it first to check compatibility.
   rpc GetVersion(GetVersionRequest) returns (GetVersionResponse);
   // GetSigningKey returns the public key with which the server signs the
-  // commits it creates (squash merges, see MergeMode). It needs no
+  // commits it creates (squash and merge commits, see MergeMode). It needs no
   // authentication: the key is public, and anyone verifying a commit needs it.
   // Servers that implement it list "signing_key" in
   // GetVersionResponse.features.
   // secrets, vars, environment, permissions and trusted fields and Run.trusted),
   // "ci.dispatch" (RunService.DispatchWorkflow), "ci.concurrency"
   // (CI_STATUS_PENDING and RunJob.concurrency_group), "ci.cache" (Job.cache)
-  // and "ci.artifacts" (JobArtifactService and ArtifactService).
+  // and "ci.artifacts" (JobArtifactService and ArtifactService). The merge
+  // request identifier "merge_requests.mergeability" covers
+  // MergeRequest.mergeability, the MergeRequestMergeability event and
+  // MERGE_MODE_MERGE_COMMIT.
   repeated string features = 2;
 }

M proto/ermite/types.proto +15 -5


@@ -40,9 +40,11 @@ message Commit {
40	40		CommitVerification verification = 7;
41	41		}
42	42
43		-	// MergeMode is how a merge request is merged. Both modes need the target to
44		-	// be an ancestor of the head: a branch behind its target is rebased by its
45		-	// author and pushed again, the server never rebases nor creates merge commits.
	43	+	// MergeMode is how a merge request is merged. Fast-forward needs the target
	44	+	// to be an ancestor of the head. Squash and merge commit need the head to
	45	+	// merge cleanly into the target, which holds when the branch is behind its
	46	+	// target without conflict. The server never rebases: a branch that conflicts
	47	+	// is rebased by its author and pushed again.
46	48		enum MergeMode {
47	49		// Not set. In MergeMergeRequestRequest.mode it means fast-forward. Rejected
48	50		// in RepoSettings.allowed_merge_modes. Returned on a merge request that was

@@ -51,11 +53,19 @@ enum MergeMode {
51	53		// The target branch moves to the head. No commit is created and the
52	54		// signatures of the branch's commits are kept.
53	55		MERGE_MODE_FAST_FORWARD = 1;
54		-	// One new commit is created with the tree of the head and the target as
55		-	// only parent, signed by the server's key (see ServerService.GetSigningKey).
	56	+	// One new commit is created with the tree of the merge of the head into the
	57	+	// target (the tree of the head when the target is its ancestor) and the
	58	+	// target tip as only parent, signed by the server's key (see ServerService.GetSigningKey).
56	59		// Its author is the author of the first commit of the branch, the other
57	60		// authors are added as "Co-authored-by:" trailers, and its message is the
58	61		// title, " (!<number>)", a blank line and the list of the squashed commits'
59	62		// summaries.
60	63		MERGE_MODE_SQUASH = 2;
	64	+	// One new commit is created with two parents, the target tip then the head,
	65	+	// and the tree of the merge. It is signed by the server's key (see
	66	+	// ServerService.GetSigningKey); its author and committer are the server
	67	+	// identity. Its message is "Merge branch '<source>' into <target> (!<n>)",
	68	+	// a blank line and the title. The signatures of the branch's commits are
	69	+	// kept. Needs the "merge_requests.mergeability" feature.
	70	+	MERGE_MODE_MERGE_COMMIT = 3;
61	71		}

   CommitVerification verification = 7;
 }
-// MergeMode is how a merge request is merged. Both modes need the target to
+// MergeMode is how a merge request is merged. Fast-forward needs the target
-// be an ancestor of the head: a branch behind its target is rebased by its
+// to be an ancestor of the head. Squash and merge commit need the head to
-// author and pushed again, the server never rebases nor creates merge commits.
+// merge cleanly into the target, which holds when the branch is behind its
+// target without conflict. The server never rebases: a branch that conflicts
+// is rebased by its author and pushed again.
 enum MergeMode {
   // Not set. In MergeMergeRequestRequest.mode it means fast-forward. Rejected
   // in RepoSettings.allowed_merge_modes. Returned on a merge request that was
   // The target branch moves to the head. No commit is created and the
   // signatures of the branch's commits are kept.
   MERGE_MODE_FAST_FORWARD = 1;
-  // One new commit is created with the tree of the head and the target as
+  // One new commit is created with the tree of the merge of the head into the
-  // only parent, signed by the server's key (see ServerService.GetSigningKey).
+  // target (the tree of the head when the target is its ancestor) and the
+  // target tip as only parent, signed by the server's key (see ServerService.GetSigningKey).
   // Its author is the author of the first commit of the branch, the other
   // authors are added as "Co-authored-by:" trailers, and its message is the
   // title, " (!<number>)", a blank line and the list of the squashed commits'
   // summaries.
   MERGE_MODE_SQUASH = 2;
+  // One new commit is created with two parents, the target tip then the head,
+  // and the tree of the merge. It is signed by the server's key (see
+  // ServerService.GetSigningKey); its author and committer are the server
+  // identity. Its message is "Merge branch '<source>' into <target> (!<n>)",
+  // a blank line and the title. The signatures of the branch's commits are
+  // kept. Needs the "merge_requests.mergeability" feature.
+  MERGE_MODE_MERGE_COMMIT = 3;
 }


@@ -5,10 +5,10 @@
5	5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|
6	6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|
7	7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|
8		-	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest`, `MarkRead` \|
	8	+	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest` (modes fast-forward, squash, merge commit), `MarkRead`. Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` when it changes (feature `merge_requests.mergeability`) \|
9	9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|
10	10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|
11		-	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content) \|
	11	+	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content). Event 22: `merge_request_mergeability` \|
12	12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|
13	13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|
14	14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|


@@ -5,10 +5,10 @@
5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|	5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|
6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|	6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|
7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|	7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|
8	-	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest`, `MarkRead` \|	8	+	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest` (modes fast-forward, squash, merge commit), `MarkRead`. Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` when it changes (feature `merge_requests.mergeability`) \|
9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|	9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|
10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|	10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|
11	-	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content) \|	11	+	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content). Event 22: `merge_request_mergeability` \|
12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|	12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|
13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|	13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|
14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|	14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|

Merge settings

Comments0 open / 0

Commit	Subject	Author	Date	Signature
6d3fb04	docs(proto): a squash commit takes the tree of the merge into the target	brice	3d ago	GPG Verified
5404729	docs(proto): the source branch is deleted after the merge answer	brice	3d ago	GPG Verified
788238f	docs(proto): allow every merge mode by default	brice	3d ago	GPG Verified
c671ff4	feat(proto): merge request mergeability, its Watch event and the merge commit mode	brice	3d ago	GPG Verified