git-copilot-commit 0.5.5__py3-none-any.whl → 0.5.7__py3-none-any.whl

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/git.py

@@ -139,7 +139,9 @@ class GitRepository:
         except subprocess.CalledProcessError:
             raise NotAGitRepositoryError(f"{self.cwd} is not a git repository")
         except subprocess.TimeoutExpired:
-            raise GitCommandError("Git command timed out: git rev-parse --show-toplevel")
+            raise GitCommandError(
+                "Git command timed out: git rev-parse --show-toplevel"
+            )
 
         repo_root = result.stdout.strip()
         if not repo_root:
@@ -264,10 +266,27 @@ class GitRepository:
         result = self._run_git_command(["rev-parse", ref])
         return result.stdout.strip()
 
+    def has_commit(self, ref: str = "HEAD") -> bool:
+        """Return whether the provided ref resolves to a commit."""
+        result = self._run_git_command(
+            ["rev-parse", "--verify", "--quiet", f"{ref}^{{commit}}"],
+            check=False,
+        )
+        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 = []
-        for line in status_output.strip().split("\n"):
+        for line in status_output.splitlines():
             if not line:
                 continue
 
@@ -316,14 +335,32 @@ 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"
-        )
+        fd, index_path = tempfile.mkstemp(prefix="git-copilot-commit-", suffix=".index")
         os.close(fd)
         alternate_index = AlternateGitIndex(Path(index_path))
-        self.read_tree(from_ref, index=alternate_index)
+        if from_ref == "HEAD" and not self.has_commit(from_ref):
+            self.read_empty_tree(index=alternate_index)
+        else:
+            self.read_tree(from_ref, index=alternate_index)
         return alternate_index
 
     @contextmanager
@@ -341,6 +378,10 @@ class GitRepository:
         """Populate an alternate index from the provided ref."""
         self._run_git_command(["read-tree", ref], env=index.env)
 
+    def read_empty_tree(self, *, index: AlternateGitIndex) -> None:
+        """Initialize an alternate index with an empty tree."""
+        self._run_git_command(["read-tree", "--empty"], env=index.env)
+
     def apply_patch(
         self,
         patch: str,

{git_copilot_commit-0.5.5.dist-info → git_copilot_commit-0.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-copilot-commit
-Version: 0.5.5
+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.5.dist-info → git_copilot_commit-0.5.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 git_copilot_commit/__init__.py,sha256=v3x5oBkxwKJEZLv62QqSmP3iqNKLtZgrWZfH8eFzlQg,60
-git_copilot_commit/cli.py,sha256=yN7fq43i3TFerhEOMm4ZHUy2rbiH0n70tIcwrxdWCdc,33929
-git_copilot_commit/git.py,sha256=vNuh2j8TGmocLio4XgPpbXIktlgczNdEt2Fg1c40wuk,14962
+git_copilot_commit/cli.py,sha256=FynjjH0cnMdyjsvNayNhwmDfMaoJyxu8OD5O7pv_Kvg,35221
+git_copilot_commit/git.py,sha256=dEsyazWfD2TIVCpDObwu6TDWRBkzxEjdIKHrQ59h7I0,16697
 git_copilot_commit/github_copilot.py,sha256=2SKVVFmQ2yETAySjSRYKQTujW-1vZEW4rFKSr--dtLs,50427
 git_copilot_commit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 git_copilot_commit/settings.py,sha256=WrM10_J3F7QBfOVmPDWpNZrNHhmZSeN-9FqQZxgdWvQ,3730
@@ -8,8 +8,8 @@ git_copilot_commit/split_commits.py,sha256=rHyuVJggjmYjbva7BVqsM3aZRxUgOKkuZtxxv
 git_copilot_commit/version.py,sha256=AieHOUX52g6N67HL0iLWtDKrgOYyulxwHWViu26Jrd4,105
 git_copilot_commit/prompts/commit-message-generator-prompt.md,sha256=EHAS6w15vLQ-kgT1N7nPG2nWqdeTmlHje_kN9yZIoZQ,2378
 git_copilot_commit/prompts/split-commit-planner-prompt.md,sha256=JActWTKMbdR9eaJyCbQ6UwzyRu5jJi8Iec7H7qWAmAA,1418
-git_copilot_commit-0.5.5.dist-info/METADATA,sha256=8lx9m_ZB9r3MOmWAz-pb8XLHZH1cp2PC_IvWlqRp9yw,6649
-git_copilot_commit-0.5.5.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-git_copilot_commit-0.5.5.dist-info/entry_points.txt,sha256=-D4bQqiuSPwQJG2zx--vJbZD1iqB5coUfoJ_gmC3rSg,66
-git_copilot_commit-0.5.5.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
-git_copilot_commit-0.5.5.dist-info/RECORD,,
+git_copilot_commit-0.5.7.dist-info/METADATA,sha256=8Dw3F46Ybp1PmkPQZmAbCmSrlJNBg_puowP3v2xxMVQ,6649
+git_copilot_commit-0.5.7.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+git_copilot_commit-0.5.7.dist-info/entry_points.txt,sha256=-D4bQqiuSPwQJG2zx--vJbZD1iqB5coUfoJ_gmC3rSg,66
+git_copilot_commit-0.5.7.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
+git_copilot_commit-0.5.7.dist-info/RECORD,,