git-hunk 0.1.0__tar.gz → 0.2.0__tar.gz

git_hunk-0.2.0/.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

{git_hunk-0.1.0 → git_hunk-0.2.0}/.github/workflows/lint.yml

@@ -1,10 +1,9 @@
+---
 name: Lint
-
 on:
   push:
     branches: [main]
   pull_request:
-
 jobs:
   lint:
     runs-on: ubuntu-latest

{git_hunk-0.1.0 → git_hunk-0.2.0}/.github/workflows/publish.yml

@@ -1,10 +1,8 @@
+---
 name: Publish to PyPI
-
 on:
   push:
-    tags:
-      - "v*"
-
+    tags: [v*]
 jobs:
   publish:
     runs-on: ubuntu-latest

{git_hunk-0.1.0 → git_hunk-0.2.0}/.github/workflows/test.yml

@@ -1,16 +1,16 @@
+---
 name: Test
-
 on:
   push:
     branches: [main]
   pull_request:
-
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ['3.10', '3.11', '3.12', '3.13']
     steps:
       - uses: actions/checkout@v4
       - uses: astral-sh/setup-uv@v6

git_hunk-0.2.0/Makefile

@@ -0,0 +1,41 @@
+ifneq ($(OS),Windows_NT)
+	SHELL := bash
+endif
+
+.PHONY: help setup format lint test coverage
+.DEFAULT_GOAL := help
+
+PYTEST_ARGS ?= --numprocesses=auto
+
+define exec
+	@uv run --no-sync python -c "print('\033[1;36m$(1)\033[0m')"
+	@$(1)
+endef
+
+help:
+	@uv run --no-sync python -c "import re; lines=open('Makefile').read().splitlines(); print('\033[1;32mAvailable targets:\033[0m'); [print(f'  \033[1;36m{m.group(1):<20s}\033[0m {m.group(2)}') for l in lines if (m:=re.match(r'^([a-zA-Z_-]+):.*?# (.+)$$',l))]"
+
+setup:  # Setup the development environment
+	$(call exec,uv sync)
+
+lint:  # Lint code
+	$(call exec,uv run ruff format --check)
+	$(call exec,uv run ruff check)
+	$(call exec,uv run ty check --no-progress)
+	$(call exec,uv run taplo fmt --check $(shell git ls-files "*.toml"))
+	$(call exec,uv run mdformat --check $(shell git ls-files "*.md"))
+	$(call exec,uv run yamlfix --check $(shell git ls-files "*.yml" "*.yaml"))
+	$(call exec,uv run typos)
+
+format:  # Format code
+	$(call exec,uv run ruff format)
+	$(call exec,uv run ruff check --fix)
+	$(call exec,uv run taplo fmt $(shell git ls-files "*.toml"))
+	$(call exec,uv run mdformat $(shell git ls-files "*.md"))
+	$(call exec,uv run yamlfix $(shell git ls-files "*.yml" "*.yaml"))
+
+test:  # Run tests
+	$(call exec,uv run pytest -v tests/ $(PYTEST_ARGS))
+
+coverage:  # Run tests with coverage
+	$(MAKE) test PYTEST_ARGS="--cov=git_hunk --cov-report=term-missing"

{git_hunk-0.1.0 → git_hunk-0.2.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: git-hunk
-Version: 0.1.0
+Version: 0.2.0
 Summary: Non-interactive, programmatic git hunk staging with stable IDs.
 Project-URL: Homepage, https://github.com/wkentaro/git-hunk
-Project-URL: Repository, https://github.com/wkentaro/git-hunk
 Project-URL: Issues, https://github.com/wkentaro/git-hunk/issues
+Project-URL: Repository, https://github.com/wkentaro/git-hunk
 Author: Kentaro Wada
 License-Expression: MIT
 License-File: LICENSE
@@ -27,17 +27,17 @@ Description-Content-Type: text/markdown
 
 # git-hunk
 
-[![PyPI](https://img.shields.io/pypi/v/git-hunk.svg)](https://pypi.python.org/pypi/git-hunk)
-[![Python](https://img.shields.io/pypi/pyversions/git-hunk.svg)](https://pypi.python.org/pypi/git-hunk)
+[![PyPI](https://img.shields.io/pypi/v/git_hunk.svg)](https://pypi.org/project/git-hunk/)
+[![Python](https://img.shields.io/pypi/pyversions/git_hunk.svg)](https://pypi.org/project/git-hunk/)
 [![Build](https://github.com/wkentaro/git-hunk/actions/workflows/test.yml/badge.svg)](https://github.com/wkentaro/git-hunk/actions/workflows/test.yml)
-[![License](https://img.shields.io/pypi/l/git-hunk.svg)](https://pypi.python.org/pypi/git-hunk)
+[![License](https://img.shields.io/pypi/l/git_hunk.svg)](https://pypi.org/project/git-hunk/)
 
 Non-interactive, programmatic alternative to `git add -p`.
 
 Every hunk gets a stable, content-based ID so you can inspect, filter, and
 stage changes without interactive prompts.
 
-<img src="assets/teaser.png" alt="git-hunk teaser" width="800">
+<img src="https://github.com/wkentaro/git-hunk/blob/main/assets/teaser.png?raw=true" alt="git-hunk teaser" width="800">
 
 ## Why?
 
@@ -70,13 +70,18 @@ git-hunk --version
 
 ### Agent skill (optional)
 
-For Claude Code, Codex, and other AI agents, add the skill via
-[skills](https://github.com/vercel-labs/skills):
+If you use [Claude Code](https://claude.ai/code), [Codex](https://openai.com/codex), or similar AI agents:
 
 ```bash
 npx skills add wkentaro/git-hunk
 ```
 
+Or copy [`SKILL.md`](skills/git-hunk/SKILL.md) to
+`~/.claude/skills/git-hunk/SKILL.md` (or `~/.agents/...`).
+
+This installs a `/git-hunk` slash command that teaches the agent how to split
+changes into logical commits.
+
 ## Quick start
 
 ```bash
@@ -110,11 +115,11 @@ git-hunk list --json                   # JSON output for scripting
 ### Show hunks
 
 ```bash
+git-hunk show                          # show all hunks (staged + unstaged)
 git-hunk show d161935                  # show a single hunk
 git-hunk show d161935 a3f82c1          # show multiple hunks
-git-hunk show --all                    # show all hunks (staged + unstaged)
-git-hunk show --all --staged           # show all staged hunks
-git-hunk show --all --unstaged         # show all unstaged hunks
+git-hunk show --staged                 # show all staged hunks
+git-hunk show --unstaged               # show all unstaged hunks
 ```
 
 ### Stage, unstage, discard
@@ -160,9 +165,9 @@ git-hunk list --json
 ## How it works
 
 1. Parses `git diff` output into individual hunks
-2. Assigns each hunk a stable, content-based ID (SHA-256 prefix)
-3. For staging: reconstructs a minimal patch and pipes it through `git apply --cached`
-4. For discarding: reconstructs a reverse patch and applies it to the working tree
+1. Assigns each hunk a stable, content-based ID (SHA-256 prefix)
+1. For staging: reconstructs a minimal patch and pipes it through `git apply --cached`
+1. For discarding: reconstructs a reverse patch and applies it to the working tree
 
 IDs are stable across partial staging -- they are derived from the changed lines,
 not the `@@` line numbers that shift as you stage hunks.
@@ -182,4 +187,4 @@ make lint    # run linters
 
 ## License
 
-MIT ([LICENSE](LICENSE))
+MIT ([LICENSE](https://github.com/wkentaro/git-hunk/blob/main/LICENSE))

{git_hunk-0.1.0 → git_hunk-0.2.0}/README.md

@@ -1,16 +1,16 @@
 # git-hunk
 
-[![PyPI](https://img.shields.io/pypi/v/git-hunk.svg)](https://pypi.python.org/pypi/git-hunk)
-[![Python](https://img.shields.io/pypi/pyversions/git-hunk.svg)](https://pypi.python.org/pypi/git-hunk)
+[![PyPI](https://img.shields.io/pypi/v/git_hunk.svg)](https://pypi.org/project/git-hunk/)
+[![Python](https://img.shields.io/pypi/pyversions/git_hunk.svg)](https://pypi.org/project/git-hunk/)
 [![Build](https://github.com/wkentaro/git-hunk/actions/workflows/test.yml/badge.svg)](https://github.com/wkentaro/git-hunk/actions/workflows/test.yml)
-[![License](https://img.shields.io/pypi/l/git-hunk.svg)](https://pypi.python.org/pypi/git-hunk)
+[![License](https://img.shields.io/pypi/l/git_hunk.svg)](https://pypi.org/project/git-hunk/)
 
 Non-interactive, programmatic alternative to `git add -p`.
 
 Every hunk gets a stable, content-based ID so you can inspect, filter, and
 stage changes without interactive prompts.
 
-<img src="assets/teaser.png" alt="git-hunk teaser" width="800">
+<img src="https://github.com/wkentaro/git-hunk/blob/main/assets/teaser.png?raw=true" alt="git-hunk teaser" width="800">
 
 ## Why?
 
@@ -43,13 +43,18 @@ git-hunk --version
 
 ### Agent skill (optional)
 
-For Claude Code, Codex, and other AI agents, add the skill via
-[skills](https://github.com/vercel-labs/skills):
+If you use [Claude Code](https://claude.ai/code), [Codex](https://openai.com/codex), or similar AI agents:
 
 ```bash
 npx skills add wkentaro/git-hunk
 ```
 
+Or copy [`SKILL.md`](skills/git-hunk/SKILL.md) to
+`~/.claude/skills/git-hunk/SKILL.md` (or `~/.agents/...`).
+
+This installs a `/git-hunk` slash command that teaches the agent how to split
+changes into logical commits.
+
 ## Quick start
 
 ```bash
@@ -83,11 +88,11 @@ git-hunk list --json                   # JSON output for scripting
 ### Show hunks
 
 ```bash
+git-hunk show                          # show all hunks (staged + unstaged)
 git-hunk show d161935                  # show a single hunk
 git-hunk show d161935 a3f82c1          # show multiple hunks
-git-hunk show --all                    # show all hunks (staged + unstaged)
-git-hunk show --all --staged           # show all staged hunks
-git-hunk show --all --unstaged         # show all unstaged hunks
+git-hunk show --staged                 # show all staged hunks
+git-hunk show --unstaged               # show all unstaged hunks
 ```
 
 ### Stage, unstage, discard
@@ -133,9 +138,9 @@ git-hunk list --json
 ## How it works
 
 1. Parses `git diff` output into individual hunks
-2. Assigns each hunk a stable, content-based ID (SHA-256 prefix)
-3. For staging: reconstructs a minimal patch and pipes it through `git apply --cached`
-4. For discarding: reconstructs a reverse patch and applies it to the working tree
+1. Assigns each hunk a stable, content-based ID (SHA-256 prefix)
+1. For staging: reconstructs a minimal patch and pipes it through `git apply --cached`
+1. For discarding: reconstructs a reverse patch and applies it to the working tree
 
 IDs are stable across partial staging -- they are derived from the changed lines,
 not the `@@` line numbers that shift as you stage hunks.
@@ -155,4 +160,4 @@ make lint    # run linters
 
 ## License
 
-MIT ([LICENSE](LICENSE))
+MIT ([LICENSE](https://github.com/wkentaro/git-hunk/blob/main/LICENSE))

git_hunk-0.2.0/git_hunk/__init__.py

@@ -0,0 +1,3 @@
+import importlib.metadata
+
+__version__ = importlib.metadata.version("git-hunk")

git_hunk-0.2.0/git_hunk/__main__.py

@@ -0,0 +1,3 @@
+from git_hunk._cli import cli
+
+cli()

git_hunk-0.1.0/git_hunk/cli.py → git_hunk-0.2.0/git_hunk/_cli.py

@@ -4,35 +4,34 @@ from dataclasses import replace
 import click
 
 from . import __version__
-from .git import apply_patch
-from .git import discard_files
-from .git import get_diff
-from .git import get_untracked_files
-from .git import is_git_repo
-from .git import stage_files
-from .git import unstage_files
-from .hunk import Hunk
-from .hunk import parse_diff
-from .lines import filter_hunk_lines
-from .lines import parse_line_spec
-from .patch import build_patch
-from .ui import HELP
-from .ui import HELP_DISCARD
-from .ui import HELP_LIST
-from .ui import HELP_SHOW
-from .ui import HELP_STAGE
-from .ui import HELP_UNSTAGE
-from .ui import USAGE
-from .ui import USAGE_DISCARD
-from .ui import USAGE_SHOW
-from .ui import USAGE_STAGE
-from .ui import USAGE_UNSTAGE
-from .ui import print_applied
-from .ui import print_error
-from .ui import print_help
-from .ui import print_hunk_diffs
-from .ui import print_hunk_list
-from .ui import print_version
+from ._git import apply_patch
+from ._git import discard_files
+from ._git import get_diff
+from ._git import get_untracked_files
+from ._git import is_git_repo
+from ._git import stage_files
+from ._git import unstage_files
+from ._hunk import Hunk
+from ._hunk import parse_diff
+from ._lines import filter_hunk_lines
+from ._lines import parse_line_spec
+from ._patch import build_patch
+from ._ui import HELP
+from ._ui import HELP_DISCARD
+from ._ui import HELP_LIST
+from ._ui import HELP_SHOW
+from ._ui import HELP_STAGE
+from ._ui import HELP_UNSTAGE
+from ._ui import USAGE
+from ._ui import USAGE_DISCARD
+from ._ui import USAGE_STAGE
+from ._ui import USAGE_UNSTAGE
+from ._ui import print_applied
+from ._ui import print_error
+from ._ui import print_help
+from ._ui import print_hunk_diffs
+from ._ui import print_hunk_list
+from ._ui import print_version
 
 
 class CliError(Exception):
@@ -230,13 +229,11 @@ def cmd_list(
 
 
 @cli.command("show", add_help_option=False)
-@click.option("--all", "show_all", is_flag=True)
 @click.option("--staged", is_flag=True)
 @click.option("--unstaged", is_flag=True)
 @click.option("-h", "--help", "show_help", is_flag=True)
 @click.argument("ids", nargs=-1)
 def cmd_show(
-    show_all: bool,
     staged: bool,
     unstaged: bool,
     show_help: bool,
@@ -249,12 +246,6 @@ def cmd_show(
     if staged and unstaged:
         raise CliError("cannot use --staged and --unstaged together")
 
-    if show_all and ids:
-        raise CliError("--all cannot be combined with specific hunk ids")
-
-    if not show_all and not ids:
-        raise CliError("show requires at least one hunk id", usage=USAGE_SHOW)
-
     if staged:
         hunks, _ = _get_hunks(staged=True)
     elif unstaged:
@@ -264,10 +255,10 @@ def cmd_show(
         hunks_unstaged, _ = _get_hunks(staged=False)
         hunks = hunks_staged + hunks_unstaged
 
-    if show_all:
-        matched = hunks
-    else:
+    if ids:
         matched = _find_hunks_by_ids(hunks, list(ids))
+    else:
+        matched = hunks
 
     print_hunk_diffs(matched)
 

git_hunk-0.1.0/git_hunk/git.py → git_hunk-0.2.0/git_hunk/_git.py

@@ -14,12 +14,13 @@ def run_git(*args: str, input: str | None = None, check: bool = True) -> str:
     result = subprocess.run(
         ["git"] + list(args),
         capture_output=True,
-        text=True,
-        input=input,
+        input=input.encode() if input is not None else None,
     )
     if check and result.returncode != 0:
-        raise RuntimeError(f"git {' '.join(args)} failed: {result.stderr.strip()}")
-    return result.stdout
+        raise RuntimeError(
+            f"git {' '.join(args)} failed: {result.stderr.decode().strip()}"
+        )
+    return result.stdout.decode()
 
 
 def get_diff(staged: bool = False, files: list[str] | None = None) -> str:

git_hunk-0.1.0/git_hunk/lines.py → git_hunk-0.2.0/git_hunk/_lines.py

@@ -1,8 +1,8 @@
 import re
 from dataclasses import replace
 
-from .hunk import Hunk
-from .hunk import count_changes
+from ._hunk import Hunk
+from ._hunk import count_changes
 
 
 def parse_line_spec(spec: str) -> tuple[set[int], bool]:

git_hunk-0.1.0/git_hunk/patch.py → git_hunk-0.2.0/git_hunk/_patch.py

@@ -1,6 +1,6 @@
 import re
 
-from .hunk import Hunk
+from ._hunk import Hunk
 
 
 def _get_file_header(diff_output: str, filepath: str) -> str:

git_hunk-0.1.0/git_hunk/ui.py → git_hunk-0.2.0/git_hunk/_ui.py

@@ -13,7 +13,7 @@ from rich.console import Console
 from rich.rule import Rule
 from rich.text import Text
 
-from .hunk import Hunk
+from ._hunk import Hunk
 
 
 def _out() -> Console:
@@ -171,7 +171,7 @@ _LINE_OPTS = """\
              Examples: -l 3,5-7  (include)   -l ^3,^5-7  (exclude)"""  # noqa: E501
 
 USAGE = "[bold green]Usage:[/bold green] [bold cyan]git-hunk[/bold cyan] [cyan]<COMMAND>[/cyan]"  # noqa: E501
-USAGE_SHOW = "[bold green]Usage:[/bold green] [bold cyan]git-hunk show[/bold cyan] [cyan]<id>[/cyan] [cyan][<id>...][/cyan] [cyan][OPTIONS][/cyan]"  # noqa: E501
+USAGE_SHOW = "[bold green]Usage:[/bold green] [bold cyan]git-hunk show[/bold cyan] [cyan][<id>...][/cyan] [cyan][OPTIONS][/cyan]"  # noqa: E501
 USAGE_STAGE = "[bold green]Usage:[/bold green] [bold cyan]git-hunk stage[/bold cyan] [cyan]<id>[/cyan] [cyan][<id>...][/cyan] [cyan][OPTIONS][/cyan]"  # noqa: E501
 USAGE_UNSTAGE = "[bold green]Usage:[/bold green] [bold cyan]git-hunk unstage[/bold cyan] [cyan]<id>[/cyan] [cyan][<id>...][/cyan] [cyan][OPTIONS][/cyan]"  # noqa: E501
 USAGE_DISCARD = "[bold green]Usage:[/bold green] [bold cyan]git-hunk discard[/bold cyan] [cyan]<id>[/cyan] [cyan][<id>...][/cyan] [cyan][OPTIONS][/cyan]"  # noqa: E501
@@ -203,12 +203,12 @@ List hunks (unstaged, staged, and untracked by default).
   [bold cyan]--json[/bold cyan]        Output as JSON"""  # noqa: E501
 
 HELP_SHOW = f"""\
-Show the diff for one or more hunks. IDs support prefix matching.
+Show the diff for one or more hunks. Shows all hunks when no IDs given.
+IDs support prefix matching.
 
 {USAGE_SHOW}
 
 [bold green]Options:[/bold green]
-  [bold cyan]--all[/bold cyan]        Show all hunks
   [bold cyan]--staged[/bold cyan]     Show only staged hunks
   [bold cyan]--unstaged[/bold cyan]   Show only unstaged hunks"""
 

git_hunk-0.2.0/pyproject.toml

@@ -0,0 +1,67 @@
+[build-system]
+build-backend = "hatchling.build"
+requires = ["hatch-vcs", "hatchling"]
+
+[project]
+authors = [{ name = "Kentaro Wada" }]
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Environment :: Console",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: MIT License",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Topic :: Software Development :: Version Control :: Git",
+]
+dependencies = ["click>=8", "rich>=13"]
+description = "Non-interactive, programmatic git hunk staging with stable IDs."
+dynamic = ["version"]
+keywords = ["automation", "diff", "git", "hunk", "staging", "version-control"]
+license = "MIT"
+name = "git-hunk"
+readme = "README.md"
+requires-python = ">=3.10"
+
+[project.urls]
+Homepage = "https://github.com/wkentaro/git-hunk"
+Issues = "https://github.com/wkentaro/git-hunk/issues"
+Repository = "https://github.com/wkentaro/git-hunk"
+
+[project.scripts]
+git-hunk = "git_hunk._cli:cli"
+
+[tool.hatch.version]
+source = "vcs"
+
+[dependency-groups]
+dev = [
+  "mdformat-frontmatter>=2.0.10",
+  "mdformat>=0.7",
+  "pytest-cov>=4",
+  "pytest-xdist>=3.8.0",
+  "pytest>=7",
+  "ruff>=0.15.9",
+  "taplo>=0.9",
+  "ty>=0.0.28",
+  "typos>=1.44",
+  "yamlfix>=1.17",
+]
+
+[tool.ruff.lint]
+select = [
+  "ANN", # flake8-annotations
+  "E",   # pycodestyle
+  "F",   # pyflakes
+  "I",   # isort
+  "UP",  # pyupgrade
+]
+
+[tool.ruff.lint.isort]
+force-single-line = true
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]

{git_hunk-0.1.0 → git_hunk-0.2.0}/skills/git-hunk/SKILL.md

@@ -7,7 +7,7 @@ description: |
 license: MIT
 metadata:
   author: wkentaro
-  version: "0.1.0"
+  version: 0.1.0
 allowed-tools:
   - Bash
 ---
@@ -19,18 +19,19 @@ Requires: `uv tool install git-hunk` (or `pip install git-hunk`)
 ## Workflow
 
 1. `git-hunk list` — see all hunks (file, id, +/- stats). No diffs.
-2. `git-hunk show <id> [<id>...]` or `git-hunk show --all` when headers aren't clear enough.
-3. Group hunks into logical commits. Ask the user if grouping is ambiguous.
-4. Stage and commit each group:
+1. `git-hunk show [<id>...]` when headers aren't clear enough (no args shows all).
+1. Plan commits before staging. For each planned commit, list the hunk IDs (and `-l` line ranges for partial hunks). A single hunk may need to be split across commits. Ask the user if grouping is ambiguous.
+1. Stage and commit each group:
    ```bash
    git-hunk stage <id1> <id2> ...
    git commit -m "<type>: <description>"
    ```
-5. `git-hunk list` again to check nothing got left behind.
+1. `git-hunk list` again to check nothing got left behind.
 
 ## Partial hunks
 
 Line selection (`-l`) works with `stage`, `unstage`, and `discard` (requires single id):
+
 - Include lines: `git-hunk stage <id> -l 3,5-7`
 - Exclude lines: `git-hunk stage <id> -l ^3,^5-7`
 

git_hunk-0.2.0/taplo.toml

@@ -0,0 +1,3 @@
+[formatting]
+reorder_arrays = true
+reorder_keys = true

{git_hunk-0.1.0 → git_hunk-0.2.0}/tests/e2e/conftest.py

@@ -5,7 +5,7 @@ import subprocess
 import pytest
 from click.testing import CliRunner
 
-from git_hunk.cli import cli as git_hunk_cli
+from git_hunk._cli import cli as git_hunk_cli
 from tests.conftest import GitRepo
 
 

{git_hunk-0.1.0 → git_hunk-0.2.0}/tests/e2e/show_test.py

@@ -60,7 +60,7 @@ def test_show_finds_staged_hunk_without_flag(cli: GitHunkCLI) -> None:
     assert "+new" in r.stdout
 
 
-def test_show_all_includes_staged_and_unstaged(cli: GitHunkCLI) -> None:
+def test_show_no_args_shows_all(cli: GitHunkCLI) -> None:
     cli.repo.write_file("a.py", "old\n")
     cli.repo.write_file("b.py", "old\n")
     cli.repo.git("add", ".")
@@ -69,7 +69,7 @@ def test_show_all_includes_staged_and_unstaged(cli: GitHunkCLI) -> None:
     cli.repo.git("add", "a.py")
     cli.repo.write_file("b.py", "unstaged\n")
 
-    r = cli.run("show", "--all")
+    r = cli.run("show")
     assert r.returncode == 0
     assert "+staged" in r.stdout
     assert "+unstaged" in r.stdout
@@ -81,5 +81,5 @@ def test_show_staged_and_unstaged_together_errors(cli: GitHunkCLI) -> None:
     cli.repo.git("commit", "-m", "init")
     cli.repo.write_file("f.py", "new\n")
 
-    r = cli.run("show", "--staged", "--unstaged", "--all")
+    r = cli.run("show", "--staged", "--unstaged")
     assert r.returncode != 0

{git_hunk-0.1.0/tests/unit/hunk → git_hunk-0.2.0/tests/unit/_hunk}/id_test.py

@@ -1,8 +1,8 @@
-from git_hunk.hunk import Hunk
-from git_hunk.hunk import _body_id
-from git_hunk.hunk import _full_id
-from git_hunk.hunk import _with_stable_ids
-from git_hunk.hunk import count_changes
+from git_hunk._hunk import Hunk
+from git_hunk._hunk import _body_id
+from git_hunk._hunk import _full_id
+from git_hunk._hunk import _with_stable_ids
+from git_hunk._hunk import count_changes
 
 
 def test_body_id_ignores_header_line_numbers() -> None:

{git_hunk-0.1.0/tests/unit/hunk → git_hunk-0.2.0/tests/unit/_hunk}/parse_diff_test.py

@@ -1,4 +1,4 @@
-from git_hunk.hunk import parse_diff
+from git_hunk._hunk import parse_diff
 
 
 def test_splits_large_hunk() -> None:

{git_hunk-0.1.0/tests/unit/hunk → git_hunk-0.2.0/tests/unit/_hunk}/split_test.py

@@ -1,4 +1,4 @@
-from git_hunk.hunk import _split_hunk
+from git_hunk._hunk import _split_hunk
 
 
 def test_single_region_no_split() -> None:

{git_hunk-0.1.0/tests/unit/lines → git_hunk-0.2.0/tests/unit/_lines}/filter_test.py

@@ -1,7 +1,7 @@
 import pytest
 
-from git_hunk.hunk import Hunk
-from git_hunk.lines import filter_hunk_lines
+from git_hunk._hunk import Hunk
+from git_hunk._lines import filter_hunk_lines
 
 
 def _make_hunk(diff: str) -> Hunk:

{git_hunk-0.1.0/tests/unit/lines → git_hunk-0.2.0/tests/unit/_lines}/parse_spec_test.py

@@ -1,6 +1,6 @@
 import pytest
 
-from git_hunk.lines import parse_line_spec
+from git_hunk._lines import parse_line_spec
 
 
 def test_single_line() -> None:

git_hunk-0.1.0/tests/unit/patch/build_test.py → git_hunk-0.2.0/tests/unit/_patch_test.py

@@ -1,8 +1,8 @@
 import pytest
 
-from git_hunk.hunk import Hunk
-from git_hunk.patch import _get_file_header
-from git_hunk.patch import build_patch
+from git_hunk._hunk import Hunk
+from git_hunk._patch import _get_file_header
+from git_hunk._patch import build_patch
 
 DIFF_SINGLE = (
     "diff --git a/f.py b/f.py\n"