Fix merge_commit_sha for GitLab

Previous solution utilized only merge_commit, that is after merging MR. Since v0.20.0 python-gitlab supports test merges as GitHub. Fixes behaviour to be consistent with GitHub's. Signed-off-by: Matej Focko <[email protected]>
packit · Aug 5, 2021 · 8a15981 · 8a15981
1 parent e946024
commit 8a15981
Show file tree

Hide file tree

Showing 4 changed files with 1,321 additions and 485 deletions.
diff --git a/ogr/services/gitlab/pull_request.py b/ogr/services/gitlab/pull_request.py
@@ -25,6 +25,7 @@
 from typing import Dict, List, Optional
 
 from gitlab.v4.objects import MergeRequest as _GitlabMergeRequest
+from gitlab.exceptions import GitlabGetError
 
 from ogr.abstract import PullRequest, PRComment, PRStatus, MergeCommitStatus
 from ogr.exceptions import GitlabAPIException
@@ -123,8 +124,20 @@ def head_commit(self) -> str:
         return self._raw_pr.sha
 
     @property
-    def merge_commit_sha(self) -> str:
-        return self._raw_pr.merge_commit_sha
+    def merge_commit_sha(self) -> Optional[str]:
+        # when merged => return merge_commit_sha
+        # otherwise => return test merge if possible
+        if self.status == PRStatus.merged:
+            return self._raw_pr.merge_commit_sha
+
+        # works for test merge only with python-gitlab>=2.10.0
+        try:
+            response = self._raw_pr.merge_ref()
+        except GitlabGetError as ex:
+            if ex.response_code == 400:
+                return None
+            raise
+        return response.get("commit_id")
 
     @property
     def merge_commit_status(self) -> MergeCommitStatus: