pygitcode 0.1.5__tar.gz → 0.1.6__tar.gz

{pygitcode-0.1.5/src/pygitcode.egg-info → pygitcode-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygitcode
-Version: 0.1.5
+Version: 0.1.6
 Summary: A CLI tool for GitCode (api.gitcode.com), modeled after GitHub CLI.
 Author-email: codeasier <825770651@qq.com>
 License-Expression: MIT

{pygitcode-0.1.5 → pygitcode-0.1.6}/src/gitcode_cli/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.1.5"
+__version__ = "0.1.6"

{pygitcode-0.1.5 → pygitcode-0.1.6}/src/gitcode_cli/commands/pr.py

@@ -155,27 +155,26 @@ def _extract_search_filters(
 
 
 def _advance_diff_line(
-    raw_line: str, old_line: int, new_line: int, target_line: int, target_side: str, position: int
-) -> tuple[int | None, int, int]:
+    raw_line: str, old_line: int, new_line: int, target_line: int, target_side: str
+) -> tuple[bool, int, int]:
     prefix = raw_line[:1]
     if prefix == "-":
-        return (position if target_side == "LEFT" and old_line == target_line else None), old_line + 1, new_line
+        return target_side == "LEFT" and old_line == target_line, old_line + 1, new_line
     if prefix == "+":
-        return (position if target_side == "RIGHT" and new_line == target_line else None), old_line, new_line + 1
+        return target_side == "RIGHT" and new_line == target_line, old_line, new_line + 1
     matched = (target_side == "LEFT" and old_line == target_line) or (
         target_side == "RIGHT" and new_line == target_line
     )
-    return (position if matched else None), old_line + 1, new_line + 1
+    return matched, old_line + 1, new_line + 1
 
 
-def _diff_position_for_line(diff_text: str, path: str, line: int, side: str) -> int:
+def _validate_diff_line(diff_text: str, path: str, line: int, side: str) -> None:
     target_side = side.upper()
     if target_side not in {"LEFT", "RIGHT"}:
         raise click.UsageError("--side must be LEFT or RIGHT")
 
     old_line = None
     new_line = None
-    position = 0
     in_target_file = False
     saw_target_file = False
 
@@ -183,9 +182,9 @@ def _diff_position_for_line(diff_text: str, path: str, line: int, side: str) ->
         if raw_line.startswith("diff --git "):
             old_line = None
             new_line = None
-            position = 0
             in_target_file = False
             continue
+        # TODO: Handle Git-quoted paths and deleted files whose +++ header is /dev/null.
         if raw_line.startswith("+++ b/"):
             in_target_file = raw_line[6:] == path
             saw_target_file = saw_target_file or in_target_file
@@ -200,12 +199,9 @@ def _diff_position_for_line(diff_text: str, path: str, line: int, side: str) ->
         if old_line is None or new_line is None or raw_line.startswith("\\"):
             continue
 
-        position += 1
-        matched_position, old_line, new_line = _advance_diff_line(
-            raw_line, old_line, new_line, line, target_side, position
-        )
-        if matched_position is not None:
-            return matched_position
+        matched, old_line, new_line = _advance_diff_line(raw_line, old_line, new_line, line, target_side)
+        if matched:
+            return
 
     if not saw_target_file:
         raise click.ClickException(f"Path '{path}' was not found in the pull request diff.")
@@ -220,7 +216,9 @@ def _resolve_comment_position_from_line(
     if path is None:
         raise click.UsageError("--path is required when using --line")
     diff_text = service.diff(owner, repo, number)
-    return _diff_position_for_line(diff_text, path, line, side)
+    _validate_diff_line(diff_text, path, line, side)
+    # GitCode position is an absolute file line, not an ordinal within the diff.
+    return line
 
 
 @click.group("pr", cls=GCSectionGroup, help="Work with GitCode pull requests.")
@@ -298,10 +296,19 @@ def pr_merge(
 @click.option("--edit-last", is_flag=True)
 @click.option("-e", "--editor", is_flag=True)
 @click.option("-w", "--web", is_flag=True, help="Open the pull request in the web browser.")
+@click.option(
+    "--discussion-id",
+    help="Reply to an existing discussion (gc extension). Find discussion_id with pr view --json comments.",
+)
 @click.option("--path")
-@click.option("--position", type=int)
-@click.option("--line", type=int)
-@click.option("--side", default="RIGHT", show_default=True)
+@click.option("--position", type=int, help="Pass an absolute file line number directly to GitCode.")
+@click.option("--line", type=int, help="Absolute file line number; validated against the pull request diff.")
+@click.option(
+    "--side",
+    default="RIGHT",
+    show_default=True,
+    help="Side used only to validate --line: LEFT or RIGHT. GitCode receives no side; LEFT anchoring is best-effort.",
+)
 @click.option("--commit-id")
 @click.option("--commit", "commit_id")
 @click.option("--yes", is_flag=True)
@@ -317,6 +324,7 @@ def pr_comment(
     edit_last: bool,
     editor: bool,
     web: bool,
+    discussion_id: str | None,
     path: str | None,
     position: int | None,
     line: int | None,
@@ -332,6 +340,23 @@ def pr_comment(
         _pending_gh_compat("pr comment --edit-last")
     if yes:
         _pending_gh_compat("pr comment --yes")
+    if discussion_id is not None:
+        discussion_id = discussion_id.strip()
+        if not discussion_id:
+            raise click.UsageError("--discussion-id must not be empty")
+        if discussion_id in {".", ".."} or any(char in discussion_id for char in "/\\?#%"):
+            raise click.UsageError("--discussion-id must be a single path segment without URL-reserved characters")
+        if (
+            path is not None
+            or position is not None
+            or line is not None
+            or ctx.get_parameter_source("side") != click.core.ParameterSource.DEFAULT
+            or commit_id is not None
+            or web
+        ):
+            raise click.UsageError(
+                "--discussion-id cannot be used with --path, --position, --line, --side, --commit-id/--commit, or --web"
+            )
     if commit_id:
         raise click.ClickException("GitCode PR comments do not support selecting a commit for line comments.")
     if line is not None and position is not None:
@@ -348,7 +373,15 @@ def pr_comment(
         return
     body = get_body_from_options(body=body, body_file=body_file, editor=editor)
     body = prompt_if_missing(body, "Body")
-    resolved_position = position or _resolve_comment_position_from_line(service, owner, repo, number, path, line, side)
+    if discussion_id is not None:
+        item = service.reply(owner, repo, number, discussion_id, body=body) or {}
+        safe_echo(str(item.get("noteId") or "Reply posted."))
+        return
+    resolved_position = (
+        position
+        if position is not None
+        else _resolve_comment_position_from_line(service, owner, repo, number, path, line, side)
+    )
     item = service.comment(owner, repo, number, body=body, path=path, position=resolved_position)
     safe_echo(str(item["id"]))
 

{pygitcode-0.1.5 → pygitcode-0.1.6}/src/gitcode_cli/compat/entries.py

@@ -341,6 +341,7 @@ ENTRIES: list[CompatEntry] = [
     _e("pr comment", "-e/--editor", CompatStatus.IMPLEMENTED),
     _e("pr comment", "-w/--web", CompatStatus.IMPLEMENTED),
     _e("pr comment", "--path", CompatStatus.IMPLEMENTED, "gc extension; not in gh", gc_extension=True),
+    _e("pr comment", "--discussion-id", CompatStatus.IMPLEMENTED, "gc extension; not in gh", gc_extension=True),
     _e("pr comment", "--position", CompatStatus.IMPLEMENTED, "gc extension; not in gh", gc_extension=True),
     _e("pr comment", "--line", CompatStatus.IMPLEMENTED, "gc extension; not in gh", gc_extension=True),
     _e("pr comment", "--side", CompatStatus.IMPLEMENTED, "gc extension; not in gh", gc_extension=True),

{pygitcode-0.1.5 → pygitcode-0.1.6}/src/gitcode_cli/services/pulls.py

@@ -70,6 +70,11 @@ class PullRequestService:
         filtered_payload = {k: v for k, v in payload.items() if v is not None}
         return self.client.post(f"/repos/{owner}/{repo}/pulls/{number}/review", json=filtered_payload)
 
+    def reply(self, owner: str, repo: str, number: int, discussion_id: str, body: str) -> Any | None:
+        return self.client.post(
+            f"/repos/{owner}/{repo}/pulls/{number}/discussions/{discussion_id}/comments", json={"body": body}
+        )
+
     def list_comments(self, owner: str, repo: str, number: int) -> Any | None:
         return self._paginate(f"/repos/{owner}/{repo}/pulls/{number}/comments")
 

{pygitcode-0.1.5 → pygitcode-0.1.6/src/pygitcode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygitcode
-Version: 0.1.5
+Version: 0.1.6
 Summary: A CLI tool for GitCode (api.gitcode.com), modeled after GitHub CLI.
 Author-email: codeasier <825770651@qq.com>
 License-Expression: MIT