git-copilot-commit 0.5.6__tar.gz → 0.5.7__tar.gz

{git_copilot_commit-0.5.6 → git_copilot_commit-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-copilot-commit
-Version: 0.5.6
+Version: 0.5.7
 Summary: Automatically generate and commit changes using GitHub Copilot
 Author-email: Dheepak Krishnamurthy <1813121+kdheepak@users.noreply.github.com>
 License-File: LICENSE

{git_copilot_commit-0.5.6 → git_copilot_commit-0.5.7}/src/git_copilot_commit/cli.py

@@ -95,6 +95,14 @@ class PreparedSplitCommit:
     patch_units: tuple[PatchUnit, ...]
 
 
+@dataclass(frozen=True, slots=True)
+class SplitCommitExecutionState:
+    """Original HEAD state used to roll back partial split-commit execution."""
+
+    original_head_sha: str | None
+    original_head_ref: str | None
+
+
 CORE_CHANGE_COMMIT_TYPES = frozenset({"feat", "fix", "perf", "refactor", "revert"})
 FOLLOW_UP_COMMIT_TYPE_PRIORITY = {
     "test": 2,
@@ -757,39 +765,62 @@ def execute_split_commit_plan(
             console.print("Invalid choice. Commit cancelled.")
             raise typer.Exit()
 
+    execution_state = SplitCommitExecutionState(
+        original_head_sha=repo.get_head_sha() if repo.has_commit("HEAD") else None,
+        original_head_ref=repo.get_symbolic_head_ref(),
+    )
     commit_shas: list[str] = []
     total_commits = len(prepared_commits)
 
-    for index, prepared_commit in enumerate(prepared_commits, start=1):
-        console.print(
-            f"[cyan]Creating commit {index}/{total_commits}:[/cyan] {prepared_commit.message}"
-        )
+    try:
+        for index, prepared_commit in enumerate(prepared_commits, start=1):
+            console.print(
+                f"[cyan]Creating commit {index}/{total_commits}:[/cyan] {prepared_commit.message}"
+            )
 
-        with repo.temporary_alternate_index() as alternate_index:
-            try:
-                for patch_unit in prepared_commit.patch_units:
-                    repo.check_patch_for_alternate_index(
-                        patch_unit.patch,
-                        index=alternate_index,
+            with repo.temporary_alternate_index() as alternate_index:
+                try:
+                    for patch_unit in prepared_commit.patch_units:
+                        repo.check_patch_for_alternate_index(
+                            patch_unit.patch,
+                            index=alternate_index,
+                        )
+                        repo.apply_patch_to_alternate_index(
+                            patch_unit.patch,
+                            index=alternate_index,
+                        )
+                except GitError as exc:
+                    console.print(
+                        f"[red]Failed to apply the planned changes for commit {index}: {exc}[/red]"
                     )
-                    repo.apply_patch_to_alternate_index(
-                        patch_unit.patch,
-                        index=alternate_index,
+                    raise typer.Exit(1)
+
+                commit_shas.append(
+                    commit_with_retry_no_verify(
+                        repo,
+                        prepared_commit.message,
+                        use_editor=use_editor,
+                        env=alternate_index.env,
                     )
-            except GitError as exc:
-                console.print(
-                    f"[red]Failed to apply the planned changes for commit {index}: {exc}[/red]"
-                )
-                raise typer.Exit(1)
-
-            commit_shas.append(
-                commit_with_retry_no_verify(
-                    repo,
-                    prepared_commit.message,
-                    use_editor=use_editor,
-                    env=alternate_index.env,
                 )
+    except BaseException:
+        try:
+            if execution_state.original_head_sha is not None:
+                repo.soft_reset(execution_state.original_head_sha)
+            elif execution_state.original_head_ref is not None and repo.has_commit(
+                "HEAD"
+            ):
+                repo.delete_ref(execution_state.original_head_ref)
+        except GitError as exc:
+            console.print(
+                "[red]Failed to restore the original staged changes after split commit creation stopped early: "
+                f"{exc}[/red]"
+            )
+        else:
+            console.print(
+                "[yellow]Split commit creation did not complete; restored the original staged changes.[/yellow]"
             )
+        raise
 
     return commit_shas
 

{git_copilot_commit-0.5.6 → git_copilot_commit-0.5.7}/src/git_copilot_commit/git.py

@@ -274,6 +274,15 @@ class GitRepository:
         )
         return result.returncode == 0
 
+    def get_symbolic_head_ref(self) -> str | None:
+        """Return the symbolic ref for HEAD when attached to a branch."""
+        result = self._run_git_command(["symbolic-ref", "-q", "HEAD"], check=False)
+        if result.returncode != 0:
+            return None
+
+        ref = result.stdout.strip()
+        return ref or None
+
     def _parse_status_output(self, status_output: str) -> list[GitFile]:
         """Parse git status --porcelain output into GitFile objects."""
         files = []
@@ -326,6 +335,23 @@ class GitRepository:
         else:
             self._run_git_command(["reset", "HEAD"] + self._normalize_paths(paths))
 
+    def soft_reset(self, ref: str) -> None:
+        """Move HEAD to ref while preserving the working tree and index."""
+        self._run_git_command(["reset", "--soft", ref])
+
+    def delete_ref(self, ref: str, *, missing_ok: bool = False) -> None:
+        """Delete a ref, optionally ignoring missing refs."""
+        result = self._run_git_command(["update-ref", "-d", ref], check=False)
+        if result.returncode == 0 or missing_ok:
+            return
+
+        error_output = result.stderr or result.stdout or ""
+        if error_output:
+            raise GitCommandError(
+                f"Git command failed: git update-ref -d {ref}\n{error_output}"
+            )
+        raise GitCommandError(f"Git command failed: git update-ref -d {ref}")
+
     def create_alternate_index(self, from_ref: str = "HEAD") -> AlternateGitIndex:
         """Create a temporary git index initialized from the provided ref."""
         fd, index_path = tempfile.mkstemp(prefix="git-copilot-commit-", suffix=".index")

{git_copilot_commit-0.5.6 → git_copilot_commit-0.5.7}/tests/test_cli.py

@@ -672,6 +672,62 @@ def test_execute_split_commit_plan_creates_multiple_commits(
     assert recent_messages == ["chore: update last line", "chore: update first line"]
 
 
+def test_execute_split_commit_plan_rolls_back_partial_commits_on_interrupt(
+    git_repo,
+    git_repo_path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(cli.Confirm, "ask", Mock(return_value=True))
+    file_path = git_repo_path / "file.txt"
+    file_path.write_text("a\nb\nc\nd\ne\nf\ng\nh\ni\nj\n", encoding="utf-8")
+    git_repo.stage_files(["file.txt"])
+    git_repo.commit("init", no_verify=True)
+
+    file_path.write_text("A\nb\nc\nd\ne\nf\ng\nh\ni\nJ\n", encoding="utf-8")
+    git_repo.stage_files(["file.txt"])
+    file_path.write_text("A\nbb\nc\nd\ne\nf\ng\nhh\ni\nJ\nextra\n", encoding="utf-8")
+    original_status = git_repo.get_status()
+
+    patch_units = tuple(
+        extract_patch_units(git_repo.get_staged_diff(extra_args=SPLIT_DIFF_ARGS))
+    )
+    prepared_commits = [
+        PreparedSplitCommit(
+            message="chore: update first line",
+            patch_units=(patch_units[0],),
+        ),
+        PreparedSplitCommit(
+            message="chore: update last line",
+            patch_units=(patch_units[1],),
+        ),
+    ]
+
+    commit_attempts = 0
+
+    def interrupting_commit(repo, message, use_editor=False, env=None):
+        nonlocal commit_attempts
+        commit_attempts += 1
+        if commit_attempts == 2:
+            raise KeyboardInterrupt()
+
+        return commit_with_retry_no_verify(
+            repo,
+            message,
+            use_editor=use_editor,
+            env=env,
+        )
+
+    monkeypatch.setattr(cli, "commit_with_retry_no_verify", interrupting_commit)
+
+    with pytest.raises(KeyboardInterrupt):
+        execute_split_commit_plan(git_repo, prepared_commits, yes=True)
+
+    final_status = git_repo.get_status()
+    assert final_status.staged_diff == original_status.staged_diff
+    assert final_status.unstaged_diff == original_status.unstaged_diff
+    assert git_repo.get_recent_commits(limit=1)[0][1] == "init"
+
+
 def test_execute_split_commit_plan_supports_initial_commit(
     git_repo,
     git_repo_path,
@@ -724,6 +780,69 @@ def test_execute_split_commit_plan_supports_initial_commit(
     ]
 
 
+def test_execute_split_commit_plan_rolls_back_partial_initial_commits_on_interrupt(
+    git_repo,
+    git_repo_path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(cli.Confirm, "ask", Mock(return_value=True))
+    src_dir = git_repo_path / "src"
+    src_dir.mkdir()
+    app_file = src_dir / "app.lua"
+    readme_file = git_repo_path / "README.md"
+    app_file.write_text("print('hello')\n", encoding="utf-8")
+    readme_file.write_text("# Project\n", encoding="utf-8")
+    git_repo.stage_files(["src/app.lua", "README.md"])
+    original_status = git_repo.get_status()
+
+    patch_units = tuple(
+        extract_patch_units(git_repo.get_staged_diff(extra_args=SPLIT_DIFF_ARGS))
+    )
+    prepared_commits = [
+        PreparedSplitCommit(
+            message=(
+                f"docs: add {patch_units[0].path}"
+                if patch_units[0].path.endswith(".md")
+                else f"feat: add {patch_units[0].path}"
+            ),
+            patch_units=(patch_units[0],),
+        ),
+        PreparedSplitCommit(
+            message=(
+                f"docs: add {patch_units[1].path}"
+                if patch_units[1].path.endswith(".md")
+                else f"feat: add {patch_units[1].path}"
+            ),
+            patch_units=(patch_units[1],),
+        ),
+    ]
+
+    commit_attempts = 0
+
+    def interrupting_commit(repo, message, use_editor=False, env=None):
+        nonlocal commit_attempts
+        commit_attempts += 1
+        if commit_attempts == 2:
+            raise KeyboardInterrupt()
+
+        return commit_with_retry_no_verify(
+            repo,
+            message,
+            use_editor=use_editor,
+            env=env,
+        )
+
+    monkeypatch.setattr(cli, "commit_with_retry_no_verify", interrupting_commit)
+
+    with pytest.raises(KeyboardInterrupt):
+        execute_split_commit_plan(git_repo, prepared_commits, yes=True)
+
+    final_status = git_repo.get_status()
+    assert final_status.staged_diff == original_status.staged_diff
+    assert final_status.unstaged_diff == original_status.unstaged_diff
+    assert not git_repo.has_commit("HEAD")
+
+
 def test_handle_split_commit_flow_falls_back_to_single_commit(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None: