git-copilot-commit 0.5.4__py3-none-any.whl → 0.5.6__py3-none-any.whl

git_copilot_commit/cli.py

@@ -5,6 +5,7 @@ git-copilot-commit - AI-powered Git commit assistant
 from dataclasses import dataclass
 from pathlib import Path
 import os
+import re
 import sys
 from typing import Annotated, Sequence
 
@@ -94,6 +95,19 @@ class PreparedSplitCommit:
     patch_units: tuple[PatchUnit, ...]
 
 
+CORE_CHANGE_COMMIT_TYPES = frozenset({"feat", "fix", "perf", "refactor", "revert"})
+FOLLOW_UP_COMMIT_TYPE_PRIORITY = {
+    "test": 2,
+    "docs": 3,
+    "style": 4,
+    "chore": 4,
+}
+CONVENTIONAL_COMMIT_TYPE_PATTERN = re.compile(
+    r"^\s*([a-z]+)(?:\([^)\r\n]*\))?(?:!)?:",
+    re.IGNORECASE,
+)
+
+
 def preprocess_cli_args(args: Sequence[str]) -> list[str]:
     """Normalize CLI arguments before Click parses them."""
     processed_args: list[str] = []
@@ -142,6 +156,37 @@ def preprocess_cli_args(args: Sequence[str]) -> list[str]:
     return processed_args
 
 
+def extract_conventional_commit_type(message: str) -> str | None:
+    """Extract the Conventional Commit type from a generated title line."""
+    match = CONVENTIONAL_COMMIT_TYPE_PATTERN.match(message.strip())
+    if match is None:
+        return None
+
+    return match.group(1).lower()
+
+
+def order_prepared_split_commits(
+    prepared_commits: Sequence[PreparedSplitCommit],
+) -> list[PreparedSplitCommit]:
+    """Order planned commits in a developer-friendly execution sequence."""
+
+    def sort_key(item: tuple[int, PreparedSplitCommit]) -> tuple[int, int]:
+        index, prepared_commit = item
+        commit_type = extract_conventional_commit_type(prepared_commit.message)
+
+        if commit_type in CORE_CHANGE_COMMIT_TYPES:
+            priority = 0
+        elif commit_type is None:
+            priority = 1
+        else:
+            priority = FOLLOW_UP_COMMIT_TYPE_PRIORITY.get(commit_type, 1)
+
+        return priority, index
+
+    ordered_items = sorted(enumerate(prepared_commits), key=sort_key)
+    return [prepared_commit for _, prepared_commit in ordered_items]
+
+
 def run(args: Sequence[str] | None = None) -> None:
     """Run the CLI entrypoint with argument normalization."""
     raw_args = list(args) if args is not None else sys.argv[1:]
@@ -862,6 +907,7 @@ def handle_split_commit_flow(
         context=context,
         http_client_config=http_client_config,
     )
+    prepared_commits = order_prepared_split_commits(prepared_commits)
 
     if len(prepared_commits) == 1:
         console.print(

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,18 @@ 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 _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
 
@@ -318,12 +328,13 @@ class GitRepository:
 
     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 +352,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/prompts/split-commit-planner-prompt.md

@@ -15,6 +15,11 @@ small number of coherent commits.
 - Do not split a patch unit further.
 - Preserve the natural order of work. If unit `u1` appears before `u4` in the
   diff, prefer to keep that order within a commit.
+- Order commits the way experienced software developers usually land them:
+  foundational product code first, then tests that validate that code, then
+  docs/examples, then style/chore follow-ups.
+- If a docs or test unit depends on a feat/fix/refactor/perf unit, place the
+  docs or test commit after the underlying code change.
 - If multiple units belong to the same logical change, keep them together.
 - If the staged changes are best represented as a single coherent commit, return
   one commit.

{git_copilot_commit-0.5.4.dist-info → git_copilot_commit-0.5.6.dist-info}/METADATA

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

@@ -1,15 +1,15 @@
 git_copilot_commit/__init__.py,sha256=v3x5oBkxwKJEZLv62QqSmP3iqNKLtZgrWZfH8eFzlQg,60
-git_copilot_commit/cli.py,sha256=k-HCs6skTLysyyHUN-lS9NjrsURvXcq7E2MgdClRnxc,32472
-git_copilot_commit/git.py,sha256=vNuh2j8TGmocLio4XgPpbXIktlgczNdEt2Fg1c40wuk,14962
+git_copilot_commit/cli.py,sha256=yN7fq43i3TFerhEOMm4ZHUy2rbiH0n70tIcwrxdWCdc,33929
+git_copilot_commit/git.py,sha256=hCTcnZC3S8B-b5NY8KbGvlXmHZ_XGwezVW9W9UdrHZE,15612
 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
 git_copilot_commit/split_commits.py,sha256=rHyuVJggjmYjbva7BVqsM3aZRxUgOKkuZtxxvFRcu6Q,15060
 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=ABKuVVyrkHsb3QV6qyS--W5yvKBoZhtq8xJEb3OZQvI,1088
-git_copilot_commit-0.5.4.dist-info/METADATA,sha256=gvVJMTP6Akuyws8U-z0O_ANqUAnq9fAJoEO982M25Q0,6649
-git_copilot_commit-0.5.4.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-git_copilot_commit-0.5.4.dist-info/entry_points.txt,sha256=-D4bQqiuSPwQJG2zx--vJbZD1iqB5coUfoJ_gmC3rSg,66
-git_copilot_commit-0.5.4.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
-git_copilot_commit-0.5.4.dist-info/RECORD,,
+git_copilot_commit/prompts/split-commit-planner-prompt.md,sha256=JActWTKMbdR9eaJyCbQ6UwzyRu5jJi8Iec7H7qWAmAA,1418
+git_copilot_commit-0.5.6.dist-info/METADATA,sha256=HGW7Q_WqyozLqPsmU1mefJwdTcpGD4ieQF8c9TEIIDE,6649
+git_copilot_commit-0.5.6.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+git_copilot_commit-0.5.6.dist-info/entry_points.txt,sha256=-D4bQqiuSPwQJG2zx--vJbZD1iqB5coUfoJ_gmC3rSg,66
+git_copilot_commit-0.5.6.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
+git_copilot_commit-0.5.6.dist-info/RECORD,,