Skip to content

Commit 4b3178f

Browse files
lunnylunny
committed
Merge branch 'main' into lunny/pull_requests_api
2 parents ce50233 + 17053e9 commit 4b3178f

File tree

5 files changed

+128
-81
lines changed

5 files changed

+128
-81
lines changed

‎routers/api/v1/repo/branch.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,6 @@ func DeleteBranch(ctx *context.APIContext) {
150150
}
151151
}
152152

153-
if ctx.Repo.Repository.IsMirror {
154-
ctx.Error(http.StatusForbidden, "IsMirrored", fmt.Errorf("can not delete branch of an mirror repository"))
155-
return
156-
}
157-
158153
if err := repo_service.DeleteBranch(ctx, ctx.Doer, ctx.Repo.Repository, ctx.Repo.GitRepo, branchName); err != nil {
159154
switch {
160155
case git.IsErrBranchNotExist(err):

‎routers/api/v1/repo/pull.go‎

Lines changed: 44 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,49 +1026,54 @@ func MergePullRequest(ctx *context.APIContext) {
10261026
}
10271027
log.Trace("Pull request merged: %d", pr.ID)
10281028

1029-
if form.DeleteBranchAfterMerge {
1030-
// Don't cleanup when there are other PR's that use this branch as head branch.
1031-
exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pr.HeadRepoID, pr.HeadBranch)
1032-
if err != nil {
1033-
ctx.ServerError("HasUnmergedPullRequestsByHeadInfo", err)
1034-
return
1035-
}
1036-
if exist {
1037-
ctx.Status(http.StatusOK)
1038-
return
1039-
}
1040-
1041-
var headRepo *git.Repository
1042-
if ctx.Repo != nil && ctx.Repo.Repository != nil && ctx.Repo.Repository.ID == pr.HeadRepoID && ctx.Repo.GitRepo != nil {
1043-
headRepo = ctx.Repo.GitRepo
1044-
} else {
1045-
headRepo, err = gitrepo.OpenRepository(ctx, pr.HeadRepo)
1029+
// for agit flow, we should not delete the agit reference after merge
1030+
if form.DeleteBranchAfterMerge && pr.Flow == issues_model.PullRequestFlowGithub {
1031+
// check permission even it has been checked in repo_service.DeleteBranch so that we don't need to
1032+
// do RetargetChildrenOnMerge
1033+
if err := repo_service.CanDeleteBranch(ctx, pr.HeadRepo, pr.HeadBranch, ctx.Doer); err == nil {
1034+
// Don't cleanup when there are other PR's that use this branch as head branch.
1035+
exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pr.HeadRepoID, pr.HeadBranch)
10461036
if err != nil {
1047-
ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.HeadRepo.FullName()), err)
1037+
ctx.ServerError("HasUnmergedPullRequestsByHeadInfo", err)
10481038
return
10491039
}
1050-
defer headRepo.Close()
1051-
}
1052-
if err := pull_service.RetargetChildrenOnMerge(ctx, ctx.Doer, pr); err != nil {
1053-
ctx.Error(http.StatusInternalServerError, "RetargetChildrenOnMerge", err)
1054-
return
1055-
}
1056-
if err := repo_service.DeleteBranch(ctx, ctx.Doer, pr.HeadRepo, headRepo, pr.HeadBranch); err != nil {
1057-
switch {
1058-
case git.IsErrBranchNotExist(err):
1059-
ctx.NotFound(err)
1060-
case errors.Is(err, repo_service.ErrBranchIsDefault):
1061-
ctx.Error(http.StatusForbidden, "DefaultBranch", fmt.Errorf("can not delete default branch"))
1062-
case errors.Is(err, git_model.ErrBranchIsProtected):
1063-
ctx.Error(http.StatusForbidden, "IsProtectedBranch", fmt.Errorf("branch protected"))
1064-
default:
1065-
ctx.Error(http.StatusInternalServerError, "DeleteBranch", err)
1040+
if exist {
1041+
ctx.Status(http.StatusOK)
1042+
return
1043+
}
1044+
1045+
var headRepo *git.Repository
1046+
if ctx.Repo != nil && ctx.Repo.Repository != nil && ctx.Repo.Repository.ID == pr.HeadRepoID && ctx.Repo.GitRepo != nil {
1047+
headRepo = ctx.Repo.GitRepo
1048+
} else {
1049+
headRepo, err = gitrepo.OpenRepository(ctx, pr.HeadRepo)
1050+
if err != nil {
1051+
ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.HeadRepo.FullName()), err)
1052+
return
1053+
}
1054+
defer headRepo.Close()
1055+
}
1056+
if err := pull_service.RetargetChildrenOnMerge(ctx, ctx.Doer, pr); err != nil {
1057+
ctx.Error(http.StatusInternalServerError, "RetargetChildrenOnMerge", err)
1058+
return
1059+
}
1060+
if err := repo_service.DeleteBranch(ctx, ctx.Doer, pr.HeadRepo, headRepo, pr.HeadBranch); err != nil {
1061+
switch {
1062+
case git.IsErrBranchNotExist(err):
1063+
ctx.NotFound(err)
1064+
case errors.Is(err, repo_service.ErrBranchIsDefault):
1065+
ctx.Error(http.StatusForbidden, "DefaultBranch", fmt.Errorf("can not delete default branch"))
1066+
case errors.Is(err, git_model.ErrBranchIsProtected):
1067+
ctx.Error(http.StatusForbidden, "IsProtectedBranch", fmt.Errorf("branch protected"))
1068+
default:
1069+
ctx.Error(http.StatusInternalServerError, "DeleteBranch", err)
1070+
}
1071+
return
1072+
}
1073+
if err := issues_model.AddDeletePRBranchComment(ctx, ctx.Doer, pr.BaseRepo, pr.Issue.ID, pr.HeadBranch); err != nil {
1074+
// Do not fail here as branch has already been deleted
1075+
log.Error("DeleteBranch: %v", err)
10661076
}
1067-
return
1068-
}
1069-
if err := issues_model.AddDeletePRBranchComment(ctx, ctx.Doer, pr.BaseRepo, pr.Issue.ID, pr.HeadBranch); err != nil {
1070-
// Do not fail here as branch has already been deleted
1071-
log.Error("DeleteBranch: %v", err)
10721077
}
10731078
}
10741079

‎routers/web/repo/pull.go‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,32 +1185,34 @@ func MergePullRequest(ctx *context.Context) {
11851185

11861186
log.Trace("Pull request merged: %d", pr.ID)
11871187

1188-
if form.DeleteBranchAfterMerge {
1189-
// Don't cleanup when other pr use this branch as head branch
1190-
exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pr.HeadRepoID, pr.HeadBranch)
1188+
if !form.DeleteBranchAfterMerge {
1189+
ctx.JSONRedirect(issue.Link())
1190+
return
1191+
}
1192+
1193+
// Don't cleanup when other pr use this branch as head branch
1194+
exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pr.HeadRepoID, pr.HeadBranch)
1195+
if err != nil {
1196+
ctx.ServerError("HasUnmergedPullRequestsByHeadInfo", err)
1197+
return
1198+
}
1199+
if exist {
1200+
ctx.JSONRedirect(issue.Link())
1201+
return
1202+
}
1203+
1204+
var headRepo *git.Repository
1205+
if ctx.Repo != nil && ctx.Repo.Repository != nil && pr.HeadRepoID == ctx.Repo.Repository.ID && ctx.Repo.GitRepo != nil {
1206+
headRepo = ctx.Repo.GitRepo
1207+
} else {
1208+
headRepo, err = gitrepo.OpenRepository(ctx, pr.HeadRepo)
11911209
if err != nil {
1192-
ctx.ServerError("HasUnmergedPullRequestsByHeadInfo", err)
1193-
return
1194-
}
1195-
if exist {
1196-
ctx.JSONRedirect(issue.Link())
1210+
ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.HeadRepo.FullName()), err)
11971211
return
11981212
}
1199-
1200-
var headRepo *git.Repository
1201-
if ctx.Repo != nil && ctx.Repo.Repository != nil && pr.HeadRepoID == ctx.Repo.Repository.ID && ctx.Repo.GitRepo != nil {
1202-
headRepo = ctx.Repo.GitRepo
1203-
} else {
1204-
headRepo, err = gitrepo.OpenRepository(ctx, pr.HeadRepo)
1205-
if err != nil {
1206-
ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.HeadRepo.FullName()), err)
1207-
return
1208-
}
1209-
defer headRepo.Close()
1210-
}
1211-
deleteBranch(ctx, pr, headRepo)
1213+
defer headRepo.Close()
12121214
}
1213-
1215+
deleteBranch(ctx, pr, headRepo)
12141216
ctx.JSONRedirect(issue.Link())
12151217
}
12161218

@@ -1403,8 +1405,8 @@ func CleanUpPullRequest(ctx *context.Context) {
14031405

14041406
pr := issue.PullRequest
14051407

1406-
// Don't cleanup unmerged and unclosed PRs
1407-
if !pr.HasMerged && !issue.IsClosed {
1408+
// Don't cleanup unmerged and unclosed PRs and agit PRs
1409+
if !pr.HasMerged && !issue.IsClosed && pr.Flow != issues_model.PullRequestFlowGithub {
14081410
ctx.NotFound("CleanUpPullRequest", nil)
14091411
return
14101412
}
@@ -1435,13 +1437,12 @@ func CleanUpPullRequest(ctx *context.Context) {
14351437
return
14361438
}
14371439

1438-
perm, err := access_model.GetUserRepoPermission(ctx, pr.HeadRepo, ctx.Doer)
1439-
if err != nil {
1440-
ctx.ServerError("GetUserRepoPermission", err)
1441-
return
1442-
}
1443-
if !perm.CanWrite(unit.TypeCode) {
1444-
ctx.NotFound("CleanUpPullRequest", nil)
1440+
if err := repo_service.CanDeleteBranch(ctx, pr.HeadRepo, pr.HeadBranch, ctx.Doer); err != nil {
1441+
if errors.Is(err, util.ErrPermissionDenied) {
1442+
ctx.NotFound("CanDeleteBranch", nil)
1443+
} else {
1444+
ctx.ServerError("CanDeleteBranch", err)
1445+
}
14451446
return
14461447
}
14471448

‎services/repository/branch.go‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ import (
1414
"code.gitea.io/gitea/models/db"
1515
git_model "code.gitea.io/gitea/models/git"
1616
issues_model "code.gitea.io/gitea/models/issues"
17+
access_model "code.gitea.io/gitea/models/perm/access"
1718
repo_model "code.gitea.io/gitea/models/repo"
19+
"code.gitea.io/gitea/models/unit"
1820
user_model "code.gitea.io/gitea/models/user"
1921
"code.gitea.io/gitea/modules/cache"
2022
"code.gitea.io/gitea/modules/git"
@@ -463,15 +465,17 @@ var (
463465
ErrBranchIsDefault = errors.New("branch is default")
464466
)
465467

466-
// DeleteBranch delete branch
467-
func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, gitRepo *git.Repository, branchName string) error {
468-
err := repo.MustNotBeArchived()
468+
func CanDeleteBranch(ctx context.Context, repo *repo_model.Repository, branchName string, doer *user_model.User) error {
469+
if branchName == repo.DefaultBranch {
470+
return ErrBranchIsDefault
471+
}
472+
473+
perm, err := access_model.GetUserRepoPermission(ctx, repo, doer)
469474
if err != nil {
470475
return err
471476
}
472-
473-
if branchName == repo.DefaultBranch {
474-
return ErrBranchIsDefault
477+
if !perm.CanWrite(unit.TypeCode) {
478+
return util.NewPermissionDeniedErrorf("permission denied to access repo %d unit %s", repo.ID, unit.TypeCode.LogString())
475479
}
476480

477481
isProtected, err := git_model.IsBranchProtected(ctx, repo.ID, branchName)
@@ -481,6 +485,19 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R
481485
if isProtected {
482486
return git_model.ErrBranchIsProtected
483487
}
488+
return nil
489+
}
490+
491+
// DeleteBranch delete branch
492+
func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, gitRepo *git.Repository, branchName string) error {
493+
err := repo.MustNotBeArchived()
494+
if err != nil {
495+
return err
496+
}
497+
498+
if err := CanDeleteBranch(ctx, repo, branchName, doer); err != nil {
499+
return err
500+
}
484501

485502
rawBranch, err := git_model.GetBranch(ctx, repo.ID, branchName)
486503
if err != nil && !git_model.IsErrBranchNotExist(err) {

‎tests/integration/pull_merge_test.go‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,10 @@ func TestPullRetargetChildOnBranchDelete(t *testing.T) {
554554

555555
testPullMerge(t, session, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
556556

557+
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"})
558+
branchBasePR := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: repo1.ID, Name: "base-pr"})
559+
assert.True(t, branchBasePR.IsDeleted)
560+
557561
// Check child PR
558562
req := NewRequest(t, "GET", test.RedirectURL(respChildPR))
559563
resp := session.MakeRequest(t, req, http.StatusOK)
@@ -584,6 +588,10 @@ func TestPullDontRetargetChildOnWrongRepo(t *testing.T) {
584588

585589
testPullMerge(t, session, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
586590

591+
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})
592+
branchBasePR := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: repo1.ID, Name: "base-pr"})
593+
assert.True(t, branchBasePR.IsDeleted)
594+
587595
// Check child PR
588596
req := NewRequest(t, "GET", test.RedirectURL(respChildPR))
589597
resp := session.MakeRequest(t, req, http.StatusOK)
@@ -598,6 +606,27 @@ func TestPullDontRetargetChildOnWrongRepo(t *testing.T) {
598606
})
599607
}
600608

609+
func TestPullRequestMergedWithNoPermissionDeleteBranch(t *testing.T) {
610+
onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
611+
session := loginUser(t, "user4")
612+
testRepoFork(t, session, "user2", "repo1", "user4", "repo1", "")
613+
testEditFileToNewBranch(t, session, "user4", "repo1", "master", "base-pr", "README.md", "Hello, World\n(Edited - TestPullDontRetargetChildOnWrongRepo - base PR)\n")
614+
615+
respBasePR := testPullCreate(t, session, "user4", "repo1", false, "master", "base-pr", "Base Pull Request")
616+
elemBasePR := strings.Split(test.RedirectURL(respBasePR), "/")
617+
assert.EqualValues(t, "pulls", elemBasePR[3])
618+
619+
// user2 has no permission to delete branch of repo user1/repo1
620+
session2 := loginUser(t, "user2")
621+
testPullMerge(t, session2, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
622+
623+
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user4", Name: "repo1"})
624+
branchBasePR := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: repo1.ID, Name: "base-pr"})
625+
// branch has not been deleted
626+
assert.False(t, branchBasePR.IsDeleted)
627+
})
628+
}
629+
601630
func TestPullMergeIndexerNotifier(t *testing.T) {
602631
onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
603632
// create a pull request

0 commit comments

Comments
 (0)