forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix issue with docker-rootless shimming script (go-gitea#18690) tests: remove redundant comparison in repo dump/restore (go-gitea#18660) [skip ci] Updated translations via Crowdin Disable unnecessary OpenID/OAuth2 elements (go-gitea#18491) Add apply-patch, basic revert and cherry-pick functionality (go-gitea#17902) C preprocessor colors improvement (go-gitea#18671) Update object repo with the migrated repository (go-gitea#18684)
- Loading branch information
Showing
31 changed files
with
1,232 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| // Copyright 2021 The Gitea Authors. All rights reserved. | ||
| // Use of this source code is governed by a MIT-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| package repo | ||
|
|
||
| import ( | ||
| "net/http" | ||
| "time" | ||
|
|
||
| "code.gitea.io/gitea/models" | ||
| "code.gitea.io/gitea/modules/context" | ||
| "code.gitea.io/gitea/modules/git" | ||
| api "code.gitea.io/gitea/modules/structs" | ||
| "code.gitea.io/gitea/modules/web" | ||
| "code.gitea.io/gitea/services/repository/files" | ||
| ) | ||
|
|
||
| // ApplyDiffPatch handles API call for applying a patch | ||
| func ApplyDiffPatch(ctx *context.APIContext) { | ||
| // swagger:operation POST /repos/{owner}/{repo}/diffpatch repository repoApplyDiffPatch | ||
| // --- | ||
| // summary: Apply diff patch to repository | ||
| // consumes: | ||
| // - application/json | ||
| // produces: | ||
| // - application/json | ||
| // parameters: | ||
| // - name: owner | ||
| // in: path | ||
| // description: owner of the repo | ||
| // type: string | ||
| // required: true | ||
| // - name: repo | ||
| // in: path | ||
| // description: name of the repo | ||
| // type: string | ||
| // required: true | ||
| // - name: body | ||
| // in: body | ||
| // required: true | ||
| // schema: | ||
| // "$ref": "#/definitions/UpdateFileOptions" | ||
| // responses: | ||
| // "200": | ||
| // "$ref": "#/responses/FileResponse" | ||
| apiOpts := web.GetForm(ctx).(*api.ApplyDiffPatchFileOptions) | ||
|
|
||
| opts := &files.ApplyDiffPatchOptions{ | ||
| Content: apiOpts.Content, | ||
| SHA: apiOpts.SHA, | ||
| Message: apiOpts.Message, | ||
| OldBranch: apiOpts.BranchName, | ||
| NewBranch: apiOpts.NewBranchName, | ||
| Committer: &files.IdentityOptions{ | ||
| Name: apiOpts.Committer.Name, | ||
| Email: apiOpts.Committer.Email, | ||
| }, | ||
| Author: &files.IdentityOptions{ | ||
| Name: apiOpts.Author.Name, | ||
| Email: apiOpts.Author.Email, | ||
| }, | ||
| Dates: &files.CommitDateOptions{ | ||
| Author: apiOpts.Dates.Author, | ||
| Committer: apiOpts.Dates.Committer, | ||
| }, | ||
| Signoff: apiOpts.Signoff, | ||
| } | ||
| if opts.Dates.Author.IsZero() { | ||
| opts.Dates.Author = time.Now() | ||
| } | ||
| if opts.Dates.Committer.IsZero() { | ||
| opts.Dates.Committer = time.Now() | ||
| } | ||
|
|
||
| if opts.Message == "" { | ||
| opts.Message = "apply-patch" | ||
| } | ||
|
|
||
| if !canWriteFiles(ctx.Repo) { | ||
| ctx.Error(http.StatusInternalServerError, "ApplyPatch", models.ErrUserDoesNotHaveAccessToRepo{ | ||
| UserID: ctx.User.ID, | ||
| RepoName: ctx.Repo.Repository.LowerName, | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| fileResponse, err := files.ApplyDiffPatch(ctx, ctx.Repo.Repository, ctx.User, opts) | ||
| if err != nil { | ||
| if models.IsErrUserCannotCommit(err) || models.IsErrFilePathProtected(err) { | ||
| ctx.Error(http.StatusForbidden, "Access", err) | ||
| return | ||
| } | ||
| if models.IsErrBranchAlreadyExists(err) || models.IsErrFilenameInvalid(err) || models.IsErrSHADoesNotMatch(err) || | ||
| models.IsErrFilePathInvalid(err) || models.IsErrRepoFileAlreadyExists(err) { | ||
| ctx.Error(http.StatusUnprocessableEntity, "Invalid", err) | ||
| return | ||
| } | ||
| if models.IsErrBranchDoesNotExist(err) || git.IsErrBranchNotExist(err) { | ||
| ctx.Error(http.StatusNotFound, "BranchDoesNotExist", err) | ||
| return | ||
| } | ||
| ctx.Error(http.StatusInternalServerError, "ApplyPatch", err) | ||
| } else { | ||
| ctx.JSON(http.StatusCreated, fileResponse) | ||
| } | ||
| } |
Oops, something went wrong.