diff options
| author | 6543 <6543@obermui.de> | 2022-03-29 21:13:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 03:13:41 +0800 |
| commit | 3e88af898a7b8e2697f7e4c3867c34b802d0b660 (patch) | |
| tree | e8304867b9fd8d78ef0a3da7221d84fb29592c21 /modules/context | |
| parent | 889a8c268ca6a54ff5be19e61b29b10feb4a12e8 (diff) | |
| download | gitea-3e88af898a7b8e2697f7e4c3867c34b802d0b660.tar.gz gitea-3e88af898a7b8e2697f7e4c3867c34b802d0b660.zip | |
Make git.OpenRepository accept Context (#19260)
* OpenRepositoryCtx -> OpenRepository
* OpenRepository -> openRepositoryWithDefaultContext, only for internal usage
Diffstat (limited to 'modules/context')
| -rw-r--r-- | modules/context/api.go | 4 | ||||
| -rw-r--r-- | modules/context/repo.go | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/context/api.go b/modules/context/api.go index e847ca35fa..ae516503e4 100644 --- a/modules/context/api.go +++ b/modules/context/api.go @@ -331,7 +331,7 @@ func ReferencesGitRepo(allowEmpty bool) func(ctx *APIContext) (cancel context.Ca // For API calls. if ctx.Repo.GitRepo == nil { repoPath := repo_model.RepoPath(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name) - gitRepo, err := git.OpenRepositoryCtx(ctx, repoPath) + gitRepo, err := git.OpenRepository(ctx, repoPath) if err != nil { ctx.Error(http.StatusInternalServerError, "RepoRef Invalid repo "+repoPath, err) return @@ -388,7 +388,7 @@ func RepoRefForAPI(next http.Handler) http.Handler { if ctx.Repo.GitRepo == nil { repoPath := repo_model.RepoPath(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name) - ctx.Repo.GitRepo, err = git.OpenRepositoryCtx(ctx, repoPath) + ctx.Repo.GitRepo, err = git.OpenRepository(ctx, repoPath) if err != nil { ctx.InternalServerError(err) return diff --git a/modules/context/repo.go b/modules/context/repo.go index b4ffb21cce..5a9e38a1d9 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -529,7 +529,7 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) { } ctx.Data["CanSignedUserFork"] = canSignedUserFork - userAndOrgForks, err := models.GetForksByUserAndOrgs(ctx.Doer, ctx.Repo.Repository) + userAndOrgForks, err := models.GetForksByUserAndOrgs(ctx, ctx.Doer, ctx.Repo.Repository) if err != nil { ctx.ServerError("GetForksByUserAndOrgs", err) return @@ -588,7 +588,7 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) { return } - gitRepo, err := git.OpenRepositoryCtx(ctx, repo_model.RepoPath(userName, repoName)) + gitRepo, err := git.OpenRepository(ctx, repo_model.RepoPath(userName, repoName)) if err != nil { if strings.Contains(err.Error(), "repository does not exist") || strings.Contains(err.Error(), "no such file or directory") { log.Error("Repository %-v has a broken repository on the file system: %s Error: %v", ctx.Repo.Repository, ctx.Repo.Repository.RepoPath(), err) @@ -846,7 +846,7 @@ func RepoRefByType(refType RepoRefType, ignoreNotExistErr ...bool) func(*Context if ctx.Repo.GitRepo == nil { repoPath := repo_model.RepoPath(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name) - ctx.Repo.GitRepo, err = git.OpenRepositoryCtx(ctx, repoPath) + ctx.Repo.GitRepo, err = git.OpenRepository(ctx, repoPath) if err != nil { ctx.ServerError("RepoRef Invalid repo "+repoPath, err) return |