diff options
Diffstat (limited to 'routers/api/v1/repo/file.go')
| -rw-r--r-- | routers/api/v1/repo/file.go | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index 009b8a26d6..e84f652ed9 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -15,11 +15,11 @@ import ( "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/repofiles" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers/common" "code.gitea.io/gitea/routers/web/repo" + files_service "code.gitea.io/gitea/services/repository/files" ) // GetRawFile get a file by path on a repository @@ -240,22 +240,22 @@ func CreateFile(ctx *context.APIContext) { apiOpts.BranchName = ctx.Repo.Repository.DefaultBranch } - opts := &repofiles.UpdateRepoFileOptions{ + opts := &files_service.UpdateRepoFileOptions{ Content: apiOpts.Content, IsNewFile: true, Message: apiOpts.Message, TreePath: ctx.Params("*"), OldBranch: apiOpts.BranchName, NewBranch: apiOpts.NewBranchName, - Committer: &repofiles.IdentityOptions{ + Committer: &files_service.IdentityOptions{ Name: apiOpts.Committer.Name, Email: apiOpts.Committer.Email, }, - Author: &repofiles.IdentityOptions{ + Author: &files_service.IdentityOptions{ Name: apiOpts.Author.Name, Email: apiOpts.Author.Email, }, - Dates: &repofiles.CommitDateOptions{ + Dates: &files_service.CommitDateOptions{ Author: apiOpts.Dates.Author, Committer: apiOpts.Dates.Committer, }, @@ -327,7 +327,7 @@ func UpdateFile(ctx *context.APIContext) { apiOpts.BranchName = ctx.Repo.Repository.DefaultBranch } - opts := &repofiles.UpdateRepoFileOptions{ + opts := &files_service.UpdateRepoFileOptions{ Content: apiOpts.Content, SHA: apiOpts.SHA, IsNewFile: false, @@ -336,15 +336,15 @@ func UpdateFile(ctx *context.APIContext) { TreePath: ctx.Params("*"), OldBranch: apiOpts.BranchName, NewBranch: apiOpts.NewBranchName, - Committer: &repofiles.IdentityOptions{ + Committer: &files_service.IdentityOptions{ Name: apiOpts.Committer.Name, Email: apiOpts.Committer.Email, }, - Author: &repofiles.IdentityOptions{ + Author: &files_service.IdentityOptions{ Name: apiOpts.Author.Name, Email: apiOpts.Author.Email, }, - Dates: &repofiles.CommitDateOptions{ + Dates: &files_service.CommitDateOptions{ Author: apiOpts.Dates.Author, Committer: apiOpts.Dates.Committer, }, @@ -387,7 +387,7 @@ func handleCreateOrUpdateFileError(ctx *context.APIContext, err error) { } // Called from both CreateFile or UpdateFile to handle both -func createOrUpdateFile(ctx *context.APIContext, opts *repofiles.UpdateRepoFileOptions) (*api.FileResponse, error) { +func createOrUpdateFile(ctx *context.APIContext, opts *files_service.UpdateRepoFileOptions) (*api.FileResponse, error) { if !canWriteFiles(ctx.Repo) { return nil, models.ErrUserDoesNotHaveAccessToRepo{ UserID: ctx.User.ID, @@ -401,7 +401,7 @@ func createOrUpdateFile(ctx *context.APIContext, opts *repofiles.UpdateRepoFileO } opts.Content = string(content) - return repofiles.CreateOrUpdateRepoFile(ctx.Repo.Repository, ctx.User, opts) + return files_service.CreateOrUpdateRepoFile(ctx.Repo.Repository, ctx.User, opts) } // DeleteFile Delete a fle in a repository @@ -457,21 +457,21 @@ func DeleteFile(ctx *context.APIContext) { apiOpts.BranchName = ctx.Repo.Repository.DefaultBranch } - opts := &repofiles.DeleteRepoFileOptions{ + opts := &files_service.DeleteRepoFileOptions{ Message: apiOpts.Message, OldBranch: apiOpts.BranchName, NewBranch: apiOpts.NewBranchName, SHA: apiOpts.SHA, TreePath: ctx.Params("*"), - Committer: &repofiles.IdentityOptions{ + Committer: &files_service.IdentityOptions{ Name: apiOpts.Committer.Name, Email: apiOpts.Committer.Email, }, - Author: &repofiles.IdentityOptions{ + Author: &files_service.IdentityOptions{ Name: apiOpts.Author.Name, Email: apiOpts.Author.Email, }, - Dates: &repofiles.CommitDateOptions{ + Dates: &files_service.CommitDateOptions{ Author: apiOpts.Dates.Author, Committer: apiOpts.Dates.Committer, }, @@ -488,7 +488,7 @@ func DeleteFile(ctx *context.APIContext) { opts.Message = ctx.Tr("repo.editor.delete", opts.TreePath) } - if fileResponse, err := repofiles.DeleteRepoFile(ctx.Repo.Repository, ctx.User, opts); err != nil { + if fileResponse, err := files_service.DeleteRepoFile(ctx.Repo.Repository, ctx.User, opts); err != nil { if git.IsErrBranchNotExist(err) || models.IsErrRepoFileDoesNotExist(err) || git.IsErrNotExist(err) { ctx.Error(http.StatusNotFound, "DeleteFile", err) return @@ -554,7 +554,7 @@ func GetContents(ctx *context.APIContext) { treePath := ctx.Params("*") ref := ctx.FormTrim("ref") - if fileList, err := repofiles.GetContentsOrList(ctx.Repo.Repository, treePath, ref); err != nil { + if fileList, err := files_service.GetContentsOrList(ctx.Repo.Repository, treePath, ref); err != nil { if git.IsErrNotExist(err) { ctx.NotFound("GetContentsOrList", err) return |