🔨 refactor(changelog): simplify current tag handling in changelog

Author: Jannchie

tgit/changelog.py

@@ -244,21 +244,28 @@ def extract_latest_tag_from_changelog(filepath: str) -> str | 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
 
 
@@ -301,8 +308,8 @@ def handle_changelog(args: ChangelogArgs, current_tag: str | None = None) -> Non
     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 and not current_tag:
-        segments = prepare_changelog_segments(repo, latest_tag_in_file)
+    if from_raw is None and to_raw is None:
+        segments = prepare_changelog_segments(repo, latest_tag_in_file, current_tag)
         changelogs = ""
         with Progress() as progress:
             task = progress.add_task("Generating changelog...", total=len(segments))
@@ -324,26 +331,6 @@ def handle_changelog(args: ChangelogArgs, current_tag: str | None = None) -> Non
                 progress.update(task, advance=1)
         print_and_write_changelog(changelogs, args.output, prepend=bool(latest_tag_in_file))
         return
-    # 新增：如果 current_tag 存在，统计最新 tag 到 HEAD，to_ref 渲染为 current_tag
-    if current_tag:
-        # 获取最新 tag
-        tags = sorted(repo.tags, key=lambda t: t.commit.committed_datetime)
-        if tags:
-            latest_tag = tags[-1].name
-            from_ref = latest_tag
-        else:
-            from_ref = get_first_commit_hash(repo)
-        to_ref = repo.head.commit.hexsha
-        changelog = get_changelog_by_range(repo, from_ref, to_ref)
-        # 渲染时将 to_ref 替换为 current_tag
-        changelog = changelog.replace(f"## {to_ref}", f"## {current_tag}")
-        changelog = changelog.replace(f"{from_ref}...{to_ref}", f"{from_ref}...{current_tag}")
-        print_and_write_changelog(changelog, args.output, prepend=False)
-        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)
-    print_and_write_changelog(changelog, args.output, prepend=False)
 
 
 def get_changelog_by_range(repo: git.Repo, from_ref: str, to_ref: str) -> str: