mirror of
https://github.com/go-gitea/gitea.git
synced 2026-06-06 07:03:08 +02:00
Fixes https://github.com/go-gitea/gitea/issues/37286 Automatic release notes for the first release in a repository were empty when there was no previous tag. Before this change, the release notes generator used the tag name to build the changelog link, but reused that state for pull request collection. When `PreviousTag` was empty, the PR collection logic did not scan a useful commit range, so merged pull requests were omitted from the generated notes. This pull request fixes that by decoupling the internal PR collection range from the rendered changelog link: - when a previous tag exists, behavior stays unchanged - when no previous tag exists, release notes collect merged pull requests from the full reachable history up to the target tag - the displayed full changelog link for the first release still uses the existing `/commits/tag/{tag}` format Tests were updated to cover: - generating notes for a repository with no previous tags - including merged pull requests before the first tag - preserving existing behavior when a previous tag exists
216 lines
6.5 KiB
Go
216 lines
6.5 KiB
Go
// Copyright 2025 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package release
|
|
|
|
import (
|
|
"cmp"
|
|
"context"
|
|
"fmt"
|
|
"slices"
|
|
"strings"
|
|
|
|
"gitea.dev/models/db"
|
|
issues_model "gitea.dev/models/issues"
|
|
repo_model "gitea.dev/models/repo"
|
|
user_model "gitea.dev/models/user"
|
|
"gitea.dev/modules/container"
|
|
"gitea.dev/modules/git"
|
|
"gitea.dev/modules/util"
|
|
)
|
|
|
|
// GenerateReleaseNotesOptions describes how to build release notes content.
|
|
type GenerateReleaseNotesOptions struct {
|
|
TagName string
|
|
TagTarget string
|
|
PreviousTag string
|
|
}
|
|
|
|
// GenerateReleaseNotes builds the markdown snippet for release notes.
|
|
func GenerateReleaseNotes(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, opts GenerateReleaseNotesOptions) (string, error) {
|
|
headCommit, err := resolveHeadCommit(gitRepo, opts.TagName, opts.TagTarget)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
isFirstRelease, err := isFirstRelease(ctx, repo.ID)
|
|
if err != nil {
|
|
return "", fmt.Errorf("isFirstRelease: %w", err)
|
|
}
|
|
|
|
baseCommitID := ""
|
|
if opts.PreviousTag != "" {
|
|
baseCommit, err := gitRepo.GetCommit(opts.PreviousTag)
|
|
if err != nil {
|
|
return "", util.ErrorWrapTranslatable(util.ErrNotExist, "repo.release.generate_notes_tag_not_found", opts.TagName)
|
|
}
|
|
baseCommitID = baseCommit.ID.String()
|
|
} else if !isFirstRelease {
|
|
return "", util.ErrorWrapTranslatable(util.ErrNotExist, "repo.release.generate_notes_tag_not_found", opts.TagName)
|
|
}
|
|
|
|
commits, err := gitRepo.CommitsBetweenIDs(headCommit.ID.String(), baseCommitID)
|
|
if err != nil {
|
|
return "", fmt.Errorf("CommitsBetweenIDs: %w", err)
|
|
}
|
|
|
|
prs, err := collectPullRequestsFromCommits(ctx, repo.ID, commits)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
contributors, newContributors, err := collectContributors(ctx, repo.ID, prs)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
fullChangelogURL := ""
|
|
if isFirstRelease {
|
|
// Keep the first-release changelog link aligned with GitHub, while collecting PRs from full history.
|
|
fullChangelogURL = fmt.Sprintf("%s/commits/tag/%s", repo.HTMLURL(ctx), util.PathEscapeSegments(opts.TagName))
|
|
}
|
|
|
|
content := buildReleaseNotesContent(ctx, repo, opts.TagName, opts.PreviousTag, prs, contributors, newContributors, fullChangelogURL)
|
|
return content, nil
|
|
}
|
|
|
|
func isFirstRelease(ctx context.Context, repoID int64) (bool, error) {
|
|
count, err := db.Count[repo_model.Release](ctx, repo_model.FindReleasesOptions{
|
|
RepoID: repoID,
|
|
IncludeDrafts: false,
|
|
})
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
return count == 0, nil
|
|
}
|
|
|
|
func resolveHeadCommit(gitRepo *git.Repository, tagName, tagTarget string) (*git.Commit, error) {
|
|
ref := tagName
|
|
if !gitRepo.IsTagExist(tagName) {
|
|
ref = tagTarget
|
|
}
|
|
|
|
commit, err := gitRepo.GetCommit(ref)
|
|
if err != nil {
|
|
return nil, util.ErrorWrapTranslatable(util.ErrNotExist, "repo.release.generate_notes_target_not_found", ref)
|
|
}
|
|
return commit, nil
|
|
}
|
|
|
|
func collectPullRequestsFromCommits(ctx context.Context, repoID int64, commits []*git.Commit) ([]*issues_model.PullRequest, error) {
|
|
prs := make([]*issues_model.PullRequest, 0, len(commits))
|
|
|
|
for _, commit := range commits {
|
|
pr, err := issues_model.GetPullRequestByMergedCommit(ctx, repoID, commit.ID.String())
|
|
if err != nil {
|
|
if issues_model.IsErrPullRequestNotExist(err) {
|
|
continue
|
|
}
|
|
return nil, fmt.Errorf("GetPullRequestByMergedCommit: %w", err)
|
|
}
|
|
|
|
if err = pr.LoadIssue(ctx); err != nil {
|
|
return nil, fmt.Errorf("LoadIssue: %w", err)
|
|
}
|
|
if err = pr.Issue.LoadAttributes(ctx); err != nil {
|
|
return nil, fmt.Errorf("LoadIssueAttributes: %w", err)
|
|
}
|
|
|
|
prs = append(prs, pr)
|
|
}
|
|
|
|
slices.SortFunc(prs, func(a, b *issues_model.PullRequest) int {
|
|
if cmpRes := cmp.Compare(b.MergedUnix, a.MergedUnix); cmpRes != 0 {
|
|
return cmpRes
|
|
}
|
|
return cmp.Compare(b.Issue.Index, a.Issue.Index)
|
|
})
|
|
|
|
return prs, nil
|
|
}
|
|
|
|
func buildReleaseNotesContent(ctx context.Context, repo *repo_model.Repository, tagName, baseRef string, prs []*issues_model.PullRequest, contributors []*user_model.User, newContributors []*issues_model.PullRequest, fullChangelogURL string) string {
|
|
var builder strings.Builder
|
|
builder.WriteString("## What's Changed\n")
|
|
|
|
for _, pr := range prs {
|
|
prURL := pr.Issue.HTMLURL(ctx)
|
|
fmt.Fprintf(&builder, "* %s in [#%d](%s)\n", pr.Issue.Title, pr.Issue.Index, prURL)
|
|
}
|
|
|
|
builder.WriteString("\n")
|
|
|
|
if len(contributors) > 0 {
|
|
builder.WriteString("## Contributors\n")
|
|
for _, contributor := range contributors {
|
|
fmt.Fprintf(&builder, "* @%s\n", contributor.Name)
|
|
}
|
|
builder.WriteString("\n")
|
|
}
|
|
|
|
if len(newContributors) > 0 {
|
|
builder.WriteString("## New Contributors\n")
|
|
for _, contributor := range newContributors {
|
|
prURL := contributor.Issue.HTMLURL(ctx)
|
|
fmt.Fprintf(&builder, "* @%s made their first contribution in [#%d](%s)\n", contributor.Issue.Poster.Name, contributor.Issue.Index, prURL)
|
|
}
|
|
builder.WriteString("\n")
|
|
}
|
|
|
|
builder.WriteString("**Full Changelog**: ")
|
|
if fullChangelogURL != "" {
|
|
builder.WriteString(fullChangelogURL)
|
|
} else {
|
|
compareURL := fmt.Sprintf("%s/compare/%s...%s", repo.HTMLURL(ctx), util.PathEscapeSegments(baseRef), util.PathEscapeSegments(tagName))
|
|
fmt.Fprintf(&builder, "[%s...%s](%s)", baseRef, tagName, compareURL)
|
|
}
|
|
builder.WriteByte('\n')
|
|
return builder.String()
|
|
}
|
|
|
|
func collectContributors(ctx context.Context, repoID int64, prs []*issues_model.PullRequest) ([]*user_model.User, []*issues_model.PullRequest, error) {
|
|
contributors := make([]*user_model.User, 0, len(prs))
|
|
newContributors := make([]*issues_model.PullRequest, 0, len(prs))
|
|
seenContributors := container.Set[int64]{}
|
|
seenNew := container.Set[int64]{}
|
|
|
|
for _, pr := range prs {
|
|
poster := pr.Issue.Poster
|
|
posterID := poster.ID
|
|
|
|
if posterID == 0 {
|
|
// Migrated PRs may not have a linked local user (PosterID == 0). Skip them for now.
|
|
continue
|
|
}
|
|
|
|
if !seenContributors.Contains(posterID) {
|
|
contributors = append(contributors, poster)
|
|
seenContributors.Add(posterID)
|
|
}
|
|
|
|
if seenNew.Contains(posterID) {
|
|
continue
|
|
}
|
|
|
|
isFirst, err := isFirstContribution(ctx, repoID, posterID, pr)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
if isFirst {
|
|
seenNew.Add(posterID)
|
|
newContributors = append(newContributors, pr)
|
|
}
|
|
}
|
|
|
|
return contributors, newContributors, nil
|
|
}
|
|
|
|
func isFirstContribution(ctx context.Context, repoID, posterID int64, pr *issues_model.PullRequest) (bool, error) {
|
|
hasMergedBefore, err := issues_model.HasMergedPullRequestInRepoBefore(ctx, repoID, posterID, pr.MergedUnix, pr.ID)
|
|
if err != nil {
|
|
return false, fmt.Errorf("check merged PRs for contributor: %w", err)
|
|
}
|
|
return !hasMergedBefore, nil
|
|
}
|