diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-05-20 22:08:52 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-20 22:08:52 +0800 |
commit | fd7d83ace60258acf7139c4c787aa8af75b7ba8c (patch) | |
tree | 50038348ec10485f72344f3ac80324e04abc1283 /models/branches.go | |
parent | d81e31ad7826a81fc7139f329f250594610a274b (diff) | |
download | gitea-fd7d83ace60258acf7139c4c787aa8af75b7ba8c.tar.gz gitea-fd7d83ace60258acf7139c4c787aa8af75b7ba8c.zip |
Move almost all functions' parameter db.Engine to context.Context (#19748)
* Move almost all functions' parameter db.Engine to context.Context
* remove some unnecessary wrap functions
Diffstat (limited to 'models/branches.go')
-rw-r--r-- | models/branches.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/models/branches.go b/models/branches.go index 008cb8653c..98d2c3a993 100644 --- a/models/branches.go +++ b/models/branches.go @@ -306,13 +306,9 @@ func (protectBranch *ProtectedBranch) IsUnprotectedFile(patterns []glob.Glob, pa } // GetProtectedBranchBy getting protected branch by ID/Name -func GetProtectedBranchBy(repoID int64, branchName string) (*ProtectedBranch, error) { - return getProtectedBranchBy(db.GetEngine(db.DefaultContext), repoID, branchName) -} - -func getProtectedBranchBy(e db.Engine, repoID int64, branchName string) (*ProtectedBranch, error) { +func GetProtectedBranchBy(ctx context.Context, repoID int64, branchName string) (*ProtectedBranch, error) { rel := &ProtectedBranch{RepoID: repoID, BranchName: branchName} - has, err := e.Get(rel) + has, err := db.GetByBean(ctx, rel) if err != nil { return nil, err } @@ -632,7 +628,7 @@ func RenameBranch(repo *repo_model.Repository, from, to string, gitAction func(i } // 2. Update protected branch if needed - protectedBranch, err := getProtectedBranchBy(sess, repo.ID, from) + protectedBranch, err := GetProtectedBranchBy(ctx, repo.ID, from) if err != nil { return err } |