Docker/forgejo
Docker/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-04 17:35:21 +02:00
Code Issues Releases Activity

feat: introduce global merge message templates (#8347)

Browse source 
Allow for a directory `default_merge_message` in the `CustomPath` to be used as a fallback if no merge template is specified by the repository. Effectively being a global merge message template feature.

Resolves #6648

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8347
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: kochklops <kochklops@noreply.codeberg.org>
Co-committed-by: kochklops <kochklops@noreply.codeberg.org>
This commit is contained in:
kochklops 2025-07-12 16:00:42 +02:00 • committed by Gusted
parent f666b882a8
commit 9f5e1157f0
20 changed files with 148 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

31
services/pull/merge.go
View file

@ -35,6 +35,30 @@ import (
notify_service "forgejo.org/services/notify"
)
var mergeMessageTemplates = make(map[repo_model.MergeStyle]string, len(repo_model.MergeStyles))
func LoadMergeMessageTemplates() error {
// Load templates for all known merge styles
for _, mergeStyle := range repo_model.MergeStyles {
templateFilename := filepath.Join(
setting.CustomPath,
"default_merge_message",
fmt.Sprintf("%s_TEMPLATE.md", strings.ToUpper(string(mergeStyle))),
)
content, err := os.ReadFile(templateFilename)
if err == nil {
mergeMessageTemplates[mergeStyle] = string(content)
} else if os.IsNotExist(err) {
// The file no longer exists, so delete any previous content
delete(mergeMessageTemplates, mergeStyle)
} else {
return err
}
}
return nil
}
// getMergeMessage composes the message used when merging a pull request.
func getMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr *issues_model.PullRequest, mergeStyle repo_model.MergeStyle, extraVars map[string]string) (message, body string, err error) {
if err := pr.LoadBaseRepo(ctx); err != nil {
@ -79,6 +103,13 @@ func getMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr *issue
if _, ok := err.(git.ErrNotExist); ok {
templateContent, err = commit.GetFileContent(templateFilepathGitea, setting.Repository.PullRequest.DefaultMergeMessageSize)
}
if _, ok := err.(git.ErrNotExist); ok {
if preloadedContent, ok := mergeMessageTemplates[mergeStyle]; ok {
templateContent, err = preloadedContent, nil
}
}
if err != nil {
if !git.IsErrNotExist(err) {
return "", "", err