git-commit-message 0.9.0__tar.gz → 0.9.1__tar.gz

{git_commit_message-0.9.0 → git_commit_message-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-commit-message
-Version: 0.9.0
+Version: 0.9.1
 Summary: Generate Git commit messages from staged changes using LLM
 Maintainer-email: Mina Her <minacle@live.com>
 License: This is free and unencumbered software released into the public domain.
@@ -31,7 +31,7 @@ License: This is free and unencumbered software released into the public domain.
 Project-URL: Homepage, https://github.com/minacle/git-commit-message
 Project-URL: Repository, https://github.com/minacle/git-commit-message
 Project-URL: Issues, https://github.com/minacle/git-commit-message/issues
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: The Unlicense (Unlicense)
@@ -40,6 +40,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Version Control :: Git
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown

{git_commit_message-0.9.0 → git_commit_message-0.9.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "git-commit-message"
-version = "0.9.0"
+version = "0.9.1"
 description = "Generate Git commit messages from staged changes using LLM"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -13,7 +13,7 @@ dependencies = [
 maintainers = [{ name = "Mina Her", email = "minacle@live.com" }]
 license = { file = "UNLICENSE" }
 classifiers = [
-	"Development Status :: 3 - Alpha",
+	"Development Status :: 4 - Beta",
 	"Environment :: Console",
 	"Intended Audience :: Developers",
 	"License :: OSI Approved :: The Unlicense (Unlicense)",
@@ -22,6 +22,7 @@ classifiers = [
 	"Programming Language :: Python :: 3",
 	"Programming Language :: Python :: 3 :: Only",
 	"Programming Language :: Python :: 3.13",
+	"Programming Language :: Python :: 3.14",
 	"Topic :: Software Development :: Version Control :: Git",
 ]
 

{git_commit_message-0.9.0 → git_commit_message-0.9.1}/src/git_commit_message/_cli.py

@@ -17,6 +17,8 @@ from typing import Final
 
 from ._git import (
     commit_with_message,
+    get_current_branch,
+    get_git_log,
     get_repo_root,
     get_staged_diff,
     has_head_commit,
@@ -47,6 +49,9 @@ class CliArgs(Namespace):
         "max_length",
         "chunk_tokens",
         "diff_context",
+        "no_branch",
+        "no_log",
+        "log_count",
         "host",
         "co_authors",
     )
@@ -68,6 +73,9 @@ class CliArgs(Namespace):
         self.max_length: int | None = None
         self.chunk_tokens: int | None = None
         self.diff_context: int | None = None
+        self.no_branch: bool = False
+        self.no_log: bool = False
+        self.log_count: int = 10
         self.host: str | None = None
         self.co_authors: list[str] | None = None
 
@@ -304,6 +312,31 @@ def _build_parser() -> ArgumentParser:
         ),
     )
 
+    parser.add_argument(
+        "--no-branch",
+        dest="no_branch",
+        action="store_true",
+        help="Do not include the current branch name in the LLM context.",
+    )
+
+    parser.add_argument(
+        "--no-log",
+        dest="no_log",
+        action="store_true",
+        help="Do not include recent Git log entries in the LLM context.",
+    )
+
+    parser.add_argument(
+        "--log-count",
+        dest="log_count",
+        type=int,
+        default=10,
+        help=(
+            "Number of recent Git log entries to include in the LLM context "
+            "(default: 10). Ignored when --no-log is set."
+        ),
+    )
+
     parser.add_argument(
         "--host",
         dest="host",
@@ -370,6 +403,10 @@ def _run(
         print("--diff-context must be greater than or equal to 0.", file=stderr)
         return 2
 
+    if not args.no_log and args.log_count < 1:
+        print("--log-count must be greater than or equal to 1.", file=stderr)
+        return 2
+
     provider_name: str = resolve_provider_name(args.provider)
     provider_arg_error = validate_provider_chunk_tokens(provider_name, chunk_tokens)
     if provider_arg_error is not None:
@@ -396,6 +433,9 @@ def _run(
 
         diff_text = get_staged_diff(repo_root, context_lines=diff_context)
 
+    branch: str | None = None if args.no_branch else get_current_branch(repo_root)
+    log: str | None = None if args.no_log else get_git_log(repo_root, count=args.log_count)
+
     hint: str | None = args.description if isinstance(args.description, str) else None
 
     normalized_co_authors: list[str] | None = None
@@ -420,6 +460,8 @@ def _run(
                 args.provider,
                 args.host,
                 args.conventional,
+                branch=branch,
+                log=log,
             )
             message = result.message
         else:
@@ -434,6 +476,8 @@ def _run(
                 args.provider,
                 args.host,
                 args.conventional,
+                branch=branch,
+                log=log,
             )
     except UnsupportedProviderError as exc:
         print(str(exc), file=stderr)

{git_commit_message-0.9.0 → git_commit_message-0.9.1}/src/git_commit_message/_git.py

@@ -232,6 +232,80 @@ def get_staged_diff(
     return out.decode()
 
 
+def get_current_branch(
+    cwd: Path,
+    /,
+) -> str | None:
+    """Return the current branch name, or ``None`` if HEAD is detached.
+
+    Parameters
+    ----------
+    cwd
+        Repository directory in which to run Git.
+
+    Returns
+    -------
+    str | None
+        Branch name, or ``None`` when HEAD is detached or the command fails.
+    """
+
+    completed = run(
+        ["git", "branch", "--show-current"],
+        cwd=str(cwd),
+        check=False,
+        capture_output=True,
+    )
+    if completed.returncode != 0:
+        return None
+    name = completed.stdout.decode().strip()
+    return name or None
+
+
+def get_git_log(
+    cwd: Path,
+    /,
+    *,
+    count: int = 10,
+) -> str | None:
+    """Return recent Git log entries as formatted text.
+
+    Parameters
+    ----------
+    cwd
+        Repository directory in which to run Git.
+    count
+        Maximum number of commits to include.
+
+    Returns
+    -------
+    str | None
+        Formatted log text, or ``None`` if the repository has no commits
+        or if ``git log`` fails.
+    """
+
+    if count < 1:
+        raise ValueError(f"count must be >= 1, got {count}")
+
+    if not has_head_commit(cwd):
+        return None
+
+    try:
+        out: bytes = check_output(
+            [
+                "git",
+                "log",
+                f"-{count}",
+                "--format=%h %s%n%n%b%n---%n",
+            ],
+            cwd=str(cwd),
+        )
+    except CalledProcessError:
+        return None
+
+    text = out.decode().strip()
+    return text or None
+
+
 def commit_with_message(
     message: str,
     edit: bool,

{git_commit_message-0.9.0 → git_commit_message-0.9.1}/src/git_commit_message/_llm.py

@@ -298,12 +298,19 @@ def _build_combined_prompt(
     hint: str | None,
     content_label: str = "Changes (diff)",
     /,
+    *,
+    branch: str | None = None,
+    log: str | None = None,
 ) -> str:
-    hint_content: str | None = (
-        f"# Auxiliary context (user-provided)\n{hint}" if hint else None
-    )
-    content: str = f"# {content_label}\n{diff}"
-    return "\n\n".join([part for part in (hint_content, content) if part is not None])
+    parts: list[str] = []
+    if hint:
+        parts.append(f"# Auxiliary context (user-provided)\n{hint}")
+    if branch:
+        parts.append(f"# Current branch\n{branch}")
+    if log:
+        parts.append(f"# Recent commits\n{log}")
+    parts.append(f"# {content_label}\n{diff}")
+    return "\n\n".join(parts)
 
 
 def _split_diff_into_hunks(
@@ -423,6 +430,9 @@ def _generate_commit_from_summaries(
     language: str,
     conventional: bool = False,
     /,
+    *,
+    branch: str | None = None,
+    log: str | None = None,
 ) -> LLMTextResult:
     instructions = _build_system_prompt(single_line, subject_max, language, conventional)
     sections: list[str] = []
@@ -430,6 +440,12 @@ def _generate_commit_from_summaries(
     if hint:
         sections.append(f"# Auxiliary context (user-provided)\n{hint}")
 
+    if branch:
+        sections.append(f"# Current branch\n{branch}")
+
+    if log:
+        sections.append(f"# Recent commits\n{log}")
+
     if summaries:
         numbered = [
             f"Summary {idx + 1}:\n{summary}" for idx, summary in enumerate(summaries)
@@ -490,6 +506,9 @@ def generate_commit_message(
     host: str | None = None,
     conventional: bool = False,
     /,
+    *,
+    branch: str | None = None,
+    log: str | None = None,
 ) -> str:
     chosen_provider = resolve_provider_name(provider)
     chosen_model = resolve_model_name(model, chosen_provider)
@@ -523,11 +542,13 @@ def generate_commit_message(
             subject_max,
             chosen_language,
             conventional,
+            branch=branch,
+            log=log,
         )
         text = (final.text or "").strip()
     else:
         instructions = _build_system_prompt(single_line, subject_max, chosen_language, conventional)
-        user_text = _build_combined_prompt(diff, hint)
+        user_text = _build_combined_prompt(diff, hint, branch=branch, log=log)
         final = llm.generate_text(
             model=chosen_model,
             instructions=instructions,
@@ -553,6 +574,9 @@ def generate_commit_message_with_info(
     host: str | None = None,
     conventional: bool = False,
     /,
+    *,
+    branch: str | None = None,
+    log: str | None = None,
 ) -> CommitMessageResult:
     chosen_provider = resolve_provider_name(provider)
     chosen_model = resolve_model_name(model, chosen_provider)
@@ -588,12 +612,16 @@ def generate_commit_message_with_info(
             subject_max,
             chosen_language,
             conventional,
+            branch=branch,
+            log=log,
         )
 
         combined_prompt = _build_combined_prompt(
             "\n".join(summary_texts),
             hint,
             "Combined summaries (English)",
+            branch=branch,
+            log=log,
         )
 
         prompt_tokens, completion_tokens, total_tokens = _sum_usage(
@@ -605,7 +633,7 @@ def generate_commit_message_with_info(
 
     else:
         instructions = _build_system_prompt(single_line, subject_max, chosen_language, conventional)
-        combined_prompt = _build_combined_prompt(diff, hint)
+        combined_prompt = _build_combined_prompt(diff, hint, branch=branch, log=log)
 
         final_result = llm.generate_text(
             model=chosen_model,

{git_commit_message-0.9.0 → git_commit_message-0.9.1}/src/git_commit_message.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-commit-message
-Version: 0.9.0
+Version: 0.9.1
 Summary: Generate Git commit messages from staged changes using LLM
 Maintainer-email: Mina Her <minacle@live.com>
 License: This is free and unencumbered software released into the public domain.
@@ -31,7 +31,7 @@ License: This is free and unencumbered software released into the public domain.
 Project-URL: Homepage, https://github.com/minacle/git-commit-message
 Project-URL: Repository, https://github.com/minacle/git-commit-message
 Project-URL: Issues, https://github.com/minacle/git-commit-message/issues
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: The Unlicense (Unlicense)
@@ -40,6 +40,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Version Control :: Git
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown