Docker/forgejo
Docker/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-04 09:25:22 +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

56
services/pull/merge_test.go
View file

@ -4,9 +4,17 @@
package pull
import (
"os"
"path"
"strings"
"testing"
repo_model "forgejo.org/models/repo"
"forgejo.org/modules/setting"
"forgejo.org/modules/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func Test_expandDefaultMergeMessage(t *testing.T) {
@ -90,3 +98,51 @@ func TestAddCommitMessageTailer(t *testing.T) {
assert.Equal(t, "title\n\nTest-tailer: v1\nTest-tailer: v2", AddCommitMessageTrailer("title\n\nTest-tailer: v1", "Test-tailer", "v2"))
assert.Equal(t, "title\n\nTest-tailer: v1\nTest-tailer: v2", AddCommitMessageTrailer("title\n\nTest-tailer: v1\n", "Test-tailer", "v2"))
}
func prepareLoadMergeMessageTemplates(targetDir string) error {
for _, template := range []string{"MERGE", "REBASE", "REBASE-MERGE", "SQUASH", "MANUALLY-MERGED", "REBASE-UPDATE-ONLY"} {
file, err := os.Create(path.Join(targetDir, template+"_TEMPLATE.md"))
defer file.Close()
if err == nil {
_, err = file.WriteString("Contents for " + template)
}
if err != nil {
return err
}
}
return nil
}
func TestLoadMergeMessageTemplates(t *testing.T) {
defer test.MockVariableValue(&setting.CustomPath, t.TempDir())()
templateTemp := path.Join(setting.CustomPath, "default_merge_message")
require.NoError(t, os.MkdirAll(templateTemp, 0o755))
require.NoError(t, prepareLoadMergeMessageTemplates(templateTemp))
testStyles := []repo_model.MergeStyle{
repo_model.MergeStyleMerge,
repo_model.MergeStyleRebase,
repo_model.MergeStyleRebaseMerge,
repo_model.MergeStyleSquash,
repo_model.MergeStyleManuallyMerged,
repo_model.MergeStyleRebaseUpdate,
}
// Load all templates
require.NoError(t, LoadMergeMessageTemplates())
// Check their correctness
assert.Len(t, mergeMessageTemplates, len(testStyles))
for _, mergeStyle := range testStyles {
assert.Equal(t, "Contents for "+strings.ToUpper(string(mergeStyle)), mergeMessageTemplates[mergeStyle])
}
// Unload all templates
require.NoError(t, os.RemoveAll(templateTemp))
require.NoError(t, LoadMergeMessageTemplates())
assert.Empty(t, mergeMessageTemplates)
}