mirror of
https://github.com/go-gitea/gitea.git
synced 2026-08-02 22:39:36 +00:00
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
222 lines
6.0 KiB
Go
222 lines
6.0 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package files
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
git_model "gitea.dev/models/git"
|
|
repo_model "gitea.dev/models/repo"
|
|
user_model "gitea.dev/models/user"
|
|
"gitea.dev/modules/git"
|
|
"gitea.dev/modules/git/gitcmd"
|
|
"gitea.dev/modules/log"
|
|
"gitea.dev/modules/structs"
|
|
"gitea.dev/modules/util"
|
|
asymkey_service "gitea.dev/services/asymkey"
|
|
)
|
|
|
|
// ErrUserCannotCommit represents "UserCannotCommit" kind of error.
|
|
type ErrUserCannotCommit struct {
|
|
UserName string
|
|
}
|
|
|
|
// IsErrUserCannotCommit checks if an error is an ErrUserCannotCommit.
|
|
func IsErrUserCannotCommit(err error) bool {
|
|
_, ok := err.(ErrUserCannotCommit)
|
|
return ok
|
|
}
|
|
|
|
func (err ErrUserCannotCommit) Error() string {
|
|
return fmt.Sprintf("user cannot commit to repo [user: %s]", err.UserName)
|
|
}
|
|
|
|
func (err ErrUserCannotCommit) Unwrap() error {
|
|
return util.ErrPermissionDenied
|
|
}
|
|
|
|
// ApplyDiffPatchOptions holds the repository diff patch update options
|
|
type ApplyDiffPatchOptions struct {
|
|
LastCommitID string
|
|
OldBranch string
|
|
NewBranch string
|
|
Message string
|
|
Content string
|
|
Author *IdentityOptions
|
|
Committer *IdentityOptions
|
|
Dates *CommitDateOptions
|
|
Signoff bool
|
|
}
|
|
|
|
// Validate validates the provided options
|
|
func (opts *ApplyDiffPatchOptions) Validate(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, doer *user_model.User) error {
|
|
// If no branch name is set, assume master
|
|
if opts.OldBranch == "" {
|
|
opts.OldBranch = repo.DefaultBranch
|
|
}
|
|
if opts.NewBranch == "" {
|
|
opts.NewBranch = opts.OldBranch
|
|
}
|
|
|
|
// oldBranch must exist for this operation
|
|
if exist, err := git_model.IsBranchExist(ctx, repo.ID, opts.OldBranch); err != nil {
|
|
return err
|
|
} else if !exist {
|
|
return git_model.ErrBranchNotExist{
|
|
BranchName: opts.OldBranch,
|
|
}
|
|
}
|
|
// A NewBranch can be specified for the patch to be applied to.
|
|
// Check to make sure the branch does not already exist, otherwise we can't proceed.
|
|
// If we aren't branching to a new branch, make sure user can commit to the given branch
|
|
if opts.NewBranch != opts.OldBranch {
|
|
exist, err := git_model.IsBranchExist(ctx, repo.ID, opts.NewBranch)
|
|
if err != nil {
|
|
return err
|
|
} else if exist {
|
|
return git_model.ErrBranchAlreadyExists{
|
|
BranchName: opts.NewBranch,
|
|
}
|
|
}
|
|
} else {
|
|
protectedBranch, err := git_model.GetFirstMatchProtectedBranchRule(ctx, repo.ID, opts.OldBranch)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if protectedBranch != nil {
|
|
protectedBranch.Repo = repo
|
|
if !protectedBranch.CanUserPush(ctx, doer) {
|
|
return ErrUserCannotCommit{
|
|
UserName: doer.LowerName,
|
|
}
|
|
}
|
|
}
|
|
if protectedBranch != nil && protectedBranch.RequireSignedCommits {
|
|
_, _, _, err := asymkey_service.SignCRUDAction(ctx, doer, gitRepo, opts.OldBranch)
|
|
if err != nil {
|
|
if !asymkey_service.IsErrWontSign(err) {
|
|
return err
|
|
}
|
|
return ErrUserCannotCommit{
|
|
UserName: doer.LowerName,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ApplyDiffPatch applies a patch to the given repository
|
|
func ApplyDiffPatch(ctx context.Context, repo *repo_model.Repository, doer *user_model.User, opts *ApplyDiffPatchOptions) (*structs.FileResponse, error) {
|
|
err := repo.MustNotBeArchived()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
gitRepo, closer, err := git.RepositoryFromContextOrOpen(ctx, repo)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer closer.Close()
|
|
|
|
if err := opts.Validate(ctx, repo, gitRepo, doer); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
message := strings.TrimSpace(opts.Message)
|
|
|
|
t, err := NewTemporaryUploadRepository(repo)
|
|
if err != nil {
|
|
log.Error("NewTemporaryUploadRepository failed: %v", err)
|
|
}
|
|
defer t.Close()
|
|
if err := t.Clone(ctx, opts.OldBranch, true); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := t.SetDefaultIndex(ctx); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Get the commit of the original branch
|
|
commit, err := t.GetBranchCommit(ctx, opts.OldBranch)
|
|
if err != nil {
|
|
return nil, err // Couldn't get a commit for the branch
|
|
}
|
|
|
|
// Assigned LastCommitID in opts if it hasn't been set
|
|
if opts.LastCommitID == "" {
|
|
opts.LastCommitID = commit.ID.String()
|
|
} else {
|
|
lastCommitID, err := t.gitRepo.ConvertToGitID(ctx, opts.LastCommitID)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("ApplyPatch: Invalid last commit ID: %w", err)
|
|
}
|
|
opts.LastCommitID = lastCommitID.String()
|
|
if commit.ID.String() != opts.LastCommitID {
|
|
return nil, ErrCommitIDDoesNotMatch{
|
|
GivenCommitID: opts.LastCommitID,
|
|
CurrentCommitID: opts.LastCommitID,
|
|
}
|
|
}
|
|
}
|
|
|
|
cmdApply := gitcmd.NewCommand("apply", "--index", "--recount", "--cached", "--ignore-whitespace", "--whitespace=fix", "--binary")
|
|
if git.DefaultFeatures().CheckVersionAtLeast("2.32") {
|
|
cmdApply.AddArguments("-3")
|
|
}
|
|
|
|
if err := cmdApply.WithDir(t.basePath).
|
|
WithStdinBytes([]byte(opts.Content)).
|
|
RunWithStderr(ctx); err != nil {
|
|
return nil, fmt.Errorf("git apply error: %w", err)
|
|
}
|
|
|
|
// Now write the tree
|
|
treeHash, err := t.WriteTree(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Now commit the tree
|
|
commitOpts := &CommitTreeUserOptions{
|
|
ParentCommitID: "HEAD",
|
|
TreeHash: treeHash,
|
|
CommitMessage: message,
|
|
SignOff: opts.Signoff,
|
|
DoerUser: doer,
|
|
AuthorIdentity: opts.Author,
|
|
AuthorTime: nil,
|
|
CommitterIdentity: opts.Committer,
|
|
CommitterTime: nil,
|
|
}
|
|
if opts.Dates != nil {
|
|
commitOpts.AuthorTime, commitOpts.CommitterTime = &opts.Dates.Author, &opts.Dates.Committer
|
|
}
|
|
commitHash, err := t.CommitTree(ctx, commitOpts)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Then push this tree to NewBranch
|
|
if err := t.Push(ctx, doer, commitHash, opts.NewBranch, false); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
commit, err = t.GetCommit(ctx, commitHash)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
fileCommitResponse, _ := GetFileCommitResponse(ctx, repo, gitRepo, commit) // ok if fails, then will be nil
|
|
verification := GetPayloadCommitVerification(ctx, commit)
|
|
fileResponse := &structs.FileResponse{
|
|
Commit: fileCommitResponse,
|
|
Verification: verification,
|
|
}
|
|
|
|
return fileResponse, nil
|
|
}
|