Support using the merge ref instead of the head ref in a pull request

Add merge_commit_sha and mergeable properties to GithubPullRequest class (and PullRequest superclass). OGR issue packit#584. Signed-off-by: Ben Crocker <[email protected]>
bcrocker15 · Jun 14, 2021 · 066044c · 066044c
1 parent 79d3a39
commit 066044c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/ogr/abstract.py b/ogr/abstract.py
@@ -404,6 +404,14 @@ def patch(self) -> bytes:
     def head_commit(self) -> str:
         raise NotImplementedError
 
+    @property
+    def merge_commit_sha(self) -> str:
+        raise NotImplementedError
+
+    @property
+    def mergeable(self) -> bool:
+        raise NotImplementedError
+
     @property
     def source_project(self) -> "GitProject":
         raise NotImplementedError()

diff --git a/ogr/services/github/pull_request.py b/ogr/services/github/pull_request.py
@@ -109,6 +109,14 @@ def commits_url(self) -> str:
     def head_commit(self) -> str:
         return self._raw_pr.head.sha
 
+    @property
+    def merge_commit_sha(self) -> str:
+        return self._raw_pr.merge_commit_sha
+
+    @property
+    def mergeable(self) -> bool:
+        return self._raw_pr.mergeable
+
     @property
     def source_project(self) -> "ogr_github.GithubProject":
         if self._source_project is None: