tgit 0.13.2__tar.gz → 0.16.0__tar.gz

{tgit-0.13.2 → tgit-0.16.0}/CHANGELOG.md

@@ -1,6 +1,90 @@
-## HEAD
+## v0.16.0
 
-[v0.13.0...HEAD](https://github.com/Jannchie/tgit/compare/v0.13.0...HEAD)
+[v0.15.1...v0.16.0](https://github.com/Jannchie/tgit/compare/v0.15.1...v0.16.0)
+
+### :sparkles: Features
+
+- **version-changelog**: add interactive changelog generation on version bump - By [Jianqi Pan](mailto:jannchie@gmail.com) in [2c6c3b3](https://github.com/Jannchie/tgit/commit/2c6c3b3)
+
+### :adhesive_bandage: Fixes
+
+- **changelog**: report no changes when changelog empty - By [Jianqi Pan](mailto:jannchie@gmail.com) in [02d94ff](https://github.com/Jannchie/tgit/commit/02d94ff)
+
+### :art: Refactors
+
+- **changelog**: simplify current tag handling in changelog - By [Jianqi Pan](mailto:jannchie@gmail.com) in [6ac7903](https://github.com/Jannchie/tgit/commit/6ac7903)
+
+## v0.15.1
+
+[v0.15.0...v0.15.1](https://github.com/Jannchie/tgit/compare/v0.15.0...v0.15.1)
+
+### :wrench: Chores
+
+- **deps**: update lock file - By [Jianqi Pan](mailto:jannchie@gmail.com) in [4ab3b1e](https://github.com/Jannchie/tgit/commit/4ab3b1e)
+
+## v0.15.0
+
+[v0.14.2...v0.15.0](https://github.com/Jannchie/tgit/compare/v0.14.2...v0.15.0)
+
+### :sparkles: Features
+
+- **prompts**: revise commit message instructions for clarity - By [Jianqi Pan](mailto:jannchie@gmail.com) in [b58f9ec](https://github.com/Jannchie/tgit/commit/b58f9ec)
+
+## v0.14.2
+
+[v0.14.1...v0.14.2](https://github.com/Jannchie/tgit/compare/v0.14.1...v0.14.2)
+
+### :adhesive_bandage: Fixes
+
+- **version**: fix bump logic for v0 breaking changes to minor - By [Jianqi Pan](mailto:jannchie@gmail.com) in [0f14045](https://github.com/Jannchie/tgit/commit/0f14045)
+
+### :art: Refactors
+
+- **changelog**: extract changelog segment, write helpers && simplify handle logic - By [Jianqi Pan](mailto:jannchie@gmail.com) in [ebc1e17](https://github.com/Jannchie/tgit/commit/ebc1e17)
+
+### :lipstick: Styles
+
+- **changelog**: add extra newline before old changelog content && remove noqa for rich print import - By [Jianqi Pan](mailto:jannchie@gmail.com) in [ca93aaf](https://github.com/Jannchie/tgit/commit/ca93aaf)
+
+### :memo: Documentation
+
+- **changelog**: update changelog for v0.14.0 and v0.14.1 - By [Jianqi Pan](mailto:jannchie@gmail.com) in [3d26e26](https://github.com/Jannchie/tgit/commit/3d26e26)
+
+## v0.14.1
+
+[v0.14.0...v0.14.1](https://github.com/Jannchie/tgit/compare/v0.14.0...v0.14.1)
+
+### :adhesive_bandage: Fixes
+
+- **changelog**: prepend new changelog entries if file exists - By [Jianqi Pan](mailto:jannchie@gmail.com) in [c4b3dff](https://github.com/Jannchie/tgit/commit/c4b3dff)
+
+## v0.14.0
+
+[v0.13.2...v0.14.0](https://github.com/Jannchie/tgit/compare/v0.13.2...v0.14.0)
+
+### :sparkles: Features
+
+- **changelog**: add incremental changelog generation && support appending to existing file - By [Jianqi Pan](mailto:jannchie@gmail.com) in [2d193a5](https://github.com/Jannchie/tgit/commit/2d193a5)
+
+### :adhesive_bandage: Fixes
+
+- **changelog**: remove head from default changelog range && update changelog entries - By [Jianqi Pan](mailto:jannchie@gmail.com) in [f6509e3](https://github.com/Jannchie/tgit/commit/f6509e3)
+
+## v0.13.2
+
+[v0.13.1...v0.13.2](https://github.com/Jannchie/tgit/compare/v0.13.1...v0.13.2)
+
+### :adhesive_bandage: Fixes
+
+- **cli**: suppress import error for openai in thread - By [Jianqi Pan](mailto:jannchie@gmail.com) in [4973127](https://github.com/Jannchie/tgit/commit/4973127)
+
+## v0.13.1
+
+[v0.13.0...v0.13.1](https://github.com/Jannchie/tgit/compare/v0.13.0...v0.13.1)
+
+### :adhesive_bandage: Fixes
+
+- **commit**: update no-files message for ai command - By [Jianqi Pan](mailto:jannchie@gmail.com) in [cda3740](https://github.com/Jannchie/tgit/commit/cda3740)
 
 ### :wrench: Chores
 

{tgit-0.13.2 → tgit-0.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tgit
-Version: 0.13.2
+Version: 0.16.0
 Summary: Tool for Git Interaction Temptation (tgit): An elegant CLI tool that simplifies and streamlines your Git workflow, making version control a breeze.
 Author-email: Jannchie <jannchie@gmail.com>
 License-Expression: MIT

{tgit-0.13.2 → tgit-0.16.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tgit"
-version = "0.13.2"
+version = "0.16.0"
 description = "Tool for Git Interaction Temptation (tgit): An elegant CLI tool that simplifies and streamlines your Git workflow, making version control a breeze."
 authors = [{ name = "Jannchie", email = "jannchie@gmail.com" }]
 dependencies = [

{tgit-0.13.2 → tgit-0.16.0}/tgit/changelog.py

@@ -1,3 +1,4 @@
+import contextlib
 import logging
 import re
 import warnings
@@ -231,27 +232,88 @@ def generate_changelog(commits_by_type: dict[str, list[TGITCommit]], from_ref: s
     return out_str
 
 
-def handle_changelog(args: ChangelogArgs) -> None:
-    repo = git.Repo(args.path)
+def extract_latest_tag_from_changelog(filepath: str) -> str | None:
+    filepath = Path(filepath)
+    with contextlib.suppress(FileNotFoundError), filepath.open(encoding="utf-8") as f:
+        for line in f:
+            if line.startswith("## "):
+                return line.strip().removeprefix("## ").strip()
+    return None
 
+
+def prepare_changelog_segments(
+    repo: git.Repo,
+    latest_tag_in_file: str | None = None,
+    current_tag: str | None = None,
+) -> list[tuple[str, str, str, str]]:
+    tags = sorted(repo.tags, key=lambda t: t.commit.committed_datetime)
+    if not tags:
+        print("[yellow]No tags found in the repository.[/yellow]")
+        return []
+    first_commit = get_first_commit_hash(repo)
+
+    points = [first_commit] + [tag.commit.hexsha for tag in tags]
+    point_names = [first_commit] + [tag.name for tag in tags]
+    if current_tag is not None:
+        point_names += ["HEAD"]
+        points += ["HEAD"]
+    start_idx = 1
+    if latest_tag_in_file and latest_tag_in_file in point_names:
+        idx = point_names.index(latest_tag_in_file)
+        start_idx = idx + 1
+    segments: list[tuple[str, str, str, str]] = [
+        (points[i - 1], points[i], point_names[i - 1], point_names[i]) for i in reversed(range(start_idx, len(points)))
+    ]
+    if current_tag is not None:
+        segments[0] = (segments[0][0], "HEAD", segments[0][2], current_tag)
+    return segments
+
+
+def write_changelog_prepend(filepath: str, new_content: str) -> None:
+    path = Path(filepath)
+    if path.exists():
+        with path.open("r", encoding="utf-8") as f:
+            old_content = f.read()
+        with path.open("w", encoding="utf-8") as f:
+            f.write(new_content.strip("\n") + "\n\n" + old_content)
+    else:
+        with path.open("w", encoding="utf-8") as f:
+            f.write(new_content.strip("\n") + "\n")
+
+
+def print_and_write_changelog(
+    changelog: str,
+    output_path: str | None = None,
+    *,
+    prepend: bool = False,
+) -> None:
+    if not changelog or not changelog.strip():
+        print("[yellow]No changes found, nothing to output.[/yellow]")
+        return
+    print()
+    print(changelog.strip("\n"))
+    if output_path:
+        if prepend:
+            write_changelog_prepend(output_path, changelog)
+        else:
+            with Path(output_path).open("w", encoding="utf-8") as output_file:
+                output_file.write(changelog.strip("\n") + "\n")
+
+
+def handle_changelog(args: ChangelogArgs, current_tag: str | None = None) -> None:
+    repo = git.Repo(args.path)
     from_raw = args.from_raw
     to_raw = args.to_raw
-
-    # 如果未指定 from/to，聚合所有 tag 版本的 changelog，优化性能
+    latest_tag_in_file = None
+    if args.output and Path(args.output).exists() and from_raw is None and to_raw is None:
+        latest_tag_in_file = extract_latest_tag_from_changelog(args.output)
+    # 默认：统计所有 tag 之间的差分（不包含最新 tag 到 HEAD）
     if from_raw is None and to_raw is None:
-        tags = sorted(repo.tags, key=lambda t: t.commit.committed_datetime)
-        first_commit = get_first_commit_hash(repo)
-        points = [first_commit] + [tag.commit.hexsha for tag in tags] + [repo.head.commit.hexsha]
-        point_names = [first_commit] + [tag.name for tag in tags] + ["HEAD"]
+        segments = prepare_changelog_segments(repo, latest_tag_in_file, current_tag)
         changelogs = ""
         with Progress() as progress:
-            task = progress.add_task("Generating changelog...", total=len(points) - 1)
-            # 反向遍历区间，实现反向输出
-            for i in reversed(range(len(points) - 1)):
-                from_hash = points[i]
-                to_hash = points[i + 1]
-                from_name = point_names[i]
-                to_name = point_names[i + 1]
+            task = progress.add_task("Generating changelog...", total=len(segments))
+            for from_hash, to_hash, from_name, to_name in segments:
                 raw_commits = list(repo.iter_commits(f"{from_hash}...{to_hash}"))
                 tgit_commits = []
                 for commit in raw_commits:
@@ -267,23 +329,9 @@ def handle_changelog(args: ChangelogArgs) -> None:
                 changelog = generate_changelog(commits_by_type, from_name, to_name, remote_uri)
                 changelogs += changelog
                 progress.update(task, advance=1)
-        if args.output:
-            with Path(args.output).open("w") as output_file:
-                output_file.write(changelogs.strip("\n") + "\n")
-        print()
-        print(changelogs.strip("\n"))
+        print_and_write_changelog(changelogs, args.output, prepend=bool(latest_tag_in_file))
         return
 
-    # 否则输出指定范围的 changelog
-    from_ref, to_ref = get_git_commits_range(repo, from_raw, to_raw)
-    changelog = get_changelog_by_range(repo, from_ref, to_ref)
-    if args.output:
-        with Path(args.output).open("w") as output_file:
-            output_file.write(changelog.strip("\n") + "\n")
-    else:
-        print()
-        print(changelog)
-
 
 def get_changelog_by_range(repo: git.Repo, from_ref: str, to_ref: str) -> str:
     try:

{tgit-0.13.2 → tgit-0.16.0}/tgit/config.py

@@ -1,6 +1,6 @@
 import argparse
 
-from rich import print  # noqa: A004
+from rich import print
 
 from .settings import set_global_settings
 

tgit-0.16.0/tgit/prompts/commit.txt

@@ -0,0 +1,62 @@
+# Git Commit Message Generator
+
+You are a git commit message generator. Analyze the provided diff and generate an appropriate commit message following the Conventional Commits specification.
+
+## Current Context
+- **Branch**: {{ branch }}
+- **Commit Type**: {% if specified_type is defined %}"{{ specified_type }}" (user-specified - MUST be used){% else %}Choose from: {{ types | join(', ') }}{% endif %}
+
+## Commit Message Requirements
+
+### Type
+{% if specified_type is defined %}
+**MANDATORY**: Use "{{ specified_type }}" as specified by the user.
+{% else %}
+Select the most appropriate type from the available options based on the nature of the changes.
+{% endif %}
+
+### Scope
+- Use a single word when possible
+- If multiple words needed, separate with hyphens (e.g., `user-auth`)
+- Keep it concise and descriptive
+- Optional if changes are global or unclear in scope
+
+### Message
+- Write in lowercase
+- Use present tense (e.g., "add feature" not "added feature")
+- Be concise but descriptive (aim for 3-7 words)
+- Cover the primary change(s) in the diff
+- If multiple distinct changes, separate with " && " (e.g., "update api && fix validation")
+
+### Breaking Changes
+Mark `is_breaking: true` only if changes:
+- Break existing API contracts
+- Require user action for compatibility
+- Remove or significantly change existing functionality
+
+## Analysis Process
+1. Review the diff comprehensively
+2. Identify the primary type of change
+3. Determine appropriate scope from modified files/areas
+4. Craft a concise message covering main changes
+5. Assess backward compatibility impact
+
+## Output Format
+Return valid JSON matching this structure:
+```json
+{
+  "type": "string",
+  "scope": "string|null", 
+  "msg": "string",
+  "is_breaking": "boolean"
+}
+```
+
+## Examples
+```json
+{"type": "feat", "scope": "auth", "msg": "add oauth2 login", "is_breaking": false}
+{"type": "fix", "scope": "api", "msg": "handle null user responses", "is_breaking": false}
+{"type": "refactor", "scope": null, "msg": "restructure project layout", "is_breaking": true}
+```
+
+Now analyze the provided diff and generate the commit message.

{tgit-0.13.2 → tgit-0.16.0}/tgit/version.py

@@ -273,9 +273,12 @@ def get_version_from_git(path: Path) -> Version | None:
     return None
 
 
-def get_default_bump_by_commits_dict(commits_by_type: dict[str, list[git.Commit]]) -> str:
-    # sourcery skip: assign-if-exp, reintroduce-else
-    if commits_by_type.get("breaking"):
+def get_default_bump_by_commits_dict(commits_by_type: dict[str, list[git.Commit]], prev_version: Version | None = None) -> str:
+    # v0.x.x breaking change 只 bump minor，v1+ 才 bump major
+    if prev_version and prev_version.major == 0:
+        if commits_by_type.get("breaking"):
+            return "minor"
+    elif commits_by_type.get("breaking"):
         return "major"
     if commits_by_type.get("feat"):
         return "minor"
@@ -289,6 +292,32 @@ def handle_version(args: VersionArgs) -> None:
     reclusive = args.recursive
 
     if next_version := get_next_version(args, prev_version, verbose):
+        # 获取目标 tag 名
+        target_tag = f"v{next_version}"
+        # 询问是否生成 changelog
+        ans = inquirer.prompt(
+            [
+                inquirer.Confirm(
+                    "gen_changelog",
+                    message=f"should generate changelog for {target_tag}?",
+                    default=True,
+                ),
+            ],
+        )
+        if ans and ans.get("gen_changelog"):
+            # 构造 changelog 参数对象
+            from argparse import Namespace
+
+            changelog_args = Namespace(
+                path=path,
+                from_raw=None,
+                to_raw=None,
+                output="CHANGELOG.md",
+                verbose=verbose,
+            )
+            from tgit.changelog import handle_changelog
+
+            handle_changelog(changelog_args, current_tag=target_tag)
         update_version_files(args, next_version, verbose, reclusive=reclusive)
         execute_git_commands(args, next_version, verbose)
 
@@ -311,7 +340,7 @@ def get_next_version(args: VersionArgs, prev_version: Version, verbose: int) ->
     from_ref, to_ref = get_git_commits_range(repo, None, None)
     tgit_commits = get_commits(repo, from_ref, to_ref)
     commits_by_type = group_commits_by_type(tgit_commits)
-    default_bump = get_default_bump_by_commits_dict(commits_by_type)
+    default_bump = get_default_bump_by_commits_dict(commits_by_type, prev_version)
 
     choices = [
         VersionChoice(prev_version, bump) for bump in ["patch", "minor", "major", "prepatch", "preminor", "premajor", "previous", "custom"]