Skip to content

Commit 7d513d6

Browse files
lunnylunny
committed
Move repofiles from modules to services
1 parent 2dae5b7 commit 7d513d6

37 files changed

+204
-280
lines changed

‎integrations/api_repo_file_helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package integrations
66

77
import (
88
"code.gitea.io/gitea/models"
9-
"code.gitea.io/gitea/modules/repofiles"
109
api "code.gitea.io/gitea/modules/structs"
10+
"code.gitea.io/gitea/services/repository/repofiles"
1111
)
1212

1313
func createFileInBranch(user *models.User, repo *models.Repository, treePath, branchName, content string) (*api.FileResponse, error) {

‎integrations/pull_update_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212

1313
"code.gitea.io/gitea/models"
1414
"code.gitea.io/gitea/models/unittest"
15-
"code.gitea.io/gitea/modules/repofiles"
1615
pull_service "code.gitea.io/gitea/services/pull"
1716
repo_service "code.gitea.io/gitea/services/repository"
17+
"code.gitea.io/gitea/services/repository/repofiles"
1818

1919
"github.com/stretchr/testify/assert"
2020
)

‎integrations/repofiles_delete_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/models/unittest"
13-
"code.gitea.io/gitea/modules/repofiles"
1413
api "code.gitea.io/gitea/modules/structs"
1514
"code.gitea.io/gitea/modules/test"
15+
"code.gitea.io/gitea/services/repository/repofiles"
1616

1717
"github.com/stretchr/testify/assert"
1818
)

‎integrations/repofiles_update_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212

1313
"code.gitea.io/gitea/models"
1414
"code.gitea.io/gitea/modules/git"
15-
"code.gitea.io/gitea/modules/repofiles"
1615
"code.gitea.io/gitea/modules/setting"
1716
api "code.gitea.io/gitea/modules/structs"
1817
"code.gitea.io/gitea/modules/test"
18+
"code.gitea.io/gitea/services/repository/repofiles"
1919

2020
"github.com/stretchr/testify/assert"
2121
)

‎modules/convert/pull.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"code.gitea.io/gitea/models"
1111
"code.gitea.io/gitea/modules/git"
1212
"code.gitea.io/gitea/modules/log"
13-
repo_module "code.gitea.io/gitea/modules/repository"
1413
api "code.gitea.io/gitea/modules/structs"
1514
)
1615

@@ -83,7 +82,14 @@ func ToAPIPullRequest(pr *models.PullRequest, doer *models.User) *api.PullReques
8382
},
8483
}
8584

86-
baseBranch, err = repo_module.GetBranch(pr.BaseRepo, pr.BaseBranch)
85+
gitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
86+
if err != nil {
87+
log.Error("OpenRepository[%s]: %v", pr.BaseRepo.RepoPath(), err)
88+
return nil
89+
}
90+
defer gitRepo.Close()
91+
92+
baseBranch, err = gitRepo.GetBranch(pr.BaseBranch)
8793
if err != nil && !git.IsErrBranchNotExist(err) {
8894
log.Error("GetBranch[%s]: %v", pr.BaseBranch, err)
8995
return nil

‎modules/repofiles/blob.go

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎modules/repofiles/blob_test.go

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎modules/repofiles/commit.go

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎modules/repofiles/commit_status.go

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎modules/repofiles/repofiles.go

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎modules/repofiles/repofiles_test.go

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎modules/repofiles/verification.go

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎modules/repository/branch.go

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎routers/api/v1/repo/blob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99

1010
"code.gitea.io/gitea/modules/context"
11-
"code.gitea.io/gitea/modules/repofiles"
11+
"code.gitea.io/gitea/services/repository/repofiles"
1212
)
1313

1414
// GetBlob get the blob of a repository file.

‎routers/api/v1/repo/branch.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"code.gitea.io/gitea/modules/context"
1515
"code.gitea.io/gitea/modules/convert"
1616
"code.gitea.io/gitea/modules/git"
17-
repo_module "code.gitea.io/gitea/modules/repository"
1817
api "code.gitea.io/gitea/modules/structs"
1918
"code.gitea.io/gitea/modules/web"
2019
"code.gitea.io/gitea/routers/api/v1/utils"
@@ -53,7 +52,7 @@ func GetBranch(ctx *context.APIContext) {
5352

5453
branchName := ctx.Params("*")
5554

56-
branch, err := repo_module.GetBranch(ctx.Repo.Repository, branchName)
55+
branch, err := repo_service.GetBranch(ctx.Repo.Repository, branchName)
5756
if err != nil {
5857
if git.IsErrBranchNotExist(err) {
5958
ctx.NotFound(err)
@@ -198,7 +197,7 @@ func CreateBranch(ctx *context.APIContext) {
198197
return
199198
}
200199

201-
branch, err := repo_module.GetBranch(ctx.Repo.Repository, opt.BranchName)
200+
branch, err := repo_service.GetBranch(ctx.Repo.Repository, opt.BranchName)
202201
if err != nil {
203202
ctx.Error(http.StatusInternalServerError, "GetBranch", err)
204203
return

‎routers/api/v1/repo/file.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import (
1515
"code.gitea.io/gitea/models/unit"
1616
"code.gitea.io/gitea/modules/context"
1717
"code.gitea.io/gitea/modules/git"
18-
"code.gitea.io/gitea/modules/repofiles"
1918
api "code.gitea.io/gitea/modules/structs"
2019
"code.gitea.io/gitea/modules/web"
2120
"code.gitea.io/gitea/routers/common"
2221
"code.gitea.io/gitea/routers/web/repo"
22+
"code.gitea.io/gitea/services/repository/repofiles"
2323
)
2424

2525
// GetRawFile get a file by path on a repository

‎routers/api/v1/repo/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/modules/context"
1313
"code.gitea.io/gitea/modules/convert"
14-
"code.gitea.io/gitea/modules/repofiles"
1514
api "code.gitea.io/gitea/modules/structs"
1615
"code.gitea.io/gitea/modules/web"
1716
"code.gitea.io/gitea/routers/api/v1/utils"
17+
"code.gitea.io/gitea/services/repository/repofiles"
1818
)
1919

2020
// NewCommitStatus creates a new CommitStatus

‎routers/api/v1/repo/tree.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99

1010
"code.gitea.io/gitea/modules/context"
11-
"code.gitea.io/gitea/modules/repofiles"
11+
"code.gitea.io/gitea/services/repository/repofiles"
1212
)
1313

1414
// GetTree get the tree of a repository.

0 commit comments

Comments
 (0)