Remove AcceptMergeRequestResultKind.RebaseFailed status (#19)

Author: pepakriz

src/MergeRequestAcceptor.ts

@@ -16,7 +16,6 @@ export enum AcceptMergeRequestResultKind {
 	ClosedMergeRequest,
 	ReassignedMergeRequest,
 	CanNotBeMerged,
-	RebaseFailed,
 	FailedPipeline,
 	InvalidPipeline,
 	Unauthorized,
@@ -59,16 +58,10 @@ interface UnauthorizedResponse {
 	mergeRequestInfo: MergeRequestInfo;
 }
 
-interface RebaseFailedResponse {
-	kind: AcceptMergeRequestResultKind.RebaseFailed;
-	mergeRequestInfo: MergeRequestInfo;
-}
-
 type AcceptMergeRequestResult = SuccessResponse
 	| ClosedMergeRequestResponse
 	| ReassignedMergeRequestResponse
 	| CanNotBeMergedResponse
-	| RebaseFailedResponse
 	| FailedPipelineResponse
 	| InvalidPipelineResponse
 	| UnauthorizedResponse;
@@ -126,13 +119,6 @@ export const acceptMergeRequest = async (gitlabApi: GitlabApi, mergeRequest: Mer
 			throw new Error(`Unexpected MR status: ${mergeRequestInfo.state}`);
 		}
 
-		if (mergeRequestInfo.merge_error !== null) {
-			return {
-				kind: AcceptMergeRequestResultKind.RebaseFailed,
-				mergeRequestInfo,
-			};
-		}
-
 		if (mergeRequestInfo.rebase_in_progress) {
 			console.log(`[MR] Still rebasing`);
 			await Promise.all(tasks);

src/index.ts

@@ -102,20 +102,20 @@ const runMergeRequestCheckerLoop = async (user: User) => {
 			}
 
 			if (result.kind === AcceptMergeRequestResultKind.CanNotBeMerged) {
-				await Promise.all([
-					tryCancelPipeline(gitlabApi, result.mergeRequestInfo, user),
-					setBotLabels(gitlabApi, result.mergeRequestInfo, []),
-				]);
+				let message = 'Merge request can\'t be merged';
+				const errorMessage = result.mergeRequestInfo.merge_error;
+				if (result.mergeRequestInfo.work_in_progress) {
+					message += `: MR is marked as WIP`;
+				} else if (errorMessage !== null) {
+					message += `: ${errorMessage}`;
+				}
 
-				return;
-			}
-
-			if (result.kind === AcceptMergeRequestResultKind.RebaseFailed) {
-				console.log(`[MR] rebase failed: ${result.mergeRequestInfo.merge_error}, assigning back`);
+				console.log(`[MR] merge failed: ${message}, assigning back`);
 
 				await Promise.all([
 					assignToAuthorAndResetLabels(gitlabApi, result.mergeRequestInfo),
-					sendNote(gitlabApi, mergeRequest, `Merge request can't be merged: ${result.mergeRequestInfo.merge_error}`),
+					tryCancelPipeline(gitlabApi, result.mergeRequestInfo, user),
+					sendNote(gitlabApi, mergeRequest, message),
 				]);
 
 				return;