mirror of
https://github.com/go-gitea/gitea.git
synced 2026-04-05 14:48:07 +00:00
f59d1d3cef
Fix #36905 The changes focus on force-push PR timeline handling and commit range calculation: - Reworked pull-request push comment creation to use a new `gitrepo.GetCommitIDsBetweenReverse` helper, with special handling for force pushes (merge-base based range, tolerate missing/invalid old commits, and keep force-push timeline entries). - Added `Comment.GetPushActionContent` to parse push comment payloads and used it to delete only non-force-push push comments during force pushes. - Removed the old `Repository.CommitsBetweenNotBase` helper from `modules/git/repo_commit.go` in favor of the new commit ID range helper. - Added tests for `GetCommitIDsBetweenReverse` (normal range, `notRef` filtering, fallback branch usage) and expanded pull comment tests to cover force-push edge cases. <img width="989" height="563" alt="image" src="https://github.com/user-attachments/assets/a01e1bc2-fa8a-4028-8a35-d484e601ff3b" /> --------- Signed-off-by: Lunny Xiao <xiaolunwen@gmail.com> Signed-off-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
115 lines
2.8 KiB
Go
115 lines
2.8 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package gitrepo
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
type mockRepository struct {
|
|
path string
|
|
}
|
|
|
|
func (r *mockRepository) RelativePath() string {
|
|
return r.path
|
|
}
|
|
|
|
func TestRepoGetDivergingCommits(t *testing.T) {
|
|
repo := &mockRepository{path: "repo1_bare"}
|
|
do, err := GetDivergingCommits(t.Context(), repo, "master", "branch2")
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, &DivergeObject{
|
|
Ahead: 1,
|
|
Behind: 5,
|
|
}, do)
|
|
|
|
do, err = GetDivergingCommits(t.Context(), repo, "master", "master")
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, &DivergeObject{
|
|
Ahead: 0,
|
|
Behind: 0,
|
|
}, do)
|
|
|
|
do, err = GetDivergingCommits(t.Context(), repo, "master", "test")
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, &DivergeObject{
|
|
Ahead: 0,
|
|
Behind: 2,
|
|
}, do)
|
|
}
|
|
|
|
func TestGetCommitIDsBetweenReverse(t *testing.T) {
|
|
repo := &mockRepository{path: "repo1_bare"}
|
|
|
|
// tests raw commit IDs
|
|
commitIDs, err := GetCommitIDsBetweenReverse(t.Context(), repo,
|
|
"8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2",
|
|
"ce064814f4a0d337b333e646ece456cd39fab612",
|
|
"",
|
|
100,
|
|
)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, []string{
|
|
"8006ff9adbf0cb94da7dad9e537e53817f9fa5c0",
|
|
"6fbd69e9823458e6c4a2fc5c0f6bc022b2f2acd1",
|
|
"37991dec2c8e592043f47155ce4808d4580f9123",
|
|
"feaf4ba6bc635fec442f46ddd4512416ec43c2c2",
|
|
"ce064814f4a0d337b333e646ece456cd39fab612",
|
|
}, commitIDs)
|
|
|
|
commitIDs, err = GetCommitIDsBetweenReverse(t.Context(), repo,
|
|
"8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2",
|
|
"ce064814f4a0d337b333e646ece456cd39fab612",
|
|
"6fbd69e9823458e6c4a2fc5c0f6bc022b2f2acd1",
|
|
100,
|
|
)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, []string{
|
|
"37991dec2c8e592043f47155ce4808d4580f9123",
|
|
"feaf4ba6bc635fec442f46ddd4512416ec43c2c2",
|
|
"ce064814f4a0d337b333e646ece456cd39fab612",
|
|
}, commitIDs)
|
|
|
|
commitIDs, err = GetCommitIDsBetweenReverse(t.Context(), repo,
|
|
"8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2",
|
|
"ce064814f4a0d337b333e646ece456cd39fab612",
|
|
"",
|
|
3,
|
|
)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, []string{
|
|
"37991dec2c8e592043f47155ce4808d4580f9123",
|
|
"feaf4ba6bc635fec442f46ddd4512416ec43c2c2",
|
|
"ce064814f4a0d337b333e646ece456cd39fab612",
|
|
}, commitIDs)
|
|
|
|
// test branch names instead of raw commit IDs.
|
|
commitIDs, err = GetCommitIDsBetweenReverse(t.Context(), repo,
|
|
"test",
|
|
"master",
|
|
"",
|
|
100,
|
|
)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, []string{
|
|
"feaf4ba6bc635fec442f46ddd4512416ec43c2c2",
|
|
"ce064814f4a0d337b333e646ece456cd39fab612",
|
|
}, commitIDs)
|
|
|
|
// add notref to exclude test
|
|
commitIDs, err = GetCommitIDsBetweenReverse(t.Context(), repo,
|
|
"test",
|
|
"master",
|
|
"test",
|
|
100,
|
|
)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, []string{
|
|
"feaf4ba6bc635fec442f46ddd4512416ec43c2c2",
|
|
"ce064814f4a0d337b333e646ece456cd39fab612",
|
|
}, commitIDs)
|
|
}
|