opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-06-16 17:59:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Propagate context and ensure git commands run in request context ()

Browse Source 
This PR continues the work in  by progressively ensuring that git
commands run within the request context.

This now means that the if there is a git repo already open in the context it will be used instead of reopening it.

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath
2022-01-19 23:26:57 +00:00
committed by GitHub
parent 4563148a61
commit 5cb0c9aa0d
193 changed files with 1264 additions and 1154 deletions
cmd
admin.godoctor.go
integrations
api_repo_file_helpers.goapi_repo_get_contents_list_test.goapi_repo_get_contents_test.gogit_helper_for_declarative_test.gomirror_pull_test.gopull_merge_test.gopull_update_test.gorepo_tag_test.gorepofiles_delete_test.gorepofiles_update_test.go
models
admin
notice.go
db
context.goengine.go
issue_comment.goissue_comment_test.goissue_xref_test.go
migrations
v136.gov156.gov82.go
pull.go
repo
repo.go
repo_activity.goreview.goreview_test.go
modules
context
api.gocontext.goprivate.gorepo.go
convert
git_commit.gopull.gopull_review.gopull_test.go
doctor
authorizedkeys.gocheckOldArchives.godbconsistency.godbversion.godoctor.gofix16961.gomergebase.gomisc.gopaths.gostorage.gousertype.go
git
blame.gocommit.gocommit_info_test.gocommit_test.godiff.go
pipeline
catfile.golfs.golfs_nogogit.gonamerev.gorevlist.go
repo.gorepo_base.gorepo_base_gogit.gorepo_base_nogogit.gorepo_branch.gorepo_branch_gogit.gorepo_commit.gorepo_compare.gorepo_test.gotree.gotree_entry_nogogit.gotree_nogogit.go
gitgraph
graph.go
indexer/code
bleve.goelastic_search.gogit.goindexer.goindexer_test.gowrapped.go
lfs
pointer_scanner_nogogit.go
markup
html.gohtml_test.go
markdown
markdown_test.go
notification
action
action.go
base
notifier.gonull.go
mail
mail.go
notification.go
webhook
webhook.go
process
manager.go
repository
commits.gocommits_test.gogenerate.goinit.gopush.gorepo.go
templates
helper.go
test
context_tests.go
web
route.go
routers
api/v1
api.go
misc
markdown.gosigning.go
repo
blob.gobranch.gocommits.gofile.gonotes.gopull.gopull_review.gorelease.gorelease_tags.gorepo.gostatus.gotag.gotree.gowiki.go
utils
git.go
private
default_branch.gohook_pre_receive.gohook_verification.gointernal.gointernal_repo.goserv.go
web
admin
repos.go
feed
convert.go
org
home.go
repo
activity.gobranch.gocommit.gocompare.goeditor.gohttp.goissue.golfs.gopull.gopull_review.gorelease.gosetting.gowiki.go
user
home.go
services
agit
agit.go
asymkey
sign.go
gitdiff
gitdiff.gogitdiff_test.go
mailer
mail.gomail_comment.gomail_issue.gomail_release.go
migrations
dump.gogitea_uploader.go
mirror
mirror_pull.gomirror_push.go
pull
check.gocommit_status.golfs.gomerge.gopatch.gopull.goreview.gotemp_repo.goupdate.go
release
release.gorelease_test.go
repository
adopt.go
archiver
archiver.go
branch.gocheck.go
files
commit.gocontent.gocontent_test.godelete.godiff.godiff_test.gofile.gofile_test.gotemp_repo.gotree.gotree_test.goupdate.goupload.go
hooks.gopush.gorepository.go
wiki
wiki.gowiki_test.go
templates
explore
repo_list.tmpl
repo
branch
list.tmpl
commit_page.tmplcommits_list.tmplcommits_list_small.tmpl
graph
commits.tmpl
header.tmplhome.tmpl
issue
view_title.tmpl
settings
options.tmpl
view_list.tmpl
user/dashboard
feeds.tmpl
tools
fuzz.go

12
services/pull/commit_status.go

@ -6,6 +6,8 @@
package pull
import (
"context"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/git"
@ -80,7 +82,7 @@ func IsCommitStatusContextSuccess(commitStatuses []*models.CommitStatus, require
}
// IsPullCommitStatusPass returns if all required status checks PASS
func IsPullCommitStatusPass(pr *models.PullRequest) (bool, error) {
func IsPullCommitStatusPass(ctx context.Context, pr *models.PullRequest) (bool, error) {
if err := pr.LoadProtectedBranch(); err != nil {
return false, errors.Wrap(err, "GetLatestCommitStatus")
}
@ -88,7 +90,7 @@ func IsPullCommitStatusPass(pr *models.PullRequest) (bool, error) {
return true, nil
}
state, err := GetPullRequestCommitStatusState(pr)
state, err := GetPullRequestCommitStatusState(ctx, pr)
if err != nil {
return false, err
}
@ -96,18 +98,18 @@ func IsPullCommitStatusPass(pr *models.PullRequest) (bool, error) {
}
// GetPullRequestCommitStatusState returns pull request merged commit status state
func GetPullRequestCommitStatusState(pr *models.PullRequest) (structs.CommitStatusState, error) {
func GetPullRequestCommitStatusState(ctx context.Context, pr *models.PullRequest) (structs.CommitStatusState, error) {
// Ensure HeadRepo is loaded
if err := pr.LoadHeadRepo(); err != nil {
return "", errors.Wrap(err, "LoadHeadRepo")
}
// check if all required status checks are successful
headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
headGitRepo, closer, err := git.RepositoryFromContextOrOpen(ctx, pr.HeadRepo.RepoPath())
if err != nil {
return "", errors.Wrap(err, "OpenRepository")
}
defer headGitRepo.Close()
defer closer.Close()
if pr.Flow == models.PullRequestFlowGithub && !headGitRepo.IsBranchExist(pr.HeadBranch) {
return "", errors.New("Head branch does not exist, can not merge")