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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: git-hunk
-Version: 0.4.1
+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

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

@@ -428,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)
@@ -472,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)
@@ -482,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,
@@ -494,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
 
@@ -553,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(

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

@@ -48,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/",