mirror of
https://github.com/go-gitea/gitea.git
synced 2026-08-05 05:30:12 +00:00
wxiaoguang
9dc04289aa
before: gitrepo vs git packages after: git package fully handle all git operations by the way, use `WithRepo(repo)` instead of `WithDir(repo.Path)` to hide path details. benefits: 1. remove all unnecessary wrappers, developers no need to struggle with "which package should be used" 2. simplify code, RepositoryFacade can (will) be used everywhere, all "path" details are (will be) hidden
84 lines
2.5 KiB
Go
84 lines
2.5 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package repo
|
|
|
|
import (
|
|
"bytes"
|
|
"net/http"
|
|
|
|
"gitea.dev/modules/git"
|
|
"gitea.dev/modules/util"
|
|
"gitea.dev/services/context"
|
|
"gitea.dev/services/forms"
|
|
"gitea.dev/services/repository/files"
|
|
)
|
|
|
|
func CherryPick(ctx *context.Context) {
|
|
prepareEditorPage(ctx, "_cherrypick")
|
|
if ctx.Written() {
|
|
return
|
|
}
|
|
|
|
fromCommitID := ctx.PathParam("sha")
|
|
ctx.Data["FromCommitID"] = fromCommitID
|
|
cherryPickCommit, err := ctx.Repo.GitRepo.GetCommit(ctx, fromCommitID)
|
|
if err != nil {
|
|
HandleGitError(ctx, "GetCommit", err)
|
|
return
|
|
}
|
|
|
|
if ctx.FormString("cherry-pick-type") == "revert" {
|
|
ctx.Data["CherryPickType"] = "revert"
|
|
ctx.Data["commit_summary"] = "revert " + ctx.PathParam("sha")
|
|
ctx.Data["commit_message"] = "revert " + cherryPickCommit.MessageUTF8()
|
|
} else {
|
|
ctx.Data["CherryPickType"] = "cherry-pick"
|
|
ctx.Data["commit_summary"], ctx.Data["commit_message"] = cherryPickCommit.MessageTitle(), cherryPickCommit.MessageBody()
|
|
}
|
|
|
|
ctx.HTML(http.StatusOK, tplCherryPick)
|
|
}
|
|
|
|
func CherryPickPost(ctx *context.Context) {
|
|
fromCommitID := ctx.PathParam("sha")
|
|
parsed := prepareEditorCommitSubmittedForm[*forms.CherryPickForm](ctx)
|
|
if ctx.Written() {
|
|
return
|
|
}
|
|
|
|
defaultCommitMessage := util.Iif(parsed.form.Revert, ctx.Locale.TrString("repo.commit.revert-header", fromCommitID), ctx.Locale.TrString("repo.commit.cherry-pick-header", fromCommitID))
|
|
opts := &files.ApplyDiffPatchOptions{
|
|
LastCommitID: parsed.form.LastCommit,
|
|
OldBranch: parsed.OldBranchName,
|
|
NewBranch: parsed.NewBranchName,
|
|
Message: parsed.GetCommitMessage(defaultCommitMessage),
|
|
Author: parsed.GitCommitter,
|
|
Committer: parsed.GitCommitter,
|
|
}
|
|
|
|
// First try the simple plain read-tree -m approach
|
|
opts.Content = fromCommitID
|
|
if _, err := files.CherryPick(ctx, ctx.Repo.Repository, ctx.Doer, parsed.form.Revert, opts); err != nil {
|
|
// Drop through to the "apply" method
|
|
buf := &bytes.Buffer{}
|
|
if parsed.form.Revert {
|
|
err = git.GetReverseRawDiff(ctx, ctx.Repo.Repository, fromCommitID, buf)
|
|
} else {
|
|
err = git.GetRawDiff(ctx, ctx.Repo.GitRepo, fromCommitID, git.RawDiffPatch, buf)
|
|
}
|
|
if err == nil {
|
|
opts.Content = buf.String()
|
|
_, err = files.ApplyDiffPatch(ctx, ctx.Repo.Repository, ctx.Doer, opts)
|
|
if err != nil {
|
|
err = util.ErrorWrapTranslatable(err, "repo.editor.fail_to_apply_patch")
|
|
}
|
|
}
|
|
if err != nil {
|
|
editorHandleFileOperationError(ctx, parsed.NewBranchName, err)
|
|
return
|
|
}
|
|
}
|
|
redirectForCommitChoice(ctx, parsed, parsed.form.TreePath)
|
|
}
|