Use manual merge instead of changing project settings

Author: Jellby

marge/merge_request.py

@@ -116,26 +116,15 @@ def comment(self, message):
 
         return self._api.call(POST(notes_url, {'body': message}))
 
-    def accept(self, remove_branch=False, sha=None, trust_pipeline=True, project=None):
-        reset = False
-        if not trust_pipeline:
-            # Temporarily remove flag, because we want to merge based on another pipeline
-            if project.only_allow_merge_if_pipeline_succeeds:
-                reset = True
-                project.set_only_allow_merge_if_pipeline_succeeds(False, self._api)
-        try:
-            result = self._api.call(PUT(
-                '/projects/{0.project_id}/merge_requests/{0.iid}/merge'.format(self),
-                dict(
-                    should_remove_source_branch=remove_branch,
-                    merge_when_pipeline_succeeds=trust_pipeline,
-                    sha=sha or self.sha,  # if provided, ensures what is merged is what we want (or fails)
-                ),
-            ))
-        finally:
-            if reset:
-                project.set_only_allow_merge_if_pipeline_succeeds(True, self._api)
-        return result
+    def accept(self, remove_branch=False, sha=None):
+        return self._api.call(PUT(
+            '/projects/{0.project_id}/merge_requests/{0.iid}/merge'.format(self),
+            dict(
+                should_remove_source_branch=remove_branch,
+                merge_when_pipeline_succeeds=True,
+                sha=sha or self.sha,  # if provided, ensures what is merged is what we want (or fails)
+            ),
+        ))
 
     def close(self):
         return self._api.call(PUT(

marge/project.py

@@ -73,12 +73,6 @@ def access_level(self):
         assert effective_access is not None, "GitLab failed to provide user permissions on project"
         return AccessLevel(effective_access['access_level'])
 
-    def set_only_allow_merge_if_pipeline_succeeds(self, value, api):
-        return api.call(PUT(
-            '/projects/%s' % self.info['id'],
-            {'only_allow_merge_if_pipeline_succeeds': value}
-        ))
-
     def protect_branch(self, branch, api):
         return api.call(POST(
             '/projects/%s/protected_branches' % self.info['id'],

marge/single_merge_job.py

@@ -44,6 +44,7 @@ def update_merge_request_and_accept(self, approvals):
         api = self._api
         merge_request = self._merge_request
         updated_into_up_to_date_target_branch = False
+        temp_branch = self.opts.temp_branch
 
         while not updated_into_up_to_date_target_branch:
             self.ensure_mergeable_mr(merge_request)
@@ -67,16 +68,36 @@ def update_merge_request_and_accept(self, approvals):
 
             trust = True
             if self._project.only_allow_merge_if_pipeline_succeeds:
+                if temp_branch and source_project is not self._project:
+                    trust = False
                 self.wait_for_ci_to_pass(merge_request, actual_sha)
                 time.sleep(2)
-                if self.opts.temp_branch and source_project is not self._project:
-                    trust = False
 
             self.ensure_mergeable_mr(merge_request)
 
             try:
-                merge_request.accept(remove_branch=True, sha=actual_sha, trust_pipeline=trust,
-                                     project=self._project)
+                if trust:
+                    merge_request.accept(remove_branch=True, sha=actual_sha)
+                else:
+                    # Cannot accept the MR using the API, because it requires a passing pipeline
+                    # but the pipeline associated to the MR cannot be trusted. Use manual merging
+                    log.info('Merging %r manually (into: %r)', temp_branch, merge_request.target_branch)
+                    try:
+                        final_sha = self.repo.fast_forward(
+                            merge_request.target_branch,
+                            temp_branch,
+                        )
+                        assert final_sha == actual_sha
+                        self.repo.push(merge_request.target_branch, force=False)
+                    except AssertionError:
+                        log.warning('sha mismatch!')
+                        raise CannotMerge('Manually merged branch does not match source branch!')
+                    except git.GitError:
+                        log.warning('Failed to push!')
+                        raise CannotMerge(
+                            'Failed to push manually merged branch!'
+                            'Do I have permission to push to **%s**?' % merge_request.target_branch
+                        )
             except gitlab.NotAcceptable as err:
                 new_target_sha = Commit.last_on_branch(self._project.id, merge_request.target_branch, api).id
                 # target_branch has moved under us since we updated, just try again