Merge pull request #106 from smkent/manage

Improve GitHub API/repo interactions in manage-cookie

Author: smkent

cookie_python/manage/repo.py

@@ -12,6 +12,7 @@
 from typing import Any
 
 import loguru
+from github import GithubException
 
 from .github import GithubRepo
 
@@ -78,12 +79,19 @@ def cachedir(self) -> Path:
     @cached_property
     def clone_path(self) -> Path:
         subprocess.run(
-            ["git", "clone", self.repo.ssh_url, "repo"],
+            ["git", "clone", self.repo.html_url, "repo"],
             cwd=self.tempdir,
             check=True,
         )
         clone_path = self.tempdir / "repo"
         for cmd in (
+            [
+                "git",
+                "config",
+                "--local",
+                "remote.origin.pushurl",
+                self.repo.ssh_url,
+            ],
             ["git", "checkout", "-b", self.branch],
             ["git", "reset", "--hard", "origin/main"],
         ):
@@ -154,7 +162,16 @@ def close_existing_pr(self) -> None:
             else:
                 pr.edit(state="closed")
                 self.logger.info(f"Closed existing PR {pr.url}")
+        try:
+            self.repo.get_branch(self.branch)
+        except GithubException as e:
+            if e.status == 404:
+                return
+            raise
         if self.dry_run:
+            self.logger.info(
+                f"Would delete existing remote branch {self.branch}"
+            )
             return
         # Delete existing branch
         delete_result = self.run(

tests/test_manage_cookie.py

@@ -71,13 +71,15 @@ def mock_pygithub(new_cookie: Path) -> Iterator[MagicMock]:
             name=PROJECT_NAME,
             full_name=f"{AUTHOR_NAME}/{PROJECT_NAME}",
             ssh_url=str(new_cookie),
+            html_url=str(new_cookie),
             get_pulls=MagicMock(
                 return_value=[
                     SimpleNamespace(
                         url="https://unittest.example.com/repo/pulls/1138"
                     )
                 ],
             ),
+            get_branch=lambda name: SimpleNamespace(name=name),
             get_latest_release=lambda: SimpleNamespace(title="v1.1.38"),
         )
         yield obj