mirrors/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-09-03 04:43:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(pulls): hide branch deletion when an open PR uses the branch (#39193)

Browse Source 
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
开心
2026-09-03 01:36:22 +08:00
committed by GitHub
parent 8cf7330556
commit 52fcd2d2a0
2 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routers/web/repo/issue_view.go
View File

@@ -591,7 +591,7 @@ func (prInfo *pullRequestViewInfo) prepareMergeBoxDeleteBranch(ctx *context.Cont
isPullBranchDeletable, _ = git_model.IsBranchExist(ctx, pull.HeadRepo.ID, pull.HeadBranch)
}
if isPullBranchDeletable && pull.HasMerged {
if isPullBranchDeletable && prInfo.issue.IsClosed {
exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pull.HeadRepoID, pull.HeadBranch)
if err != nil {
ctx.ServerError("HasUnmergedPullRequestsByHeadInfo", err)

85
tests/integration/pull_merge_test.go
View File

@@ -80,20 +80,6 @@ func testPullMerge(t *testing.T, session *TestSession, user, repo, pullNum strin
return resp
}
func testPullCleanUp(t *testing.T, session *TestSession, user, repo, pullnum string) *httptest.ResponseRecorder {
req := NewRequest(t, "GET", "/"+path.Join(user, repo, "pulls", pullnum))
resp := session.MakeRequest(t, req, http.StatusOK)
// Click the little button to create a pull
htmlDoc := NewHTMLParser(t, resp.Body)
link, exists := htmlDoc.doc.Find(".timeline-item .delete-branch-after-merge").Attr("data-url")
assert.True(t, exists, "The template has changed, can not find delete button url")
req = NewRequest(t, "POST", link)
resp = session.MakeRequest(t, req, http.StatusOK)
return resp
}
func preparePullMergeWebhook(t *testing.T, repoID int64) {
require.NoError(t, db.TruncateBeans(t.Context(), &webhook.Webhook{}, &webhook.HookTask{}))
require.NoError(t, db.Insert(t.Context(), &webhook.Webhook{
@@ -266,7 +252,7 @@ func TestPullSquashWithHeadCommitID(t *testing.T) {
})
}
func TestPullCleanUpAfterMerge(t *testing.T) {
func TestPullCleanUpAfterClose(t *testing.T) {
onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
session := loginUser(t, "user1") // FIXME: don't use admin user for testing
testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
@@ -276,39 +262,60 @@ func TestPullCleanUpAfterMerge(t *testing.T) {
assert.Equal(t, 3, repo.NumPulls)
assert.Equal(t, 3, repo.NumOpenPulls)
resp := testPullCreate(t, session, "user1", "repo1", false, "master", "feature/test", "This is a pull title")
getDeleteBranchLink := func(t *testing.T, session *TestSession, user, repo, pullnum string) string {
req := NewRequest(t, "GET", "/"+path.Join(user, repo, "pulls", pullnum))
resp := session.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
return htmlDoc.doc.Find(".timeline-item .delete-branch-after-merge").AttrOr("data-url", "")
}
elem := strings.Split(test.RedirectURL(resp), "/")
assert.Equal(t, "pulls", elem[3])
var closedPullNumStr string
t.Run("CreateAndClosePR", func(t *testing.T) {
resp := testPullCreate(t, session, "user1", "repo1", false, "master", "feature/test", "This is a pull title")
_, pullNumStr, _ := strings.CutLast(test.RedirectURL(resp), "/")
repo = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: repo.ID})
assert.Equal(t, 4, repo.NumPulls)
assert.Equal(t, 4, repo.NumOpenPulls)
testIssueClose(t, session, "user2", "repo1", pullNumStr)
testPullMerge(t, session, elem[1], elem[2], elem[4], MergeOptions{
Style: repo_model.MergeStyleMerge,
DeleteBranch: false,
repo = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: repo.ID})
assert.Equal(t, 4, repo.NumPulls)
assert.Equal(t, 3, repo.NumOpenPulls)
closedPullNumStr = pullNumStr
// the closed but unmerged PR should have the "delete branch" button
link := getDeleteBranchLink(t, session, "user2", "repo1", closedPullNumStr)
assert.NotEmpty(t, link)
})
repo = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: repo.ID})
assert.Equal(t, 4, repo.NumPulls)
assert.Equal(t, 3, repo.NumOpenPulls)
t.Run("CreateAndMergePR", func(t *testing.T) {
resp := testPullCreate(t, session, "user1", "repo1", false, "master", "feature/test", "This is a pull title")
_, pullNumStr, _ := strings.CutLast(test.RedirectURL(resp), "/")
// Check PR branch deletion
resp = testPullCleanUp(t, session, elem[1], elem[2], elem[4])
respJSON := test.ParseJSONRedirect(resp.Body.Bytes())
require.NotEmpty(t, respJSON.Redirect, "Redirected URL is not found")
// the closed but unmerged PR should not have the "delete branch" button because there is a new PR for the same branch
link := getDeleteBranchLink(t, session, "user2", "repo1", closedPullNumStr)
assert.Empty(t, link)
elem = strings.Split(*respJSON.Redirect, "/")
assert.Equal(t, "pulls", elem[3])
testPullMerge(t, session, "user2", "repo1", pullNumStr, MergeOptions{
Style: repo_model.MergeStyleMerge,
DeleteBranch: false,
})
// Check branch deletion result
req := NewRequest(t, "GET", *respJSON.Redirect)
resp = session.MakeRequest(t, req, http.StatusOK)
// Check PR branch deletion
link = getDeleteBranchLink(t, session, "user2", "repo1", pullNumStr)
assert.NotEmpty(t, link)
resp = session.MakeRequest(t, NewRequest(t, "POST", link), http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
resultMsg := strings.TrimSpace(htmlDoc.doc.Find(".ui.message.flash-message").Text())
assert.Equal(t, `Branch "user1/repo1:feature/test" has been deleted.`, resultMsg)
// Check branch deletion result
req := NewRequest(t, "GET", test.RedirectURL(resp))
resp = session.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
resultMsg := strings.TrimSpace(htmlDoc.doc.Find(".ui.message.flash-message").Text())
assert.Equal(t, `Branch "user1/repo1:feature/test" has been deleted.`, resultMsg)
// the "delete branch" button should be gone since the PR has been merged
link = getDeleteBranchLink(t, session, "user2", "repo1", pullNumStr)
assert.Empty(t, link)
})
})
}