mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-21 09:06:46 +09:00
wxiaoguang
ea91028028
* Revert the behavior introduced by #30805 * Now the PR status is still managed in Gitea's code where the operation is triggerred but not in post-receive hook * Fix #39254 and many more related bugs. * Fix #39124 ``` // MarkAsMerged sets a pull request to merged and closes the corresponding issue // To make sure the pull request is marked as merged correctly, the caller uses multiple-stage operations: // 1. Create a temp repo from base, merge the head into the temp repo, and get the merged commit ID and timestamp, // 2. The merged commit ID and related information are stored into pull request // 3. Push the merged commit to the base repo // 4. Call MarkAsMerged to mark the pull request as merged and do post-processing (notification, close issues, etc) // // If failure occurs in step 1/2/3: the pull request is still open, the base repo is not changed, the doer can start a new merge. // If failure occurs in step 4: the pull request can be marked as merged by the merged commit ID stored in it later. ```
64 lines
1.9 KiB
Go
64 lines
1.9 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package private
|
|
|
|
import (
|
|
"gitea.dev/models/perm/access"
|
|
repo_model "gitea.dev/models/repo"
|
|
"gitea.dev/models/user"
|
|
"gitea.dev/modules/git"
|
|
gitea_context "gitea.dev/services/context"
|
|
)
|
|
|
|
// This file contains common functions relating to setting the Repository for the internal routes
|
|
|
|
// RepoAssignment assigns the repository and git repository to the private context
|
|
func RepoAssignment(ctx *gitea_context.PrivateContext) {
|
|
ownerName := ctx.PathParam("owner")
|
|
repoName := ctx.PathParam("repo")
|
|
|
|
repo := loadRepository(ctx, ownerName, repoName)
|
|
if ctx.Written() {
|
|
// Error handled in loadRepository
|
|
return
|
|
}
|
|
|
|
gitRepo, err := git.RepositoryFromRequestContextOrOpen(ctx, repo)
|
|
if err != nil {
|
|
ctx.PrivateInternalErrorf("Failed to open repository: %s/%s Error: %v", ownerName, repoName, err)
|
|
return
|
|
}
|
|
ctx.Repo = &gitea_context.Repository{Repository: repo, GitRepo: gitRepo}
|
|
}
|
|
|
|
func loadRepository(ctx *gitea_context.PrivateContext, ownerName, repoName string) *repo_model.Repository {
|
|
repo, err := repo_model.GetRepositoryByOwnerAndName(ctx, ownerName, repoName)
|
|
if err != nil {
|
|
ctx.PrivateInternalErrorf("Failed to get repository: %s/%s Error: %v", ownerName, repoName, err)
|
|
return nil
|
|
}
|
|
if repo.OwnerName == "" {
|
|
repo.OwnerName = ownerName
|
|
}
|
|
return repo
|
|
}
|
|
|
|
func loadContextDoerPermission(ctx *gitea_context.PrivateContext, userID int64, extDoerData string) bool {
|
|
if ctx.Doer != nil {
|
|
return true
|
|
}
|
|
doer, err := user.GetDoerPermissionUser(ctx, userID, extDoerData)
|
|
if err != nil {
|
|
ctx.PrivateInternalErrorf("Failed to get user: %d, error: %v", userID, err)
|
|
return false
|
|
}
|
|
ctx.Doer = doer
|
|
ctx.Repo.Permission, err = access.GetDoerRepoPermission(ctx, ctx.Repo.Repository, doer)
|
|
if err != nil {
|
|
ctx.PrivateInternalErrorf("Failed to get permission for user: %d, error: %v", userID, err)
|
|
return false
|
|
}
|
|
return true
|
|
}
|