Merge pull request #36 from Nr18/develop

Release 0.3.1

pull_request_codecommit/aws/client.py

@@ -119,7 +119,9 @@ def update_pull_request(
 
         return data.get("pullRequest")
 
-    def merge_pull_request(self, repository: str, pull_request_id: int) -> dict:
+    def merge_pull_request(
+        self, repository: str, pull_request_id: int, branch: str
+    ) -> dict:
         response = self.__execute(
             [
                 "codecommit",
@@ -131,5 +133,18 @@ def merge_pull_request(self, repository: str, pull_request_id: int) -> dict:
             ]
         )
         data = json.loads(response)
-
-        return data.get("pullRequest")
+        pull_request = data.get("pullRequest")
+
+        if pull_request.get("pullRequestStatus", "") == "CLOSED":
+            self.__execute(
+                [
+                    "codecommit",
+                    "delete-branch",
+                    "--repository-name",
+                    repository,
+                    "--branch-name",
+                    branch,
+                ]
+            )
+
+        return pull_request

pull_request_codecommit/git/client.py

@@ -34,7 +34,7 @@ def current_branch(self) -> str:
 
     def get_commit_messages(self, destination_branch: str) -> Commits:
         messages = self.__execute(
-            ["log", f"{destination_branch}..{self.current_branch}"]
+            ["log", f"origin/{destination_branch}..{self.current_branch}"]
         )
 
         return Commits(messages)

pull_request_codecommit/pull_request_codecommit.py

@@ -65,6 +65,7 @@ def merge(self) -> str:
         response = self.__client.merge_pull_request(
             repository=self.__repo.remote.name,
             pull_request_id=self.pull_request_id,
+            branch=self.__repo.branch,
         )
         status = response.get("pullRequestStatus", "")
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pull-request-codecommit"
-version = "0.3.0"
+version = "0.3.1"
 description = "pull-request-codecommit creates a PR within CodeCommit based on your commit messages."
 authors = ["Joris Conijn <[email protected]>"]
 license = "MIT"