Платформа ЦРНП "Мирокод" для разработки проектов
https://git.mirocod.ru
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
117 lines
4.2 KiB
117 lines
4.2 KiB
// 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 ( |
|
"strings" |
|
|
|
"code.gitea.io/gitea/models" |
|
"code.gitea.io/gitea/models/unit" |
|
"code.gitea.io/gitea/modules/base" |
|
"code.gitea.io/gitea/modules/context" |
|
"code.gitea.io/gitea/modules/setting" |
|
"code.gitea.io/gitea/modules/util" |
|
"code.gitea.io/gitea/modules/web" |
|
"code.gitea.io/gitea/services/forms" |
|
"code.gitea.io/gitea/services/repository/files" |
|
) |
|
|
|
const ( |
|
tplPatchFile base.TplName = "repo/editor/patch" |
|
) |
|
|
|
// NewDiffPatch render create patch page |
|
func NewDiffPatch(ctx *context.Context) { |
|
canCommit := renderCommitRights(ctx) |
|
|
|
ctx.Data["TreePath"] = "" |
|
|
|
ctx.Data["commit_summary"] = "" |
|
ctx.Data["commit_message"] = "" |
|
if canCommit { |
|
ctx.Data["commit_choice"] = frmCommitChoiceDirect |
|
} else { |
|
ctx.Data["commit_choice"] = frmCommitChoiceNewBranch |
|
} |
|
ctx.Data["new_branch_name"] = GetUniquePatchBranchName(ctx) |
|
ctx.Data["last_commit"] = ctx.Repo.CommitID |
|
ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",") |
|
ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL() |
|
|
|
ctx.HTML(200, tplPatchFile) |
|
} |
|
|
|
// NewDiffPatchPost response for sending patch page |
|
func NewDiffPatchPost(ctx *context.Context) { |
|
form := web.GetForm(ctx).(*forms.EditRepoFileForm) |
|
|
|
canCommit := renderCommitRights(ctx) |
|
branchName := ctx.Repo.BranchName |
|
if form.CommitChoice == frmCommitChoiceNewBranch { |
|
branchName = form.NewBranchName |
|
} |
|
ctx.Data["TreePath"] = "" |
|
ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL() |
|
ctx.Data["FileContent"] = form.Content |
|
ctx.Data["commit_summary"] = form.CommitSummary |
|
ctx.Data["commit_message"] = form.CommitMessage |
|
ctx.Data["commit_choice"] = form.CommitChoice |
|
ctx.Data["new_branch_name"] = form.NewBranchName |
|
ctx.Data["last_commit"] = ctx.Repo.CommitID |
|
ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",") |
|
|
|
if ctx.HasError() { |
|
ctx.HTML(200, tplPatchFile) |
|
return |
|
} |
|
|
|
// Cannot commit to a an existing branch if user doesn't have rights |
|
if branchName == ctx.Repo.BranchName && !canCommit { |
|
ctx.Data["Err_NewBranchName"] = true |
|
ctx.Data["commit_choice"] = frmCommitChoiceNewBranch |
|
ctx.RenderWithErr(ctx.Tr("repo.editor.cannot_commit_to_protected_branch", branchName), tplEditFile, &form) |
|
return |
|
} |
|
|
|
// CommitSummary is optional in the web form, if empty, give it a default message based on add or update |
|
// `message` will be both the summary and message combined |
|
message := strings.TrimSpace(form.CommitSummary) |
|
if len(message) == 0 { |
|
message = ctx.Tr("repo.editor.patch") |
|
} |
|
|
|
form.CommitMessage = strings.TrimSpace(form.CommitMessage) |
|
if len(form.CommitMessage) > 0 { |
|
message += "\n\n" + form.CommitMessage |
|
} |
|
|
|
if _, err := files.ApplyDiffPatch(ctx, ctx.Repo.Repository, ctx.Doer, &files.ApplyDiffPatchOptions{ |
|
LastCommitID: form.LastCommit, |
|
OldBranch: ctx.Repo.BranchName, |
|
NewBranch: branchName, |
|
Message: message, |
|
Content: strings.ReplaceAll(form.Content, "\r", ""), |
|
}); err != nil { |
|
if models.IsErrBranchAlreadyExists(err) { |
|
// User has specified a branch that already exists |
|
branchErr := err.(models.ErrBranchAlreadyExists) |
|
ctx.Data["Err_NewBranchName"] = true |
|
ctx.RenderWithErr(ctx.Tr("repo.editor.branch_already_exists", branchErr.BranchName), tplEditFile, &form) |
|
return |
|
} else if models.IsErrCommitIDDoesNotMatch(err) { |
|
ctx.RenderWithErr(ctx.Tr("repo.editor.file_changed_while_editing", ctx.Repo.RepoLink+"/compare/"+form.LastCommit+"..."+ctx.Repo.CommitID), tplPatchFile, &form) |
|
return |
|
} else { |
|
ctx.RenderWithErr(ctx.Tr("repo.editor.fail_to_apply_patch", err), tplPatchFile, &form) |
|
return |
|
} |
|
} |
|
|
|
if form.CommitChoice == frmCommitChoiceNewBranch && ctx.Repo.Repository.UnitEnabled(unit.TypePullRequests) { |
|
ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + util.PathEscapeSegments(ctx.Repo.BranchName) + "..." + util.PathEscapeSegments(form.NewBranchName)) |
|
} else { |
|
ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(branchName) + "/" + util.PathEscapeSegments(form.TreePath)) |
|
} |
|
}
|
|
|