tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Add delete branch track on pull request comments (#888)

Browse Source 
* add delete branch track on pull request comments

* don't change vendor
This commit is contained in:
Lunny Xiao
2017-02-11 12:00:29 +08:00
committed by GitHub
parent 3576e1ee73
commit cf0f451c37
7 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
routers/repo/branch.go
View File

@@ -6,6 +6,7 @@ package repo
import (
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log"
@@ -70,12 +71,21 @@ func DeleteBranchPost(ctx *context.Context) {
}
if err := ctx.Repo.GitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{
Force: false,
Force: true,
}); err != nil {
log.Error(4, "DeleteBranch: %v", err)
ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
return
}
issueID := ctx.QueryInt64("issue_id")
if issueID > 0 {
if err := models.AddDeletePRBranchComment(ctx.User, ctx.Repo.Repository, issueID, branchName); err != nil {
log.Error(4, "DeleteBranch: %v", err)
ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
return
}
}
ctx.Flash.Success(ctx.Tr("repo.branch.deletion_success", fullBranchName))
}

3
routers/repo/issue.go
View File

@@ -635,7 +635,8 @@ func ViewIssue(ctx *context.Context) {
} else if ctx.User.IsWriterOfRepo(pull.HeadRepo) {
canDelete = true
deleteBranchURL := pull.HeadRepo.Link() + "/branches/" + pull.HeadBranch + "/delete"
ctx.Data["DeleteBranchLink"] = fmt.Sprintf("%s?commit=%s&redirect_to=%s", deleteBranchURL, pull.MergedCommitID, ctx.Data["Link"])
ctx.Data["DeleteBranchLink"] = fmt.Sprintf("%s?commit=%s&redirect_to=%s&issue_id=%d",
deleteBranchURL, pull.MergedCommitID, ctx.Data["Link"], issue.ID)
}
}