mirror of
https://github.com/go-gitea/gitea.git
synced 2025-06-25 17:03:57 +02:00
When viewing a file that the user can't edit because they can't write to the branch, the new, upload, patch, edit and delete functionality is no longer disabled. If no user fork of the repository exists, there is now a page to create one. It will automatically create a fork with a single branch matching the one being viewed, and a unique repository name will be automatically picked. When a fork exists, but it's archived, a mirror or the user can't write code to it, there will instead be a message explaining the situation. If the usable fork exists, a message will appear at the top of the edit page explaining that the changes will be applied to a branch in the fork. The base repository branch will be pushed to a new branch to the fork, and then the edits will be applied on top. The suggestion to fork happens when accessing /_edit/, so that for example online documentation can have an "edit this page" link to the base repository that does the right thing. Also includes changes to properly report errors when trying to commit to a new branch that is protected, and when trying to commit to an existing branch when choosing the new branch option. Resolves #9017, #20882 --------- Co-authored-by: Brecht Van Lommel <brecht@blender.org> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
111 lines
4.0 KiB
Go
111 lines
4.0 KiB
Go
// Copyright 2025 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package repo
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"path"
|
|
"strings"
|
|
|
|
git_model "code.gitea.io/gitea/models/git"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/json"
|
|
"code.gitea.io/gitea/modules/log"
|
|
repo_module "code.gitea.io/gitea/modules/repository"
|
|
context_service "code.gitea.io/gitea/services/context"
|
|
)
|
|
|
|
// getUniquePatchBranchName Gets a unique branch name for a new patch branch
|
|
// It will be in the form of <username>-patch-<num> where <num> is the first branch of this format
|
|
// that doesn't already exist. If we exceed 1000 tries or an error is thrown, we just return "" so the user has to
|
|
// type in the branch name themselves (will be an empty field)
|
|
func getUniquePatchBranchName(ctx context.Context, prefixName string, repo *repo_model.Repository) string {
|
|
prefix := prefixName + "-patch-"
|
|
for i := 1; i <= 1000; i++ {
|
|
branchName := fmt.Sprintf("%s%d", prefix, i)
|
|
if exist, err := git_model.IsBranchExist(ctx, repo.ID, branchName); err != nil {
|
|
log.Error("getUniquePatchBranchName: %v", err)
|
|
return ""
|
|
} else if !exist {
|
|
return branchName
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// getClosestParentWithFiles Recursively gets the closest path of parent in a tree that has files when a file in a tree is
|
|
// deleted. It returns "" for the tree root if no parents other than the root have files.
|
|
func getClosestParentWithFiles(gitRepo *git.Repository, branchName, originTreePath string) string {
|
|
var f func(treePath string, commit *git.Commit) string
|
|
f = func(treePath string, commit *git.Commit) string {
|
|
if treePath == "" || treePath == "." {
|
|
return ""
|
|
}
|
|
// see if the tree has entries
|
|
if tree, err := commit.SubTree(treePath); err != nil {
|
|
return f(path.Dir(treePath), commit) // failed to get the tree, going up a dir
|
|
} else if entries, err := tree.ListEntries(); err != nil || len(entries) == 0 {
|
|
return f(path.Dir(treePath), commit) // no files in this dir, going up a dir
|
|
}
|
|
return treePath
|
|
}
|
|
commit, err := gitRepo.GetBranchCommit(branchName) // must get the commit again to get the latest change
|
|
if err != nil {
|
|
log.Error("GetBranchCommit: %v", err)
|
|
return ""
|
|
}
|
|
return f(originTreePath, commit)
|
|
}
|
|
|
|
// getContextRepoEditorConfig returns the editorconfig JSON string for given treePath or "null"
|
|
func getContextRepoEditorConfig(ctx *context_service.Context, treePath string) string {
|
|
ec, _, err := ctx.Repo.GetEditorconfig()
|
|
if err == nil {
|
|
def, err := ec.GetDefinitionForFilename(treePath)
|
|
if err == nil {
|
|
jsonStr, _ := json.Marshal(def)
|
|
return string(jsonStr)
|
|
}
|
|
}
|
|
return "null"
|
|
}
|
|
|
|
// getParentTreeFields returns list of parent tree names and corresponding tree paths based on given treePath.
|
|
// eg: []{"a", "b", "c"}, []{"a", "a/b", "a/b/c"}
|
|
// or: []{""}, []{""} for the root treePath
|
|
func getParentTreeFields(treePath string) (treeNames, treePaths []string) {
|
|
treeNames = strings.Split(treePath, "/")
|
|
treePaths = make([]string, len(treeNames))
|
|
for i := range treeNames {
|
|
treePaths[i] = strings.Join(treeNames[:i+1], "/")
|
|
}
|
|
return treeNames, treePaths
|
|
}
|
|
|
|
// getUniqueRepositoryName Gets a unique repository name for a user
|
|
// It will append a -<num> postfix if the name is already taken
|
|
func getUniqueRepositoryName(ctx context.Context, ownerID int64, name string) string {
|
|
uniqueName := name
|
|
for i := 1; i < 1000; i++ {
|
|
_, err := repo_model.GetRepositoryByName(ctx, ownerID, uniqueName)
|
|
if err != nil || repo_model.IsErrRepoNotExist(err) {
|
|
return uniqueName
|
|
}
|
|
uniqueName = fmt.Sprintf("%s-%d", name, i)
|
|
i++
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func editorPushBranchToForkedRepository(ctx context.Context, doer *user_model.User, baseRepo *repo_model.Repository, baseBranchName string, targetRepo *repo_model.Repository, targetBranchName string) error {
|
|
return git.Push(ctx, baseRepo.RepoPath(), git.PushOptions{
|
|
Remote: targetRepo.RepoPath(),
|
|
Branch: baseBranchName + ":" + targetBranchName,
|
|
Env: repo_module.PushingEnvironment(doer, targetRepo),
|
|
})
|
|
}
|