mirror
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fine tune target branch check

This commit is contained in:
wxiaoguang 2025-06-22 13:48:40 +08:00
parent eead5c0871
commit 596f06ec15
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
routers/web/repo/editor.go
View File

@ -130,7 +130,9 @@ func prepareEditorCommitSubmittedForm[T forms.CommitCommonFormInterface](ctx *co
} }
// check commit behavior // check commit behavior
targetBranchName := util.Iif(commonForm.CommitChoice == editorCommitChoiceNewBranch, commonForm.NewBranchName, ctx.Repo.BranchName) fromBaseBranch := ctx.FormString("from_base_branch")
commitToNewBranch := commonForm.CommitChoice == editorCommitChoiceNewBranch || fromBaseBranch != ""
targetBranchName := util.Iif(commitToNewBranch, commonForm.NewBranchName, ctx.Repo.BranchName)
if targetBranchName == ctx.Repo.BranchName && !commitFormOptions.CanCommitToBranch { if targetBranchName == ctx.Repo.BranchName && !commitFormOptions.CanCommitToBranch {
ctx.JSONError(ctx.Tr("repo.editor.cannot_commit_to_protected_branch", targetBranchName)) ctx.JSONError(ctx.Tr("repo.editor.cannot_commit_to_protected_branch", targetBranchName))
return nil return nil
@ -143,19 +145,24 @@ func prepareEditorCommitSubmittedForm[T forms.CommitCommonFormInterface](ctx *co
return nil return nil
} }
oldBranchName := ctx.Repo.BranchName if commitToNewBranch {
fromBaseBranch := ctx.FormString("from_base_branch") // if target branch exists, we should stop
if fromBaseBranch != "" {
// if target branch exists, we should warn users
targetBranchExists, err := git_model.IsBranchExist(ctx, commitFormOptions.TargetRepo.ID, targetBranchName) targetBranchExists, err := git_model.IsBranchExist(ctx, commitFormOptions.TargetRepo.ID, targetBranchName)
if err != nil { if err != nil {
ctx.ServerError("IsBranchExist", err) ctx.ServerError("IsBranchExist", err)
return nil return nil
} } else if targetBranchExists {
if targetBranchExists { if fromBaseBranch != "" {
ctx.JSONError(ctx.Tr("repo.editor.fork_branch_exists", targetBranchName)) ctx.JSONError(ctx.Tr("repo.editor.fork_branch_exists", targetBranchName))
} else {
ctx.JSONError(ctx.Tr("repo.editor.branch_already_exists", targetBranchName))
}
return nil return nil
} }
}
oldBranchName := ctx.Repo.BranchName
if fromBaseBranch != "" {
err = editorPushBranchToForkedRepository(ctx, ctx.Doer, ctx.Repo.Repository.BaseRepo, fromBaseBranch, commitFormOptions.TargetRepo, targetBranchName) err = editorPushBranchToForkedRepository(ctx, ctx.Doer, ctx.Repo.Repository.BaseRepo, fromBaseBranch, commitFormOptions.TargetRepo, targetBranchName)
if err != nil { if err != nil {
log.Error("Unable to editorPushBranchToForkedRepository: %v", err) log.Error("Unable to editorPushBranchToForkedRepository: %v", err)

23
tests/integration/editor_test.go
View File

@ -65,8 +65,8 @@ func testEditorCreateFile(t *testing.T) {
testEditorActionPostRequestError(t, session, "/user2/repo1/_new/master/", map[string]string{ testEditorActionPostRequestError(t, session, "/user2/repo1/_new/master/", map[string]string{
"tree_path": "test.txt", "tree_path": "test.txt",
"commit_choice": "commit-to-new-branch", "commit_choice": "commit-to-new-branch",
"new_branch_name": "branch2", "new_branch_name": "master",
}, `Branch "branch2" already exists in this repository.`) }, `Branch "master" already exists in this repository.`)
} }
func testCreateFile(t *testing.T, session *TestSession, user, repo, branch, filePath, content string) { func testCreateFile(t *testing.T, session *TestSession, user, repo, branch, filePath, content string) {
@ -153,24 +153,27 @@ func testEditorDiffPreview(t *testing.T) {
func testEditorPatchFile(t *testing.T) { func testEditorPatchFile(t *testing.T) {
session := loginUser(t, "user2") session := loginUser(t, "user2")
pathContent := `diff --git a/patch-file-1.txt b/patch-file-1.txt pathContentCommon := `diff --git a/patch-file-1.txt b/patch-file-1.txt
new file mode 100644 new file mode 100644
index 0000000000..aaaaaaaaaa index 0000000000..aaaaaaaaaa
--- /dev/null --- /dev/null
+++ b/patch-file-1.txt +++ b/patch-file-1.txt
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+patched content +`
` testEditorActionPostRequest(t, session, "/user2/repo1/_diffpatch/master/", map[string]string{
patchForm := map[string]string{ "content": pathContentCommon + "patched content\n",
"content": pathContent,
"commit_choice": "commit-to-new-branch", "commit_choice": "commit-to-new-branch",
"new_branch_name": "patched-branch", "new_branch_name": "patched-branch",
} })
testEditorActionPostRequest(t, session, "/user2/repo1/_diffpatch/master/", patchForm)
resp := MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/raw/branch/patched-branch/patch-file-1.txt"), http.StatusOK) resp := MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/raw/branch/patched-branch/patch-file-1.txt"), http.StatusOK)
assert.Equal(t, "patched content\n", resp.Body.String()) assert.Equal(t, "patched content\n", resp.Body.String())
resp = testEditorActionPostRequest(t, session, "/user2/repo1/_diffpatch/master/", patchForm) // patch again, it should fail
resp = testEditorActionPostRequest(t, session, "/user2/repo1/_diffpatch/patched-branch/", map[string]string{
"content": pathContentCommon + "another patched content\n",
"commit_choice": "commit-to-new-branch",
"new_branch_name": "patched-branch-1",
})
assert.Equal(t, "Unable to apply patch", test.ParseJSONError(resp.Body.Bytes()).ErrorMessage) assert.Equal(t, "Unable to apply patch", test.ParseJSONError(resp.Body.Bytes()).ErrorMessage)
} }