aboutsummaryrefslogtreecommitdiffstats
path: root/services/automerge
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2024-01-28 04:09:51 +0800
committerGitHub <noreply@github.com>2024-01-27 21:09:51 +0100
commit5f82ead13cb7706d3f660271d94de6101cef4119 (patch)
treec10dc0ec9b98992629847f2b98554f3d1c3713ed /services/automerge
parent60e4a98ab07dcf3bd86cf630c79e6433c3ef3e84 (diff)
downloadgitea-5f82ead13cb7706d3f660271d94de6101cef4119.tar.gz
gitea-5f82ead13cb7706d3f660271d94de6101cef4119.zip
Simplify how git repositories are opened (#28937)
## Purpose This is a refactor toward building an abstraction over managing git repositories. Afterwards, it does not matter anymore if they are stored on the local disk or somewhere remote. ## What this PR changes We used `git.OpenRepository` everywhere previously. Now, we should split them into two distinct functions: Firstly, there are temporary repositories which do not change: ```go git.OpenRepository(ctx, diskPath) ``` Gitea managed repositories having a record in the database in the `repository` table are moved into the new package `gitrepo`: ```go gitrepo.OpenRepository(ctx, repo_model.Repo) ``` Why is `repo_model.Repository` the second parameter instead of file path? Because then we can easily adapt our repository storage strategy. The repositories can be stored locally, however, they could just as well be stored on a remote server. ## Further changes in other PRs - A Git Command wrapper on package `gitrepo` could be created. i.e. `NewCommand(ctx, repo_model.Repository, commands...)`. `git.RunOpts{Dir: repo.RepoPath()}`, the directory should be empty before invoking this method and it can be filled in the function only. #28940 - Remove the `RepoPath()`/`WikiPath()` functions to reduce the possibility of mistakes. --------- Co-authored-by: delvh <dev.lh@web.de>
Diffstat (limited to 'services/automerge')
-rw-r--r--services/automerge/automerge.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go
index bf713c4431..bd427bef9f 100644
--- a/services/automerge/automerge.go
+++ b/services/automerge/automerge.go
@@ -17,6 +17,7 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/git"
+ "code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
@@ -111,7 +112,7 @@ func MergeScheduledPullRequest(ctx context.Context, sha string, repo *repo_model
}
func getPullRequestsByHeadSHA(ctx context.Context, sha string, repo *repo_model.Repository, filter func(*issues_model.PullRequest) bool) (map[int64]*issues_model.PullRequest, error) {
- gitRepo, err := git.OpenRepository(ctx, repo.RepoPath())
+ gitRepo, err := gitrepo.OpenRepository(ctx, repo)
if err != nil {
return nil, err
}
@@ -190,7 +191,7 @@ func handlePull(pullID int64, sha string) {
return
}
- headGitRepo, err := git.OpenRepository(ctx, pr.HeadRepo.RepoPath())
+ headGitRepo, err := gitrepo.OpenRepository(ctx, pr.HeadRepo)
if err != nil {
log.Error("OpenRepository %-v: %v", pr.HeadRepo, err)
return
@@ -246,7 +247,7 @@ func handlePull(pullID int64, sha string) {
return
}
- baseGitRepo, err = git.OpenRepository(ctx, pr.BaseRepo.RepoPath())
+ baseGitRepo, err = gitrepo.OpenRepository(ctx, pr.BaseRepo)
if err != nil {
log.Error("OpenRepository %-v: %v", pr.BaseRepo, err)
return