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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: git-hunk
-Version: 0.4.0
+Version: 0.4.2
 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
@@ -71,7 +71,7 @@ variant: organize a dirty working tree into correct, focused commits, once
 following git-hunk's bundled skills and once restricted to bare Git. The
 [checked-in eval harness](https://github.com/wkentaro/git-hunk/tree/0ef14bef657e187b5ab7283b0dbd64751a02736f/eval)
 grades the exact resulting repository state — commit partition and order, final
-tree, index, and leftovers. This table records the qualifying run; `make eval`
+tree, index, and leftovers. This table records the qualifying run; `just eval`
 reruns the protocol and prints a table in the same format.
 
 | Task | git-hunk | bare Git |
@@ -370,12 +370,16 @@ content and creates new IDs.
 Bug reports, feature requests, and pull requests are welcome on
 [GitHub](https://github.com/wkentaro/git-hunk).
 
+Install [just](https://just.systems/man/en/packages.html) 1.58.0 or newer and
+[uv](https://docs.astral.sh/uv/getting-started/installation/). Recipes use Bash;
+on Windows, install Git for Windows and make its Bash available on `PATH`.
+
 ```bash
 git clone https://github.com/wkentaro/git-hunk.git
 cd git-hunk
-make setup   # install dependencies
-make test    # run tests
-make lint    # run linters
+just setup   # install dependencies
+just test    # run tests
+just lint    # run linters
 ```
 
 ## License

{git_hunk-0.4.0 → git_hunk-0.4.2}/README.md

@@ -43,7 +43,7 @@ variant: organize a dirty working tree into correct, focused commits, once
 following git-hunk's bundled skills and once restricted to bare Git. The
 [checked-in eval harness](https://github.com/wkentaro/git-hunk/tree/0ef14bef657e187b5ab7283b0dbd64751a02736f/eval)
 grades the exact resulting repository state — commit partition and order, final
-tree, index, and leftovers. This table records the qualifying run; `make eval`
+tree, index, and leftovers. This table records the qualifying run; `just eval`
 reruns the protocol and prints a table in the same format.
 
 | Task | git-hunk | bare Git |
@@ -342,12 +342,16 @@ content and creates new IDs.
 Bug reports, feature requests, and pull requests are welcome on
 [GitHub](https://github.com/wkentaro/git-hunk).
 
+Install [just](https://just.systems/man/en/packages.html) 1.58.0 or newer and
+[uv](https://docs.astral.sh/uv/getting-started/installation/). Recipes use Bash;
+on Windows, install Git for Windows and make its Bash available on `PATH`.
+
 ```bash
 git clone https://github.com/wkentaro/git-hunk.git
 cd git-hunk
-make setup   # install dependencies
-make test    # run tests
-make lint    # run linters
+just setup   # install dependencies
+just test    # run tests
+just lint    # run linters
 ```
 
 ## License

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

@@ -69,6 +69,9 @@ JSON_SCHEMA_VERSION: Final = 2
 
 
 class CliError(Exception):
+    tip: str | None
+    usage: str | None
+
     def __init__(
         self,
         message: str,
@@ -425,6 +428,7 @@ def _apply_selection(
         hunk for hunk in selected if hunk.binary or hunk.change_kind == "T"
     ]
 
+    changes_applied = False
     try:
         patch = (
             build_patch(patch_hunks, diff_output, reverse=reverse)
@@ -469,6 +473,7 @@ def _apply_selection(
                 reverse=reverse,
                 dry_run=False,
             )
+            changes_applied = True
         if file_command_files:
             if reverse and not cached:
                 discard_files(file_command_files, worktree_root=worktree_root)
@@ -479,6 +484,7 @@ def _apply_selection(
                         worktree_root=worktree_root,
                         dry_run=False,
                     )
+                    changes_applied = True
                 if tracked_file_command_files:
                     unstage_files(
                         tracked_file_command_files,
@@ -491,7 +497,13 @@ def _apply_selection(
                     dry_run=False,
                 )
     except RuntimeError as exc:
-        raise CliError(str(exc)) from exc
+        message = str(exc)
+        if changes_applied:
+            message = (
+                f"{message}; earlier changes were applied, so the repository may be "
+                "partially changed; inspect its state before retrying"
+            )
+        raise CliError(message) from exc
 
     return selected
 
@@ -550,22 +562,25 @@ def _working_tree_mode(*, path: str) -> str:
 
 
 def _get_untracked_entries(*, worktree_root: str) -> list[Hunk]:
-    paths = get_untracked_files(worktree_root=worktree_root)
-    if not paths:
-        return []
-    return [
-        whole_file_hunk(
-            p,
-            change_kind="A",
-            a_mode=None,
-            b_mode=_working_tree_mode(path=posixpath.join(worktree_root, p)),
-            binary=False,
-            a_object_id=None,
-            b_object_id=None,
-            status="untracked",
-        )
-        for p in paths
-    ]
+    try:
+        paths = get_untracked_files(worktree_root=worktree_root)
+        if not paths:
+            return []
+        return [
+            whole_file_hunk(
+                p,
+                change_kind="A",
+                a_mode=None,
+                b_mode=_working_tree_mode(path=posixpath.join(worktree_root, p)),
+                binary=False,
+                a_object_id=None,
+                b_object_id=None,
+                status="untracked",
+            )
+            for p in paths
+        ]
+    except (OSError, RuntimeError) as exc:
+        raise CliError(str(exc)) from exc
 
 
 def _filter_inventory_hunks(
@@ -868,7 +883,7 @@ def cmd_discard(
 
 
 @cli.command("commit", add_help_option=False)
-@click.option("-m", "message", default=None)
+@click.option("-m", "messages", multiple=True)
 @click.option("-l", "line_spec", default=None)
 @click.option("--include-matching", "include_matching", multiple=True)
 @click.option("--exclude-matching", "exclude_matching", multiple=True)
@@ -879,7 +894,7 @@ def cmd_discard(
 def cmd_commit(
     *,
     targets: tuple[str, ...],
-    message: str | None,
+    messages: tuple[str, ...],
     line_spec: str | None,
     include_matching: tuple[str, ...],
     exclude_matching: tuple[str, ...],
@@ -890,7 +905,10 @@ def cmd_commit(
     if show_help:
         print_help(HELP_COMMIT)
         return
-    if message is None or not message.strip():
+    # Each -m is its own paragraph, as in git commit; git's own cleanup then
+    # collapses blank ones.
+    message = "\n\n".join(messages)
+    if not message.strip():
         raise CliError("commit requires a message (-m)", usage=USAGE_COMMIT)
 
     worktree_root, invocation_prefix = _require_worktree_context()

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

@@ -4,6 +4,8 @@ from typing import Final
 
 
 class GitCommandError(RuntimeError):
+    stderr: str
+
     def __init__(self, command: tuple[str, ...], stderr: str, /) -> None:
         self.stderr = stderr
         super().__init__(f"git {' '.join(command)} failed: {stderr}")
@@ -46,9 +48,13 @@ def get_diff(*, worktree_root: str, staged: bool) -> str:
     # floor stays at --no-relative's 2.28 instead of --default-prefix's 2.41.
     # --no-color: a color.diff or color.ui set to always emits ANSI escapes
     # even into a pipe, and the parse would find nothing.
+    # Display drivers can replace source patches with transformed or empty
+    # output, while inventory and mutation need the canonical source bytes.
     args = [
         "diff",
         "--no-color",
+        "--no-ext-diff",
+        "--no-textconv",
         "--no-relative",
         "--src-prefix=a/",
         "--dst-prefix=b/",

{git_hunk-0.4.0 → git_hunk-0.4.2}/git_hunk/_ui.py

@@ -438,7 +438,7 @@ can retry with [bold cyan]git commit[/bold cyan].
 {USAGE_COMMIT}
 
 [bold green]Options:[/bold green]
-  [bold cyan]-m[/bold cyan] [cyan]<msg>[/cyan]    Commit message (required)
+  [bold cyan]-m[/bold cyan] [cyan]<msg>[/cyan]    Commit message (required; repeat for more paragraphs)
 {_LINE_OPT_ROW}
 
 {_format_examples(rows=_EXAMPLES_COMMIT)}"""  # noqa: E501

{git_hunk-0.4.0 → git_hunk-0.4.2}/git_hunk/skills/core/SKILL.md

@@ -30,7 +30,8 @@ git-hunk list
 `git-hunk commit <id-or-path>... -m <message>` stages exactly those hunks and
 commits them; it aborts when the index already holds staged changes. A
 Repository path selects every changed hunk in one exact file and beats an ID
-when committing a whole file.
+when committing a whole file. Repeat `-m` as with `git commit`: each one
+becomes its own paragraph.
 
 Committing a complete hunk leaves every other non-`conditional` ID valid, so a
 whole plan of complete hunks chains in one call.

{git_hunk-0.4.0 → git_hunk-0.4.2}/pyproject.toml

@@ -59,7 +59,7 @@ include = ["/README.md", "/git_hunk"]
 
 [dependency-groups]
 dev = [
-  "gruff>=0.0.6",
+  "gruff>=0.0.10",
   "mdformat-frontmatter>=2.0.10",
   "mdformat>=0.7",
   "pytest-cov>=4",