github2gerrit 0.1.10__py3-none-any.whl → 0.1.11__py3-none-any.whl

github2gerrit/gerrit_urls.py

@@ -25,19 +25,29 @@ _BASE_PATH_CACHE: dict[str, str] = {}
 
 
 class _NoRedirect(urllib.request.HTTPRedirectHandler):
-    def http_error_301(self, req: Any, fp: Any, code: int, msg: str, headers: Any) -> Any:
+    def http_error_301(
+        self, req: Any, fp: Any, code: int, msg: str, headers: Any
+    ) -> Any:
         return fp
 
-    def http_error_302(self, req: Any, fp: Any, code: int, msg: str, headers: Any) -> Any:
+    def http_error_302(
+        self, req: Any, fp: Any, code: int, msg: str, headers: Any
+    ) -> Any:
         return fp
 
-    def http_error_303(self, req: Any, fp: Any, code: int, msg: str, headers: Any) -> Any:
+    def http_error_303(
+        self, req: Any, fp: Any, code: int, msg: str, headers: Any
+    ) -> Any:
         return fp
 
-    def http_error_307(self, req: Any, fp: Any, code: int, msg: str, headers: Any) -> Any:
+    def http_error_307(
+        self, req: Any, fp: Any, code: int, msg: str, headers: Any
+    ) -> Any:
         return fp
 
-    def http_error_308(self, req: Any, fp: Any, code: int, msg: str, headers: Any) -> Any:
+    def http_error_308(
+        self, req: Any, fp: Any, code: int, msg: str, headers: Any
+    ) -> Any:
         return fp
 
 
@@ -83,23 +93,31 @@ def _discover_base_path_for_host(host: str, timeout: float = 5.0) -> str:
                     continue
                 try:
                     resp = opener.open(url, timeout=timeout)
-                    code = getattr(resp, "getcode", lambda: None)() or getattr(resp, "status", 0)
+                    code = getattr(resp, "getcode", lambda: None)() or getattr(
+                        resp, "status", 0
+                    )
                     # If we reached the page without redirects
                     if code == 200:
-                        _BASE_PATH_CACHE[host] = ""
-                        log.info("Gerrit base path: ''")
+                        log.debug("Gerrit base path: ''")
                         return ""
-                    # Handle 3xx responses when redirects are disabled (no-redirect opener)
+                    # Handle 3xx responses when redirects are disabled
+                    # (no-redirect opener)
                     if code in (301, 302, 303, 307, 308):
                         headers = getattr(resp, "headers", {}) or {}
-                        loc = headers.get("Location") or headers.get("location") or ""
+                        loc = (
+                            headers.get("Location")
+                            or headers.get("location")
+                            or ""
+                        )
                         if loc:
                             # Normalize to absolute path
                             parsed = urllib.parse.urlparse(loc)
                             path = (
                                 parsed.path
                                 if parsed.scheme or parsed.netloc
-                                else urllib.parse.urlparse(f"https://{host}{loc}").path
+                                else urllib.parse.urlparse(
+                                    f"https://{host}{loc}"
+                                ).path
                             )
                             # Determine candidate base path
                             segs = [s for s in path.split("/") if s]
@@ -109,21 +127,28 @@ def _discover_base_path_for_host(host: str, timeout: float = 5.0) -> str:
                                 if first not in known_endpoints:
                                     base = first
                             _BASE_PATH_CACHE[host] = base
-                            log.info("Gerrit base path: '%s'", base)
+                            log.debug("Gerrit base path: '%s'", base)
                             return base
                     # If we get any other non-redirect response, try next probe
                     continue
                 except urllib.error.HTTPError as e:
-                    # HTTPError doubles as the response; capture Location for redirects
+                    # HTTPError doubles as the response; capture Location for
+                    # redirects
                     code = e.code
-                    loc = e.headers.get("Location") or e.headers.get("location") or ""
+                    loc = (
+                        e.headers.get("Location")
+                        or e.headers.get("location")
+                        or ""
+                    )
                     if code in (301, 302, 303, 307, 308) and loc:
                         # Normalize to absolute path
                         parsed = urllib.parse.urlparse(loc)
                         path = (
                             parsed.path
                             if parsed.scheme or parsed.netloc
-                            else urllib.parse.urlparse(f"https://{host}{loc}").path
+                            else urllib.parse.urlparse(
+                                f"https://{host}{loc}"
+                            ).path
                         )
                         # Determine candidate base path
                         segs = [s for s in path.split("/") if s]
@@ -133,12 +158,17 @@ def _discover_base_path_for_host(host: str, timeout: float = 5.0) -> str:
                             if first not in known_endpoints:
                                 base = first
                         _BASE_PATH_CACHE[host] = base
-                        log.info("Gerrit base path: '%s'", base)
+                        log.debug("Gerrit base path: '%s'", base)
                         return base
                     # Non-redirect error; try next probe
                     continue
                 except Exception as exc:
-                    log.debug("Gerrit base path probe failed for %s%s: %s", host, probe, exc)
+                    log.debug(
+                        "Gerrit base path probe failed for %s%s: %s",
+                        host,
+                        probe,
+                        exc,
+                    )
                     continue
 
     except Exception as exc:
@@ -146,7 +176,7 @@ def _discover_base_path_for_host(host: str, timeout: float = 5.0) -> str:
         return ""
     # Default if nothing conclusive after exhausting all probes
     _BASE_PATH_CACHE[host] = ""
-    log.info("Gerrit base path: ''")
+    log.debug("Gerrit base path: ''")
     return ""
 
 
@@ -167,7 +197,8 @@ class GerritUrlBuilder:
         Args:
             host: Gerrit hostname (without protocol)
             base_path: Optional base path override. If None, reads from
-                      GERRIT_HTTP_BASE_PATH environment variable or discovers dynamically.
+                      GERRIT_HTTP_BASE_PATH environment variable or discovers
+                      dynamically.
         """
         self.host = host.strip()
 
@@ -203,24 +234,32 @@ class GerritUrlBuilder:
         Build the base URL with optional base path override.
 
         Args:
-            base_path_override: Optional base path to use instead of the instance default
+            base_path_override: Optional base path to use instead of the
+                               instance default
 
         Returns:
             Base URL with trailing slash
         """
-        path = base_path_override if base_path_override is not None else self._base_path
+        path = (
+            base_path_override
+            if base_path_override is not None
+            else self._base_path
+        )
         if path:
             return f"https://{self.host}/{path}/"
         else:
             return f"https://{self.host}/"
 
-    def api_url(self, endpoint: str = "", base_path_override: str | None = None) -> str:
+    def api_url(
+        self, endpoint: str = "", base_path_override: str | None = None
+    ) -> str:
         """
         Build a Gerrit REST API URL.
 
         Args:
             endpoint: API endpoint path (e.g., "/changes/", "/accounts/self")
-            base_path_override: Optional base path override for fallback scenarios
+            base_path_override: Optional base path override for fallback
+                               scenarios
 
         Returns:
             Complete API URL
@@ -231,13 +270,16 @@ class GerritUrlBuilder:
             endpoint = "/" + endpoint
         return urljoin(base_url, endpoint.lstrip("/"))
 
-    def web_url(self, path: str = "", base_path_override: str | None = None) -> str:
+    def web_url(
+        self, path: str = "", base_path_override: str | None = None
+    ) -> str:
         """
         Build a Gerrit web UI URL.
 
         Args:
             path: Web path (e.g., "c/project/+/123", "dashboard")
-            base_path_override: Optional base path override for fallback scenarios
+            base_path_override: Optional base path override for fallback
+                               scenarios
 
         Returns:
             Complete web URL
@@ -261,22 +303,27 @@ class GerritUrlBuilder:
         Args:
             project: Gerrit project name
             change_number: Gerrit change number
-            base_path_override: Optional base path override for fallback scenarios
+            base_path_override: Optional base path override for fallback
+                               scenarios
 
         Returns:
             Complete change URL
         """
-        # Don't URL-encode project names - Gerrit expects them as-is (backward compatibility)
+        # Don't URL-encode project names - Gerrit expects them as-is
+        # (backward compatibility)
         path = f"c/{project}/+/{change_number}"
         return self.web_url(path, base_path_override)
 
-    def hook_url(self, hook_name: str, base_path_override: str | None = None) -> str:
+    def hook_url(
+        self, hook_name: str, base_path_override: str | None = None
+    ) -> str:
         """
         Build a URL for downloading Gerrit hooks.
 
         Args:
             hook_name: Name of the hook (e.g., "commit-msg")
-            base_path_override: Optional base path override for fallback scenarios
+            base_path_override: Optional base path override for fallback
+                               scenarios
 
         Returns:
             Complete hook download URL
@@ -318,7 +365,8 @@ class GerritUrlBuilder:
         """
         Get the web base path for URL construction.
 
-        This is useful when you need just the path component for manual URL building.
+        This is useful when you need just the path component for manual URL
+        building.
 
         Args:
             base_path_override: Optional base path override
@@ -326,7 +374,11 @@ class GerritUrlBuilder:
         Returns:
             Web base path with leading and trailing slashes (e.g., "/r/", "/")
         """
-        path = base_path_override if base_path_override is not None else self._base_path
+        path = (
+            base_path_override
+            if base_path_override is not None
+            else self._base_path
+        )
         if path:
             return f"/{path}/"
         else:
@@ -334,10 +386,15 @@ class GerritUrlBuilder:
 
     def __repr__(self) -> str:
         """String representation for debugging."""
-        return f"GerritUrlBuilder(host='{self.host}', base_path='{self._base_path}')"
+        return (
+            f"GerritUrlBuilder(host='{self.host}', "
+            f"base_path='{self._base_path}')"
+        )
 
 
-def create_gerrit_url_builder(host: str, base_path: str | None = None) -> GerritUrlBuilder:
+def create_gerrit_url_builder(
+    host: str, base_path: str | None = None
+) -> GerritUrlBuilder:
     """
     Factory function to create a GerritUrlBuilder instance.
 

github2gerrit/github_api.py

@@ -44,7 +44,9 @@ class RateLimitExceededExceptionType(GithubExceptionType):
     pass
 
 
-def _load_github_classes() -> tuple[Any | None, type[BaseException], type[BaseException]]:
+def _load_github_classes() -> tuple[
+    Any | None, type[BaseException], type[BaseException]
+]:
     try:
         exc_mod = import_module("github.GithubException")
         ge = exc_mod.GithubException
@@ -151,17 +153,23 @@ def build_client(token: str | None = None) -> GhClient:
         if auth_factory is not None and hasattr(auth_factory, "Token"):
             auth_obj = auth_factory.Token(tok)
             if base_url:
-                client_any = Github(auth=auth_obj, per_page=100, base_url=base_url)
+                client_any = Github(
+                    auth=auth_obj, per_page=100, base_url=base_url
+                )
             else:
                 client_any = Github(auth=auth_obj, per_page=100)
         else:
             if base_url:
-                client_any = Github(login_or_token=tok, per_page=100, base_url=base_url)
+                client_any = Github(
+                    login_or_token=tok, per_page=100, base_url=base_url
+                )
             else:
                 client_any = Github(login_or_token=tok, per_page=100)
     except Exception:
         if base_url:
-            client_any = Github(login_or_token=tok, per_page=100, base_url=base_url)
+            client_any = Github(
+                login_or_token=tok, per_page=100, base_url=base_url
+            )
         else:
             client_any = Github(login_or_token=tok, per_page=100)
     return cast(GhClient, client_any)
@@ -173,7 +181,10 @@ def get_repo_from_env(client: GhClient) -> GhRepository:
     full = _getenv_str("GITHUB_REPOSITORY")
     log.debug("GITHUB_REPOSITORY environment variable: '%s'", full)
     if not full or "/" not in full:
-        log.error("Invalid GITHUB_REPOSITORY: '%s' (expected format: 'owner/repo')", full)
+        log.error(
+            "Invalid GITHUB_REPOSITORY: '%s' (expected format: 'owner/repo')",
+            full,
+        )
         raise ValueError(_MSG_BAD_GITHUB_REPOSITORY)
     repo = client.get_repo(full)
     return repo
@@ -259,5 +270,7 @@ def close_pr(pr: GhPullRequest, *, comment: str | None = None) -> None:
         try:
             create_pr_comment(pr, comment)
         except Exception as exc:
-            log.warning("Failed to add close comment to PR #%s: %s", pr.number, exc)
+            log.warning(
+                "Failed to add close comment to PR #%s: %s", pr.number, exc
+            )
     pr.edit(state="closed")

github2gerrit/gitutils.py

@@ -53,7 +53,10 @@ if not log.handlers:
     # Provide a minimal default if the app has not configured logging.
     level_name = os.getenv("G2G_LOG_LEVEL", "INFO").upper()
     level = getattr(logging, level_name, logging.INFO)
-    fmt = "%(asctime)s %(levelname)-8s %(name)s %(filename)s:%(lineno)d | %(message)s"
+    fmt = (
+        "%(asctime)s %(levelname)-8s %(name)s %(filename)s:%(lineno)d | "
+        "%(message)s"
+    )
     logging.basicConfig(level=level, format=fmt)
 
 
@@ -238,9 +241,14 @@ def run_cmd(
             filtered_lines = []
             skip_hint = False
             for line in stderr_lines:
-                if "hint: Using '" in line and "as the name for the initial branch" in line:
+                if (
+                    "hint: Using '" in line
+                    and "as the name for the initial branch" in line
+                ):
                     skip_hint = True
-                elif (skip_hint and line.startswith("hint:")) or (skip_hint and not line.strip()):
+                elif (skip_hint and line.startswith("hint:")) or (
+                    skip_hint and not line.strip()
+                ):
                     continue
                 else:
                     skip_hint = False
@@ -259,7 +267,8 @@ def non_interactive_env(include_git_ssh_command: bool = True) -> dict[str, str]:
 
     Args:
         include_git_ssh_command: Whether to include a default GIT_SSH_COMMAND.
-                                Set to False when the caller will provide their own.
+                                Set to False when the caller will provide their
+                                own.
 
     Returns:
         Dictionary of environment variables for non-interactive operations.
@@ -332,10 +341,11 @@ def run_cmd_with_retries(
         if predicate(res):
             delay = _backoff_delay(attempt)
             log.warning(
-                "Retrying (attempt %d) after transient error; delay %.1fs. cmd=%s",
+                "Retrying (attempt %d) after transient error; delay %.1fs. "
+                "cmd=%s",
                 attempt,
                 delay,
-                _format_cmd_for_log(cmd, masks),
+                " ".join(cmd) if isinstance(cmd, list) else str(cmd),
             )
             time.sleep(delay)
             continue
@@ -483,14 +493,17 @@ def git_commit_amend(
     if message is not None:
         import tempfile as _tempfile
 
-        with _tempfile.NamedTemporaryFile("w", delete=False, encoding="utf-8") as _tf:
+        with _tempfile.NamedTemporaryFile(
+            "w", delete=False, encoding="utf-8"
+        ) as _tf:
             _tf.write(message)
             _tf.flush()
             tmp_path = Path(_tf.name)
         message_file = tmp_path
         message = None
 
-    # Determine whether to add -s; only suppress if message already has a sign-off for current committer
+    # Determine whether to add -s; only suppress if message already has a
+    # sign-off for current committer
     effective_signoff = bool(signoff)
     try:
         import os
@@ -516,7 +529,12 @@ def git_commit_amend(
             for ln in text.splitlines():
                 if ln.lower().startswith("signed-off-by:"):
                     m = re.search(r"<([^>]+)>", ln)
-                    if m and committer_email and m.group(1).strip().lower() == committer_email.lower():
+                    if (
+                        m
+                        and committer_email
+                        and m.group(1).strip().lower()
+                        == committer_email.lower()
+                    ):
                         return True
             return False
 
@@ -588,14 +606,17 @@ def git_commit_new(
     if message is not None:
         import tempfile as _tempfile
 
-        with _tempfile.NamedTemporaryFile("w", delete=False, encoding="utf-8") as _tf:
+        with _tempfile.NamedTemporaryFile(
+            "w", delete=False, encoding="utf-8"
+        ) as _tf:
             _tf.write(message)
             _tf.flush()
             tmp_path = Path(_tf.name)
         message_file = tmp_path
         message = None
 
-    # Determine whether to add -s; only suppress if message already has a sign-off for current committer
+    # Determine whether to add -s; only suppress if message already has a
+    # sign-off for current committer
     effective_signoff = bool(signoff)
     try:
         import os
@@ -621,7 +642,12 @@ def git_commit_new(
             for ln in text.splitlines():
                 if ln.lower().startswith("signed-off-by:"):
                     m = re.search(r"<([^>]+)>", ln)
-                    if m and committer_email and m.group(1).strip().lower() == committer_email.lower():
+                    if (
+                        m
+                        and committer_email
+                        and m.group(1).strip().lower()
+                        == committer_email.lower()
+                    ):
                         return True
             return False
 
@@ -693,7 +719,8 @@ def _parse_trailers(text: str) -> dict[str, list[str]]:
 
     Git trailers are key-value pairs that appear at the end of commit messages,
     separated from the body by a blank line. This function only parses trailers
-    from the actual footer section to avoid false positives from the message body.
+    from the actual footer section to avoid false positives from the message
+    body.
     """
     trailers: dict[str, list[str]] = {}
     lines = text.splitlines()
@@ -804,7 +831,9 @@ def git_config_get_all(
     try:
         res = git_quiet(args, cwd=None)
         if res.returncode == 0:
-            values = [ln.strip() for ln in res.stdout.splitlines() if ln.strip()]
+            values = [
+                ln.strip() for ln in res.stdout.splitlines() if ln.strip()
+            ]
             return values
         else:
             return []