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

github2gerrit/commit_normalization.py

@@ -173,7 +173,10 @@ class CommitNormalizer:
 
     def _is_conventional_commit(self, title: str) -> bool:
         """Check if title is already in conventional commit format."""
-        pattern = r"^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(\(.+?\))?\s*!?\s*:\s*.+"
+        pattern = (
+            r"^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)"
+            r"(\(.+?\))?\s*!?\s*:\s*.+"
+        )
         return bool(re.match(pattern, title, re.IGNORECASE))
 
     def _is_automation_pr(self, title: str, author: str) -> bool:
@@ -187,7 +190,9 @@ class CommitNormalizer:
             "greenkeeper[bot]",
         ]
 
-        if any(author.lower().startswith(bot.lower()) for bot in automation_authors):
+        if any(
+            author.lower().startswith(bot.lower()) for bot in automation_authors
+        ):
             return True
 
         # Check for automation patterns in title
@@ -199,11 +204,17 @@ class CommitNormalizer:
             r"pre-commit.*autoupdate",
         ]
 
-        return any(re.search(pattern, title, re.IGNORECASE) for pattern in automation_patterns)
+        return any(
+            re.search(pattern, title, re.IGNORECASE)
+            for pattern in automation_patterns
+        )
 
     def _detect_preferences(self) -> None:
         """Detect repository preferences for conventional commits."""
-        log.debug("Detecting conventional commit preferences for workspace: %s", self.workspace)
+        log.debug(
+            "Detecting conventional commit preferences for workspace: %s",
+            self.workspace,
+        )
 
         # Check .pre-commit-config.yaml
         self._check_precommit_config()
@@ -262,14 +273,16 @@ class CommitNormalizer:
 
                     for title_pattern in titles:
                         # Extract conventional commit type from pattern
-                        if title_pattern.startswith("/") and title_pattern.endswith("/i"):
+                        if title_pattern.startswith(
+                            "/"
+                        ) and title_pattern.endswith("/i"):
                             pattern = title_pattern[1:-2]  # Remove /pattern/i
                             if ":" in pattern:
                                 commit_type = pattern.split(":")[0]
                                 if commit_type in CONVENTIONAL_COMMIT_TYPES:
-                                    self.preferences.preferred_types[commit_type] = self._get_capitalization(
+                                    self.preferences.preferred_types[
                                         commit_type
-                                    )
+                                    ] = self._get_capitalization(commit_type)
 
                 break  # Use first found config
 
@@ -309,11 +322,15 @@ class CommitNormalizer:
                     match = re.match(r"^([a-zA-Z]+)", message)
                     if match:
                         commit_type = match.group(1).lower()
-                        type_counts[commit_type] = type_counts.get(commit_type, 0) + 1
+                        type_counts[commit_type] = (
+                            type_counts.get(commit_type, 0) + 1
+                        )
 
                         # Track capitalization
                         if commit_type not in capitalization_examples:
-                            capitalization_examples[commit_type] = match.group(1)
+                            capitalization_examples[commit_type] = match.group(
+                                1
+                            )
 
             # Update preferences based on analysis
             if type_counts:
@@ -330,7 +347,9 @@ class CommitNormalizer:
                 # Update preferred types
                 for commit_type in type_counts:
                     if commit_type in CONVENTIONAL_COMMIT_TYPES:
-                        self.preferences.preferred_types[commit_type] = self._apply_capitalization(commit_type)
+                        self.preferences.preferred_types[commit_type] = (
+                            self._apply_capitalization(commit_type)
+                        )
 
         except Exception as e:
             log.debug("Failed to analyze git history: %s", e)
@@ -356,7 +375,9 @@ class CommitNormalizer:
         title_lower = title.lower()
 
         # Check for dependabot patterns first
-        if "dependabot" in author.lower() or any(re.search(pattern, title_lower) for pattern in DEPENDABOT_PATTERNS):
+        if "dependabot" in author.lower() or any(
+            re.search(pattern, title_lower) for pattern in DEPENDABOT_PATTERNS
+        ):
             return self.preferences.dependency_type
 
         # Check for pre-commit.ci patterns
@@ -402,7 +423,8 @@ class CommitNormalizer:
         for prefix in prefixes_to_remove:
             title = re.sub(prefix, "", title, flags=re.IGNORECASE).strip()
 
-        # Ensure first letter is lowercase (will be adjusted by capitalization later)
+        # Ensure first letter is lowercase (will be adjusted by capitalization
+        # later)
         if title and title[0].isupper():
             title = title[0].lower() + title[1:]
 
@@ -415,7 +437,10 @@ class CommitNormalizer:
 
         # Add scope if preferred for dependency updates
         scope = ""
-        if commit_type == self.preferences.dependency_type and self.preferences.use_scope:
+        if (
+            commit_type == self.preferences.dependency_type
+            and self.preferences.use_scope
+        ):
             scope = f"({self.preferences.dependency_scope})"
 
         return f"{formatted_type}{scope}: {title}"
@@ -439,7 +464,9 @@ class CommitNormalizer:
             return "lower"
 
 
-def normalize_commit_title(title: str, author: str, workspace: Path | None = None) -> str:
+def normalize_commit_title(
+    title: str, author: str, workspace: Path | None = None
+) -> str:
     """
     Normalize a commit title to conventional commit format.
 
@@ -455,7 +482,9 @@ def normalize_commit_title(title: str, author: str, workspace: Path | None = Non
     return normalizer.normalize_commit_title(title, author)
 
 
-def should_normalize_commit(title: str, author: str, workspace: Path | None = None) -> bool:
+def should_normalize_commit(
+    title: str, author: str, workspace: Path | None = None
+) -> bool:
     """
     Check if a commit title should be normalized.
 

github2gerrit/config.py

@@ -77,6 +77,7 @@ KNOWN_KEYS: set[str] = {
     "ALLOW_GHE_URLS",
     "DRY_RUN",
     "ALLOW_DUPLICATES",
+    "DUPLICATE_TYPES",
     "ISSUE_ID",
     "G2G_VERBOSE",
     "G2G_SKIP_GERRIT_COMMENTS",
@@ -91,6 +92,13 @@ KNOWN_KEYS: set[str] = {
     # Gerrit REST auth
     "GERRIT_HTTP_USER",
     "GERRIT_HTTP_PASSWORD",
+    # Reconciliation configuration
+    "REUSE_STRATEGY",
+    "SIMILARITY_SUBJECT",
+    "SIMILARITY_FILES",
+    "ALLOW_ORPHAN_CHANGES",
+    "PERSIST_SINGLE_MAPPING_COMMENT",
+    "LOG_RECONCILE_JSON",
 }
 
 _ENV_REF = re.compile(r"\$\{ENV:([A-Za-z_][A-Za-z0-9_]*)\}")
@@ -130,19 +138,29 @@ def _coerce_value(raw: str) -> str:
     # Normalize escaped newline sequences into real newlines so that values
     # like SSH keys or known_hosts entries can be specified inline using
     # '\n' or '\r\n' in configuration files.
-    normalized_newlines = unquoted.replace("\\r\\n", "\n").replace("\\n", "\n").replace("\r\n", "\n")
+    normalized_newlines = (
+        unquoted.replace("\\r\\n", "\n")
+        .replace("\\n", "\n")
+        .replace("\r\n", "\n")
+    )
 
     # Additional sanitization for SSH private keys
-    if ("-----BEGIN" in normalized_newlines and "PRIVATE KEY-----" in normalized_newlines) or (
-        "ssh-" in normalized_newlines.lower() and "key" in normalized_newlines.lower()
+    if (
+        "-----BEGIN" in normalized_newlines
+        and "PRIVATE KEY-----" in normalized_newlines
+    ) or (
+        "ssh-" in normalized_newlines.lower()
+        and "key" in normalized_newlines.lower()
     ):
-        # Clean up SSH key formatting: remove extra whitespace, normalize line endings
+        # Clean up SSH key formatting: remove extra whitespace, normalize
+        # line endings
         lines = normalized_newlines.split("\n")
         sanitized_lines = []
         for line in lines:
             cleaned = line.strip()
             if cleaned:
-                # Remove any stray quotes that might have been embedded in the key content
+                # Remove any stray quotes that might have been embedded in the
+                # key content
                 cleaned = cleaned.replace('"', "").replace("'", "")
                 sanitized_lines.append(cleaned)
         normalized_newlines = "\n".join(sanitized_lines)
@@ -208,26 +226,35 @@ def _load_ini(path: Path) -> configparser.RawConfigParser:
                     else:
                         # No closing quote found; fall through
                         # and keep original line
-                        log.debug("Multi-line quote not properly closed for line: %s", line[:50])
+                        log.debug(
+                            "Multi-line quote not properly closed for line: %s",
+                            line[:50],
+                        )
                         out_lines.append(line)
                         continue
 
-                # Handle SSH private keys and other values that start with a quote
+                # Handle SSH private keys and other values that start with a
+                # quote
                 # but contain embedded content that might confuse configparser
                 elif rhs.startswith('"') and not rhs.endswith('"'):
-                    # This looks like a multi-line value that starts on the same line
-                    # Collect all content until we find a line ending with a quote
+                    # This looks like a multi-line value that starts on the
+                    # same line
+                    # Collect all content until we find a line ending with a
+                    # quote
                     content_lines = [rhs[1:]]  # Remove opening quote
                     i += 1
 
                     while i < len(lines):
                         current_line = lines[i]
-                        if current_line.strip().endswith('"') and not current_line.strip().endswith('\\"'):
+                        if current_line.strip().endswith(
+                            '"'
+                        ) and not current_line.strip().endswith('\\"'):
                             # Found closing quote - remove it and add final line
                             final_content = current_line.rstrip()
                             if final_content.endswith('"'):
                                 final_content = final_content[:-1]
-                            if final_content:  # Only add if there's content after removing quote
+                            # Only add if there's content after removing quote
+                            if final_content:
                                 content_lines.append(final_content)
                             break
                         else:
@@ -237,19 +264,27 @@ def _load_ini(path: Path) -> configparser.RawConfigParser:
                     # Join all content and sanitize for SSH keys
                     full_content = "\\n".join(content_lines)
 
-                    # Special handling for SSH private keys - remove extra whitespace and line breaks
+                    # Special handling for SSH private keys - remove extra
+                    # whitespace and line breaks
                     key_name = left.split("=")[0].strip().upper()
                     if "SSH" in key_name and "KEY" in key_name:
-                        # For SSH keys, clean up base64 content by removing whitespace within lines
+                        # For SSH keys, clean up base64 content by removing
+                        # whitespace within lines
                         sanitized_lines = []
                         for content_line in content_lines:
                             cleaned = content_line.strip()
-                            # Preserve SSH key headers/footers but clean base64 content
+                            # Preserve SSH key headers/footers but clean base64
+                            # content
                             if cleaned.startswith("-----") or not cleaned:
                                 sanitized_lines.append(cleaned)
                             else:
-                                # Remove any embedded quotes and whitespace from base64 content
-                                cleaned = cleaned.replace('"', "").replace("'", "").strip()
+                                # Remove any embedded quotes and whitespace from
+                                # base64 content
+                                cleaned = (
+                                    cleaned.replace('"', "")
+                                    .replace("'", "")
+                                    .strip()
+                                )
                                 if cleaned:
                                     sanitized_lines.append(cleaned)
                         full_content = "\\n".join(sanitized_lines)
@@ -390,7 +425,10 @@ def filter_known(
 
 def _is_github_actions_context() -> bool:
     """Detect if running in GitHub Actions environment."""
-    return os.getenv("GITHUB_ACTIONS") == "true" or os.getenv("GITHUB_EVENT_NAME", "").strip() != ""
+    return (
+        os.getenv("GITHUB_ACTIONS") == "true"
+        or os.getenv("GITHUB_EVENT_NAME", "").strip() != ""
+    )
 
 
 def _is_local_cli_context() -> bool:
@@ -416,7 +454,9 @@ def derive_gerrit_parameters(organization: str | None) -> dict[str, str]:
     org = organization.strip().lower()
     return {
         "GERRIT_SSH_USER_G2G": f"{org}.gh2gerrit",
-        "GERRIT_SSH_USER_G2G_EMAIL": (f"releng+{org}-gh2gerrit@linuxfoundation.org"),
+        "GERRIT_SSH_USER_G2G_EMAIL": (
+            f"releng+{org}-gh2gerrit@linuxfoundation.org"
+        ),
         "GERRIT_SERVER": f"gerrit.{org}.org",
     }
 
@@ -435,10 +475,10 @@ def apply_parameter_derivation(
     - gerrit_ssh_user_g2g_email: releng+[org]-gh2gerrit@linuxfoundation.org
     - gerrit_server: gerrit.[org].org
 
-    Derivation behavior depends on execution context:
-    - GitHub Actions: Automatic derivation when organization is available
-    - Local CLI: Requires G2G_ENABLE_DERIVATION=true for automatic
-      derivation
+    Derivation behavior:
+    - Default: Automatic derivation enabled (G2G_ENABLE_DERIVATION=true by
+      default)
+    - Can be disabled by setting G2G_ENABLE_DERIVATION=false
 
     Args:
         cfg: Configuration dictionary to augment
@@ -453,7 +493,9 @@ def apply_parameter_derivation(
 
     # Check execution context to determine derivation strategy
     is_github_actions = _is_github_actions_context()
-    enable_derivation = is_github_actions or os.getenv("G2G_ENABLE_DERIVATION", "").strip().lower() in (
+    enable_derivation = os.getenv(
+        "G2G_ENABLE_DERIVATION", "true"
+    ).strip().lower() in (
         "1",
         "true",
         "yes",
@@ -462,8 +504,8 @@ def apply_parameter_derivation(
 
     if not enable_derivation:
         log.debug(
-            "Parameter derivation disabled for local CLI usage. "
-            "Set G2G_ENABLE_DERIVATION=true to enable automatic derivation."
+            "Parameter derivation disabled. Set G2G_ENABLE_DERIVATION=true to "
+            "enable automatic derivation."
         )
         return cfg
 
@@ -485,7 +527,7 @@ def apply_parameter_derivation(
             newly_derived[key] = value
 
     if newly_derived:
-        log.info(
+        log.debug(
             "Derived parameters applied for organization '%s' (%s): %s",
             organization,
             "GitHub Actions" if is_github_actions else "Local CLI",
@@ -494,7 +536,9 @@ def apply_parameter_derivation(
     # Save newly derived parameters to configuration file for future use
     # Default to true for local CLI, false for GitHub Actions
     default_auto_save = "false" if _is_github_actions_context() else "true"
-    auto_save_enabled = os.getenv("G2G_AUTO_SAVE_CONFIG", default_auto_save).strip().lower() in (
+    auto_save_enabled = os.getenv(
+        "G2G_AUTO_SAVE_CONFIG", default_auto_save
+    ).strip().lower() in (
         "1",
         "true",
         "yes",
@@ -504,7 +548,7 @@ def apply_parameter_derivation(
         # Save to config in local CLI mode to create persistent configuration
         try:
             save_derived_parameters_to_config(organization, newly_derived)
-            log.info(
+            log.debug(
                 "Automatically saved derived parameters to configuration "
                 "file for organization '%s'. "
                 "This creates a persistent configuration that you can "
@@ -541,7 +585,9 @@ def save_derived_parameters_to_config(
         return
 
     if config_path is None:
-        config_path = os.getenv("G2G_CONFIG_PATH", "").strip() or DEFAULT_CONFIG_PATH
+        config_path = (
+            os.getenv("G2G_CONFIG_PATH", "").strip() or DEFAULT_CONFIG_PATH
+        )
 
     config_file = Path(config_path).expanduser()
 
@@ -549,7 +595,8 @@ def save_derived_parameters_to_config(
         # Only update when a configuration file already exists
         if not config_file.exists():
             log.debug(
-                "Configuration file does not exist; skipping auto-save of derived parameters: %s",
+                "Configuration file does not exist; skipping auto-save of "
+                "derived parameters: %s",
                 config_file,
             )
             return