git-hunk 0.3.1__tar.gz → 0.4.0__tar.gz

{git_hunk-0.3.1 → git_hunk-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: git-hunk
-Version: 0.3.1
+Version: 0.4.0
 Summary: Non-interactive, programmatic git hunk staging with durable Hunk IDs.
 Project-URL: Homepage, https://github.com/wkentaro/git-hunk
 Project-URL: Issues, https://github.com/wkentaro/git-hunk/issues

{git_hunk-0.3.1 → git_hunk-0.4.0}/git_hunk/_cli.py

@@ -6,6 +6,7 @@ import stat
 from collections.abc import Callable
 from dataclasses import dataclass
 from dataclasses import replace
+from pathlib import Path
 from typing import Final
 
 import click
@@ -19,7 +20,7 @@ from ._git import get_diff
 from ._git import get_unmerged_files
 from ._git import get_unsupported_changes
 from ._git import get_untracked_files
-from ._git import get_worktree_root
+from ._git import get_worktree_context
 from ._git import stage_files
 from ._git import unstage_added_files
 from ._git import unstage_files
@@ -103,9 +104,9 @@ class CliGroup(click.Group):
             ctx.exit(130)
 
 
-def _require_worktree_root() -> str:
+def _require_worktree_context() -> tuple[str, str]:
     try:
-        return get_worktree_root()
+        return get_worktree_context()
     # Usually there is no worktree to anchor to, but rev-parse also refuses on
     # dubious ownership or a bad config value, and those say how to fix them.
     # Classifying git's English is what this avoids; passing it on is not.
@@ -243,10 +244,16 @@ def _make_targets(
 
 
 def _select_hunks(
-    *, hunks: list[Hunk], targets: list[_Target], inventory_hunks: list[Hunk]
+    *,
+    hunks: list[Hunk],
+    targets: list[_Target],
+    inventory_hunks: list[Hunk],
+    invocation_prefix: str,
+    worktree_root: str,
 ) -> list[Hunk]:
     files = {h.file for h in hunks}
     eligible_ids = {hunk.id for hunk in hunks}
+    resolved_worktree_root = Path(worktree_root).resolve()
     selected: list[Hunk] = []
     seen: set[str] = set()
     for target in targets:
@@ -259,9 +266,32 @@ def _select_hunks(
             if matches[0].id not in eligible_ids:
                 raise CliError(f"hunk '{target.arg}' is not eligible for this command")
         else:
+            operand_path = resolved_worktree_root / target.path
+            if (
+                operand_path.is_dir()
+                and operand_path.resolve().is_relative_to(resolved_worktree_root)
+                and any(
+                    target.path == "." or path.startswith(f"{target.path}/")
+                    for path in files
+                )
+            ):
+                raise CliError(
+                    f"directory operands are not expanded: '{target.arg}'",
+                    tip="pass exact Repository paths (a shell-expanded glob is "
+                    "acceptable when it covers the intended tracked files)",
+                )
+            suggested_path = posixpath.normpath(
+                posixpath.join(invocation_prefix, target.path)
+            )
+            tip = (
+                "Repository paths are worktree-root-relative; "
+                f"did you mean '{suggested_path}'?"
+                if suggested_path in files
+                else "run 'git-hunk list' to see changed files and hunk ids"
+            )
             raise CliError(
                 f"no changed file matches '{target.arg}'",
-                tip="run 'git-hunk list' to see changed files and hunk ids",
+                tip=tip,
             )
         for hunk in matches:
             if hunk.id not in seen:
@@ -368,6 +398,7 @@ def _apply_selection(
     targets: list[_Target],
     selection: _Selection,
     worktree_root: str,
+    invocation_prefix: str,
     staged: bool,
     cached: bool,
     reverse: bool,
@@ -379,7 +410,11 @@ def _apply_selection(
     hunks = [hunk for hunk in inventory.hunks if hunk.status == status]
     diff_output = inventory.staged_diff if staged else inventory.unstaged_diff
     selected = _select_hunks(
-        hunks=hunks, targets=targets, inventory_hunks=inventory.hunks
+        hunks=hunks,
+        targets=targets,
+        inventory_hunks=inventory.hunks,
+        invocation_prefix=invocation_prefix,
+        worktree_root=worktree_root,
     )
     selected = _apply_line_filter(hunks=selected, selection=selection, reverse=reverse)
 
@@ -473,7 +508,7 @@ def _run_patch_command(
     verb: str,
     dry_run: bool,
 ) -> None:
-    worktree_root = _require_worktree_root()
+    worktree_root, invocation_prefix = _require_worktree_context()
     targets = _make_targets(
         args=args,
         worktree_root=worktree_root,
@@ -484,6 +519,7 @@ def _run_patch_command(
         targets=targets,
         selection=selection,
         worktree_root=worktree_root,
+        invocation_prefix=invocation_prefix,
         staged=staged,
         cached=cached,
         reverse=reverse,
@@ -571,7 +607,7 @@ def cmd_list(
         print_help(HELP_LIST)
         return
 
-    worktree_root = _require_worktree_root()
+    worktree_root, _ = _require_worktree_context()
     selected_paths = {
         _make_repository_path(arg=path, worktree_root=worktree_root) for path in files
     }
@@ -612,7 +648,7 @@ def cmd_show(
         print_help(HELP_SHOW)
         return
 
-    worktree_root = _require_worktree_root()
+    worktree_root, _ = _require_worktree_context()
     inventory = _get_inventory(worktree_root=worktree_root)
     hunks = _filter_inventory_hunks(
         inventory=inventory,
@@ -857,7 +893,7 @@ def cmd_commit(
     if message is None or not message.strip():
         raise CliError("commit requires a message (-m)", usage=USAGE_COMMIT)
 
-    worktree_root = _require_worktree_root()
+    worktree_root, invocation_prefix = _require_worktree_context()
     commit_targets = _make_targets(
         args=list(targets),
         worktree_root=worktree_root,
@@ -883,6 +919,7 @@ def cmd_commit(
         targets=commit_targets,
         selection=selection,
         worktree_root=worktree_root,
+        invocation_prefix=invocation_prefix,
         staged=False,
         cached=True,
         reverse=False,

{git_hunk-0.3.1 → git_hunk-0.4.0}/git_hunk/_git.py

@@ -17,8 +17,8 @@ class UnsupportedChange:
 
 
 def run_git(*args: str, worktree_root: str | None, input: str | None = None) -> str:
-    # worktree_root=None is for bootstrap only: the rev-parse that discovers
-    # the root runs in the invocation directory. Every other call anchors there.
+    # A missing root is only for the bootstrap query that discovers both
+    # repository coordinates. Every later call anchors there.
     # Git output and input may contain bytes that are not valid UTF-8 (e.g. a
     # Latin-1 source file). surrogateescape round-trips those bytes losslessly
     # so a rebuilt patch hands git back exactly what it emitted.
@@ -60,9 +60,14 @@ def get_diff(*, worktree_root: str, staged: bool) -> str:
     return run_git(*args, worktree_root=worktree_root)
 
 
-def get_worktree_root() -> str:
-    output = run_git("rev-parse", "--show-toplevel", worktree_root=None)
-    return output.removesuffix("\n")
+def get_worktree_context() -> tuple[str, str]:
+    # Ask Git for this coordinate because Windows can give Git and Python
+    # different spellings for the same directory.
+    output = run_git(
+        "rev-parse", "--show-toplevel", "--show-prefix", worktree_root=None
+    )
+    worktree_root, invocation_prefix = output.removesuffix("\n").split("\n", 1)
+    return worktree_root, invocation_prefix.removesuffix("/")
 
 
 def get_untracked_files(*, worktree_root: str) -> list[str]: