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

github2gerrit/cli.py

@@ -265,12 +265,13 @@ def main(
         envvar="CI_TESTING",
         help="Enable CI testing mode (overrides .gitreview, handles unrelated repos).",
     ),
-    duplicates: str = typer.Option(
+    duplicate_types: str = typer.Option(
         "open",
-        "--duplicates",
-        envvar="DUPLICATES",
+        "--duplicate-types",
+        envvar="DUPLICATE_TYPES",
         help=(
-            'Gerrit statuses for duplicate detection (comma-separated). E.g. "open,merged,abandoned". Default: "open".'
+            "Gerrit change states to evaluate when determining if a change should be considered a duplicate "
+            '(comma-separated). E.g. "open,merged,abandoned". Default: "open".'
         ),
     ),
     normalise_commit: bool = typer.Option(
@@ -354,8 +355,8 @@ def main(
         os.environ["ISSUE_ID"] = issue_id
     os.environ["ALLOW_DUPLICATES"] = "true" if allow_duplicates else "false"
     os.environ["CI_TESTING"] = "true" if ci_testing else "false"
-    if duplicates:
-        os.environ["DUPLICATES"] = duplicates
+    if duplicate_types:
+        os.environ["DUPLICATE_TYPES"] = duplicate_types
     # URL mode handling
     if target_url:
         org, repo, pr = _parse_github_target(target_url)
@@ -432,7 +433,7 @@ def _build_inputs_from_env() -> Inputs:
         issue_id=env_str("ISSUE_ID", ""),
         allow_duplicates=env_bool("ALLOW_DUPLICATES", False),
         ci_testing=env_bool("CI_TESTING", False),
-        duplicates_filter=env_str("DUPLICATES", "open"),
+        duplicates_filter=env_str("DUPLICATE_TYPES", "open"),
     )
 
 
@@ -476,7 +477,7 @@ def _process_bulk(data: Inputs, gh: GitHubContext) -> bool:
 
         try:
             if data.duplicates_filter:
-                os.environ["DUPLICATES"] = data.duplicates_filter
+                os.environ["DUPLICATE_TYPES"] = data.duplicates_filter
             check_for_duplicates(per_ctx, allow_duplicates=data.allow_duplicates)
         except DuplicateChangeError as exc:
             log_exception_conditionally(log, "Skipping PR #%d", pr_number)
@@ -1022,7 +1023,7 @@ def _process() -> None:
     if gh.pr_number and not env_bool("SYNC_ALL_OPEN_PRS", False):
         try:
             if data.duplicates_filter:
-                os.environ["DUPLICATES"] = data.duplicates_filter
+                os.environ["DUPLICATE_TYPES"] = data.duplicates_filter
             check_for_duplicates(gh, allow_duplicates=data.allow_duplicates)
         except DuplicateChangeError as exc:
             log_exception_conditionally(

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",

github2gerrit/core.py

@@ -1417,6 +1417,7 @@ class Orchestrator:
         signed_lines = [ln for ln in lines_cur if ln.startswith("Signed-off-by:")]
         change_id_lines = [ln for ln in lines_cur if ln.startswith("Change-Id:")]
         github_hash_lines = [ln for ln in lines_cur if ln.startswith("GitHub-Hash:")]
+        github_pr_lines = [ln for ln in lines_cur if ln.startswith("GitHub-PR:")]
 
         msg_parts = [title, "", body] if title or body else [current_body]
         commit_message = "\n".join(msg_parts).strip()
@@ -1446,8 +1447,19 @@ class Orchestrator:
                     seen_so.add(ln)
         if change_id_lines:
             trailers_out.append(change_id_lines[-1])
+
+        # GitHub-PR trailer (must appear after Change-Id)
+        if github_pr_lines:
+            pr_line = github_pr_lines[-1]
+        else:
+            pr_line = f"GitHub-PR: {gh.server_url}/{gh.repository}/pull/{gh.pr_number}" if gh.pr_number else ""
+
         if trailers_out:
             commit_message += "\n\n" + "\n".join(trailers_out)
+            if pr_line:
+                commit_message += "\n" + pr_line
+        elif pr_line:
+            commit_message += "\n\n" + pr_line
 
         author = run_cmd(
             ["git", "show", "-s", "--pretty=format:%an <%ae>", "HEAD"],

github2gerrit/duplicate_detection.py

@@ -373,7 +373,7 @@ class DuplicateDetector:
         q_parts = []
         if gerrit_project:
             q_parts.append(f"project:{gerrit_project}")
-        # Build status clause from DUPLICATES filter (default: open)
+        # Build status clause from DUPLICATE_TYPES filter (default: open)
         dup_filter = (self.duplicates_filter or "open").strip().lower()
         selected = [s.strip() for s in dup_filter.split(",") if s.strip()]
         valid = {
@@ -644,7 +644,7 @@ def check_for_duplicates(
         detector = DuplicateDetector(
             repo,
             lookback_days=lookback_days,
-            duplicates_filter=os.getenv("DUPLICATES", "open"),
+            duplicates_filter=os.getenv("DUPLICATE_TYPES", "open"),
         )
         detector.check_for_duplicates(target_pr, allow_duplicates=allow_duplicates, gh=gh)
 

github2gerrit/similarity.py

@@ -163,6 +163,7 @@ def remove_commit_trailers(message: str) -> str:
     - Signed-off-by: Name <email>
     - Issue-ID: ABC-123
     - GitHub-Hash: deadbeefcafebabe
+    - GitHub-PR: https://github.com/org/repo/pull/123
     - Co-authored-by: ...
 
     Args:
@@ -173,7 +174,7 @@ def remove_commit_trailers(message: str) -> str:
     """
     lines = (message or "").splitlines()
     out: list[str] = []
-    trailer_re = re.compile(r"(?i)^(change-id|signed-off-by|issue-id|github-hash|co-authored-by):")
+    trailer_re = re.compile(r"(?i)^(change-id|signed-off-by|issue-id|github-hash|github-pr|co-authored-by):")
     for ln in lines:
         if trailer_re.match(ln.strip()):
             continue

{github2gerrit-0.1.9.dist-info → github2gerrit-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github2gerrit
-Version: 0.1.9
+Version: 0.1.10
 Summary: Submit a GitHub pull request to a Gerrit repository.
 Author-email: Matthew Watkins <mwatkins@linuxfoundation.org>
 License-Expression: Apache-2.0
@@ -140,6 +140,27 @@ with:
 When allowed, duplicates generate warnings but processing continues.
 The tool exits with code 3 when it detects duplicates and they are not allowed.
 
+### Configuring duplicate detection scope
+
+By default, the duplicate detector considers changes with status `open` when searching for potential duplicates.
+You can customize which Gerrit change states to check using `--duplicate-types` or setting `DUPLICATE_TYPES`:
+
+```bash
+# CLI usage - check against open and merged changes
+github2gerrit --duplicate-types=open,merged https://github.com/org/repo
+
+# Environment variable
+DUPLICATE_TYPES=open,merged,abandoned github2gerrit https://github.com/org/repo
+
+# GitHub Actions
+uses: onap/github2gerrit@main
+with:
+  DUPLICATE_TYPES: 'open,merged'
+```
+
+Valid change states include `open`, `merged`, and `abandoned`. This setting determines which existing changes
+to check when evaluating whether a new change would be a duplicate.
+
 ## Commit Message Normalization
 
 The tool includes intelligent commit message normalization that automatically
@@ -368,6 +389,7 @@ Key options include:
 - `--use-pr-as-commit`: Use PR title/body as commit message (`USE_PR_AS_COMMIT`)
 - `--issue-id`: Add an Issue-ID trailer (e.g., "Issue-ID: ABC-123") to the commit message (`ISSUE_ID`)
 - `--preserve-github-prs`: Don't close GitHub PRs after submission (`PRESERVE_GITHUB_PRS`)
+- `--duplicate-types`: Configure which Gerrit change states to check for duplicates (`DUPLICATE_TYPES`)
 
 For a complete list of all available options, see the [Inputs](#inputs) section.
 
@@ -593,7 +615,7 @@ alignment between action inputs, environment variables, and CLI flags:
 | `CI_TESTING` | `CI_TESTING` | `--ci-testing` | No | `"false"` | Enable CI testing mode (overrides .gitreview) |
 | `ISSUE_ID` | `ISSUE_ID` | `--issue-id` | No | `""` | Issue ID to include (e.g., ABC-123) |
 | `G2G_USE_SSH_AGENT` | `G2G_USE_SSH_AGENT` | N/A | No | `"true"` | Use SSH agent for authentication |
-| `DUPLICATES` | `DUPLICATES` | `--duplicates` | No | `"open"` | Comma-separated Gerrit statuses for duplicate detection |
+| `DUPLICATE_TYPES` | `DUPLICATE_TYPES` | `--duplicate-types` | No | `"open"` | Comma-separated Gerrit change states to check for duplicate detection |
 | `GERRIT_SERVER` | `GERRIT_SERVER` | `--gerrit-server` | No² | `""` | Gerrit server hostname (auto-derived if enabled) |
 | `GERRIT_SERVER_PORT` | `GERRIT_SERVER_PORT` | `--gerrit-server-port` | No | `"29418"` | Gerrit SSH port |
 | `GERRIT_PROJECT` | `GERRIT_PROJECT` | `--gerrit-project` | No² | `""` | Gerrit project name |

{github2gerrit-0.1.9.dist-info → github2gerrit-0.1.10.dist-info}/RECORD

@@ -1,9 +1,9 @@
 github2gerrit/__init__.py,sha256=N1Vj1HJ28LKCJLAynQdm5jFGQQAz9YSMzZhEfvbBgow,886
-github2gerrit/cli.py,sha256=ClwCOtMl9eecobeN6Bb1GFQ_E-kbILdxKFE89Vtvai4,45865
+github2gerrit/cli.py,sha256=WlEOfomSxXOvSbN58ti2J-R4PA9_ZV6ZbyHQDC_JUQs,45980
 github2gerrit/commit_normalization.py,sha256=u4AZigz3qOpz5XYpUOq3WUqsY-o08YrkgaT160eyIIs,16594
-github2gerrit/config.py,sha256=uRVVcofzojTayA8AyM_3rgSFsV0fWGjixWmK48aZsRA,21471
-github2gerrit/core.py,sha256=Mjo_TNocFE5HDmRTxh54LEHAEw5y1u6lc1qItEZ76GA,105180
-github2gerrit/duplicate_detection.py,sha256=5j6EDz2P3GnnT2JkR1tGbzWCjA6TV0l5VjsEMs-tfCM,26544
+github2gerrit/config.py,sha256=Jxo2q9qZZwEWc_kLYnO_hJ9ToSthYlyYxQnmN_yJRcY,21494
+github2gerrit/core.py,sha256=4BDh4jm7gjDcVEIrY_3xkrMomDypdp8KYKRdkjugEGs,105660
+github2gerrit/duplicate_detection.py,sha256=_CHVCaxqLoDBuk3wq2SIsekPtqRzmOwCZTQfe2ZbVgI,26554
 github2gerrit/external_api.py,sha256=EVHh__v6lRq_ojpBI_nkGZ31AQSZ9NG8tDqVUid23XY,17638
 github2gerrit/gerrit_rest.py,sha256=NmC95hb2hLpnko8Uu3OwPEKktNv-k3qrmuA7A2q-H0Y,10562
 github2gerrit/gerrit_urls.py,sha256=pw4rjIQeQ-i-vbPqsOZjZpdz7FO03pnMUMWc8L9Mcic,12893
@@ -11,14 +11,14 @@ github2gerrit/github_api.py,sha256=6S9DRt-Dza78cgxQwZ3_ujI0yPPozDGBIKnYgHan760,8
 github2gerrit/gitutils.py,sha256=3ob1K7dlKeWYYYOPXIIJ56p2N49lm1yj8XHHg2zSlhw,25929
 github2gerrit/models.py,sha256=sRS4rPMF_wjV19HMFTzhHXFMfsLFzm9TFb1JydJsSyQ,1875
 github2gerrit/pr_content_filter.py,sha256=w4MqSZ4uLX-3Da1DL_A56zVQa7xJ4h5jHMNteOOG2AE,16896
-github2gerrit/similarity.py,sha256=xPqdypI-Fmpeb74K4lcqZBxj17i8avS_x73dXckeicA,15268
+github2gerrit/similarity.py,sha256=Gf8xDQzDDsgauhYNGueUFaQRnzt7PJ27AaLVo-Bpa7M,15332
 github2gerrit/ssh_agent_setup.py,sha256=fvKuMdF9Hv5ioaSu_alzLcjeoQLGGFRLS2wb46KdNzE,11889
 github2gerrit/ssh_common.py,sha256=f0QQmnj6yIW74N3ZjGkYmJryEstjEOmq41EIXOZdGTM,8102
 github2gerrit/ssh_discovery.py,sha256=zH0tX9VN1pn8DLM1J9QQquoKBhA9gk5drXHvMSHNNLg,13021
 github2gerrit/utils.py,sha256=ADE5YZe1h3PB3cgfxbsCuYU-Xs-1CMHrDHxfIdariFE,3369
-github2gerrit-0.1.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-github2gerrit-0.1.9.dist-info/METADATA,sha256=QlTEhsWuTU9Yxim1Z__-aMr6GcGWmBzpcczbqzEyBNU,31006
-github2gerrit-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-github2gerrit-0.1.9.dist-info/entry_points.txt,sha256=MxN2_liIKo3-xJwtAulAeS5GcOS6JS96nvwOQIkP3W8,56
-github2gerrit-0.1.9.dist-info/top_level.txt,sha256=bWTYXjvuu4sSU90KLT1JlnjD7xV_iXZ-vKoulpjLTy8,14
-github2gerrit-0.1.9.dist-info/RECORD,,
+github2gerrit-0.1.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+github2gerrit-0.1.10.dist-info/METADATA,sha256=D3HNkThf9wbgtqo-K0SxaaT0DLaLW20fA2CMFFi6vn4,31914
+github2gerrit-0.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+github2gerrit-0.1.10.dist-info/entry_points.txt,sha256=MxN2_liIKo3-xJwtAulAeS5GcOS6JS96nvwOQIkP3W8,56
+github2gerrit-0.1.10.dist-info/top_level.txt,sha256=bWTYXjvuu4sSU90KLT1JlnjD7xV_iXZ-vKoulpjLTy8,14
+github2gerrit-0.1.10.dist-info/RECORD,,