More refactor about repository root path

cmd/serv.go

@@ -21,6 +21,7 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/git/gitcmd"
+	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/lfstransfer"
 	"code.gitea.io/gitea/modules/log"
@@ -60,8 +61,9 @@ func setup(ctx context.Context, debug bool) {
 		setupConsoleLogger(log.FATAL, false, os.Stderr)
 	}
 	setting.MustInstalled()
-	if _, err := os.Stat(setting.RepoRootPath); err != nil {
-		_ = fail(ctx, "Unable to access repository path", "Unable to access repository path %q, err: %v", setting.RepoRootPath, err)
+
+	if err := gitrepo.RepoStoreStat(); err != nil {
+		_ = fail(ctx, "Unable to access repository path", "Check repository store failed: %v", err)
 		return
 	}
 	if err := git.InitSimple(); err != nil {

models/migrations/base/db.go

@@ -13,7 +13,6 @@ import (
 	"reflect"
 	"regexp"
 	"strings"
-	"time"
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/unittest"
@@ -516,18 +515,6 @@ func ModifyColumn(x *xorm.Engine, tableName string, col *schemas.Column) error {
 	return nil
 }
 
-func removeAllWithRetry(dir string) error {
-	var err error
-	for range 20 {
-		err = os.RemoveAll(dir)
-		if err == nil {
-			break
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-	return err
-}
-
 func newXORMEngine() (*xorm.Engine, error) {
 	if err := db.InitEngine(context.Background()); err != nil {
 		return nil, err

models/migrations/base/tests.go

@@ -12,6 +12,7 @@ import (
 
 	"code.gitea.io/gitea/models/unittest"
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/tempdir"
 	"code.gitea.io/gitea/modules/test"
@@ -33,7 +34,7 @@ func PrepareTestEnv(t *testing.T, skip int, syncModels ...any) (*xorm.Engine, fu
 	ourSkip := 2
 	ourSkip += skip
 	deferFn := testlogger.PrintCurrentTest(t, ourSkip)
-	require.NoError(t, unittest.SyncDirs(filepath.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath))
+	require.NoError(t, gitrepo.SyncLocalToRepoStore(filepath.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta")))
 
 	if err := deleteDB(); err != nil {
 		t.Fatalf("unable to reset database: %v", err)
@@ -142,8 +143,8 @@ func MainTest(m *testing.M) {
 
 	exitStatus := m.Run()
 
-	if err := removeAllWithRetry(setting.RepoRootPath); err != nil {
-		_, _ = fmt.Fprintf(os.Stderr, "os.RemoveAll: %v\n", err)
+	if err := gitrepo.RemoveRepoStore(); err != nil {
+		_, _ = fmt.Fprintf(os.Stderr, "gitrepo.RemoveRepoStore: %v\n", err)
 	}
 	os.Exit(exitStatus)
 }

models/migrations/v1_12/v128.go

@@ -13,21 +13,26 @@ import (
 
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/git/gitcmd"
+	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
 	"xorm.io/xorm"
 )
 
-func FixMergeBase(ctx context.Context, x *xorm.Engine) error {
-	type Repository struct {
-		ID        int64 `xorm:"pk autoincr"`
-		OwnerID   int64 `xorm:"UNIQUE(s) index"`
-		OwnerName string
-		LowerName string `xorm:"UNIQUE(s) INDEX NOT NULL"`
-		Name      string `xorm:"INDEX NOT NULL"`
-	}
+type Repository struct {
+	ID        int64 `xorm:"pk autoincr"`
+	OwnerID   int64 `xorm:"UNIQUE(s) index"`
+	OwnerName string
+	LowerName string `xorm:"UNIQUE(s) INDEX NOT NULL"`
+	Name      string `xorm:"INDEX NOT NULL"`
+}
 
+func (r *Repository) RelativePath() string {
+	return filepath.Join(strings.ToLower(r.OwnerName), strings.ToLower(r.Name)+".git")
+}
+
+func FixMergeBase(ctx context.Context, x *xorm.Engine) error {
 	type PullRequest struct {
 		ID         int64 `xorm:"pk autoincr"`
 		Index      int64
@@ -77,24 +82,22 @@ func FixMergeBase(ctx context.Context, x *xorm.Engine) error {
 				log.Error("Missing base repo with id %d for PR ID %d", pr.BaseRepoID, pr.ID)
 				continue
 			}
-			userPath := filepath.Join(setting.RepoRootPath, strings.ToLower(baseRepo.OwnerName))
-			repoPath := filepath.Join(userPath, strings.ToLower(baseRepo.Name)+".git")
 
 			gitRefName := fmt.Sprintf("refs/pull/%d/head", pr.Index)
 
 			if !pr.HasMerged {
 				var err error
-				pr.MergeBase, _, err = gitcmd.NewCommand("merge-base").AddDashesAndList(pr.BaseBranch, gitRefName).WithDir(repoPath).RunStdString(ctx)
+				pr.MergeBase, err = gitrepo.RunCmdString(ctx, baseRepo, gitcmd.NewCommand("merge-base").AddDashesAndList(pr.BaseBranch, gitRefName))
 				if err != nil {
 					var err2 error
-					pr.MergeBase, _, err2 = gitcmd.NewCommand("rev-parse").AddDynamicArguments(git.BranchPrefix + pr.BaseBranch).WithDir(repoPath).RunStdString(ctx)
+					pr.MergeBase, err2 = gitrepo.RunCmdString(ctx, baseRepo, gitcmd.NewCommand("rev-parse").AddDynamicArguments(git.BranchPrefix+pr.BaseBranch))
 					if err2 != nil {
 						log.Error("Unable to get merge base for PR ID %d, Index %d in %s/%s. Error: %v & %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err, err2)
 						continue
 					}
 				}
 			} else {
-				parentsString, _, err := gitcmd.NewCommand("rev-list", "--parents", "-n", "1").AddDynamicArguments(pr.MergedCommitID).WithDir(repoPath).RunStdString(ctx)
+				parentsString, err := gitrepo.RunCmdString(ctx, baseRepo, gitcmd.NewCommand("rev-list", "--parents", "-n", "1").AddDynamicArguments(pr.MergedCommitID))
 				if err != nil {
 					log.Error("Unable to get parents for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
 					continue
@@ -107,8 +110,7 @@ func FixMergeBase(ctx context.Context, x *xorm.Engine) error {
 				refs := append([]string{}, parents[1:]...)
 				refs = append(refs, gitRefName)
 				cmd := gitcmd.NewCommand("merge-base").AddDashesAndList(refs...)
-
-				pr.MergeBase, _, err = cmd.WithDir(repoPath).RunStdString(ctx)
+				pr.MergeBase, err = gitrepo.RunCmdString(ctx, baseRepo, cmd)
 				if err != nil {
 					log.Error("Unable to get merge base for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
 					continue

models/migrations/v1_12/v134.go

@@ -12,30 +12,38 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/modules/git/gitcmd"
+	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
 	"xorm.io/xorm"
 )
 
-func RefixMergeBase(ctx context.Context, x *xorm.Engine) error {
-	type Repository struct {
-		ID        int64 `xorm:"pk autoincr"`
-		OwnerID   int64 `xorm:"UNIQUE(s) index"`
-		OwnerName string
-		LowerName string `xorm:"UNIQUE(s) INDEX NOT NULL"`
-		Name      string `xorm:"INDEX NOT NULL"`
-	}
+type Repository2 struct {
+	ID        int64 `xorm:"pk autoincr"`
+	OwnerID   int64 `xorm:"UNIQUE(s) index"`
+	OwnerName string
+	LowerName string `xorm:"UNIQUE(s) INDEX NOT NULL"`
+	Name      string `xorm:"INDEX NOT NULL"`
+}
 
-	type PullRequest struct {
-		ID         int64 `xorm:"pk autoincr"`
-		Index      int64
-		HeadRepoID int64 `xorm:"INDEX"`
-		BaseRepoID int64 `xorm:"INDEX"`
-		HeadBranch string
-		BaseBranch string
-		MergeBase  string `xorm:"VARCHAR(40)"`
+func (r *Repository2) TableName() string {
+	return "repository"
+}
 
+func (r *Repository2) RelativePath() string {
+	return filepath.Join(strings.ToLower(r.OwnerName), strings.ToLower(r.Name)+".git")
+}
+
+func RefixMergeBase(ctx context.Context, x *xorm.Engine) error {
+	type PullRequest struct {
+		ID             int64 `xorm:"pk autoincr"`
+		Index          int64
+		HeadRepoID     int64 `xorm:"INDEX"`
+		BaseRepoID     int64 `xorm:"INDEX"`
+		HeadBranch     string
+		BaseBranch     string
+		MergeBase      string `xorm:"VARCHAR(40)"`
 		HasMerged      bool   `xorm:"INDEX"`
 		MergedCommitID string `xorm:"VARCHAR(40)"`
 	}
@@ -66,7 +74,7 @@ func RefixMergeBase(ctx context.Context, x *xorm.Engine) error {
 
 		start += 50
 		for _, pr := range prs {
-			baseRepo := &Repository{ID: pr.BaseRepoID}
+			baseRepo := &Repository2{ID: pr.BaseRepoID}
 			has, err := x.Table("repository").Get(baseRepo)
 			if err != nil {
 				return fmt.Errorf("Unable to get base repo %d %w", pr.BaseRepoID, err)
@@ -75,12 +83,10 @@ func RefixMergeBase(ctx context.Context, x *xorm.Engine) error {
 				log.Error("Missing base repo with id %d for PR ID %d", pr.BaseRepoID, pr.ID)
 				continue
 			}
-			userPath := filepath.Join(setting.RepoRootPath, strings.ToLower(baseRepo.OwnerName))
-			repoPath := filepath.Join(userPath, strings.ToLower(baseRepo.Name)+".git")
 
 			gitRefName := fmt.Sprintf("refs/pull/%d/head", pr.Index)
 
-			parentsString, _, err := gitcmd.NewCommand("rev-list", "--parents", "-n", "1").AddDynamicArguments(pr.MergedCommitID).WithDir(repoPath).RunStdString(ctx)
+			parentsString, err := gitrepo.RunCmdString(ctx, baseRepo, gitcmd.NewCommand("rev-list", "--parents", "-n", "1").AddDynamicArguments(pr.MergedCommitID))
 			if err != nil {
 				log.Error("Unable to get parents for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
 				continue
@@ -94,8 +100,7 @@ func RefixMergeBase(ctx context.Context, x *xorm.Engine) error {
 			refs := append([]string{}, parents[1:]...)
 			refs = append(refs, gitRefName)
 			cmd := gitcmd.NewCommand("merge-base").AddDashesAndList(refs...)
-
-			pr.MergeBase, _, err = cmd.WithDir(repoPath).RunStdString(ctx)
+			pr.MergeBase, err = gitrepo.RunCmdString(ctx, baseRepo, cmd)
 			if err != nil {
 				log.Error("Unable to get merge base for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
 				continue

models/migrations/v1_14/v156.go

@@ -6,23 +6,24 @@ package v1_14
 import (
 	"context"
 	"fmt"
-	"path/filepath"
 	"strings"
 
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/setting"
 
 	"xorm.io/xorm"
 )
 
-// Copy paste from models/repo.go because we cannot import models package
-func repoPath(userName, repoName string) string {
-	return filepath.Join(userPath(userName), strings.ToLower(repoName)+".git")
+type Repository struct {
+	ID        int64
+	OwnerID   int64
+	OwnerName string
+	Name      string
 }
 
-func userPath(userName string) string {
-	return filepath.Join(setting.RepoRootPath, strings.ToLower(userName))
+func (r *Repository) RelativePath() string {
+	return fmt.Sprintf("%s/%s.git", strings.ToLower(r.OwnerName), strings.ToLower(r.Name))
 }
 
 func FixPublisherIDforTagReleases(ctx context.Context, x *xorm.Engine) error {
@@ -34,13 +35,6 @@ func FixPublisherIDforTagReleases(ctx context.Context, x *xorm.Engine) error {
 		PublisherID int64
 	}
 
-	type Repository struct {
-		ID        int64
-		OwnerID   int64
-		OwnerName string
-		Name      string
-	}
-
 	type User struct {
 		ID    int64
 		Name  string
@@ -109,7 +103,7 @@ func FixPublisherIDforTagReleases(ctx context.Context, x *xorm.Engine) error {
 						return err
 					}
 				}
-				gitRepo, err = git.OpenRepository(ctx, repoPath(repo.OwnerName, repo.Name))
+				gitRepo, err = gitrepo.OpenRepository(ctx, repo)
 				if err != nil {
 					log.Error("Error whilst opening git repo for [%d]%s/%s. Error: %v", repo.ID, repo.OwnerName, repo.Name, err)
 					return err

models/migrations/v1_21/v276.go

@@ -161,7 +161,7 @@ func migratePushMirrors(x *xorm.Engine) error {
 func getRemoteAddress(ownerName, repoName, remoteName string) (string, error) {
 	ctx := context.Background()
 	relativePath := repo_model.RelativePath(ownerName, repoName)
-	if exist, _ := gitrepo.IsRepositoryExist(ctx, repo_model.StorageRepo(relativePath)); !exist {
+	if exist, _ := gitrepo.IsRepositoryExist(repo_model.StorageRepo(relativePath)); !exist {
 		return "", nil
 	}
 

models/unittest/testdb.go

@@ -16,6 +16,7 @@ import (
 	"code.gitea.io/gitea/modules/auth/password/hash"
 	"code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/setting/config"
@@ -137,8 +138,8 @@ func MainTest(m *testing.M, testOptsArg ...*TestOptions) {
 	if err = storage.Init(); err != nil {
 		fatalTestError("storage.Init: %v\n", err)
 	}
-	if err = SyncDirs(filepath.Join(giteaRoot, "tests", "gitea-repositories-meta"), setting.RepoRootPath); err != nil {
-		fatalTestError("util.SyncDirs: %v\n", err)
+	if err = gitrepo.SyncLocalToRepoStore(filepath.Join(giteaRoot, "tests", "gitea-repositories-meta")); err != nil {
+		fatalTestError("gitrepo.SyncLocalToRepoStore: %v\n", err)
 	}
 
 	if err = git.InitFull(); err != nil {
@@ -200,6 +201,6 @@ func PrepareTestDatabase() error {
 func PrepareTestEnv(t testing.TB) {
 	assert.NoError(t, PrepareTestDatabase())
 	metaPath := filepath.Join(giteaRoot, "tests", "gitea-repositories-meta")
-	assert.NoError(t, SyncDirs(metaPath, setting.RepoRootPath))
+	assert.NoError(t, gitrepo.SyncLocalToRepoStore(metaPath))
 	test.SetupGiteaRoot() // Makes sure GITEA_ROOT is set
 }

models/user/user.go

@@ -11,7 +11,6 @@ import (
 	"mime"
 	"net/mail"
 	"net/url"
-	"path/filepath"
 	"regexp"
 	"strings"
 	"sync"
@@ -983,11 +982,6 @@ func GetInactiveUsers(ctx context.Context, olderThan time.Duration) ([]*User, er
 		Find(&users)
 }
 
-// UserPath returns the path absolute path of user repositories.
-func UserPath(userName string) string { //revive:disable-line:exported
-	return filepath.Join(setting.RepoRootPath, filepath.Clean(strings.ToLower(userName)))
-}
-
 // GetUserByID returns the user object by given ID if exists.
 func GetUserByID(ctx context.Context, id int64) (*User, error) {
 	u := new(User)

modules/git/repo_base_gogit.go

@@ -64,7 +64,7 @@ func OpenRepository(ctx context.Context, repoPath string) (*Repository, error) {
 	// so use "/" for AlternatesFS, I guess it is the same behavior as current nogogit (no limitation or check for the "objects/info/alternates" paths), trust the "clone" command executed by the server.
 	var altFs billy.Filesystem
 	if setting.IsWindows {
-		altFs = osfs.New(filepath.VolumeName(setting.RepoRootPath) + "\\") // TODO: does it really work for Windows? Need some time to check.
+		altFs = osfs.New(filepath.VolumeName(repoPath) + "\\") // TODO: does it really work for Windows? Need some time to check.
 	} else {
 		altFs = osfs.New("/")
 	}