From 58f643a459422962a5710826bd08c901f0b77058 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Sat, 20 May 2023 16:37:05 +0200
Subject: [PATCH 1/3] Create pull request for base repo after editing file, if
 not enabled for fork

Currently if pull requests are disabled on a fork but enabled on a base repo,
creating/editing/deleting files does not offer the option to create a pull
request. This change enables creating a pull request in that case.
---
 routers/web/repo/editor.go             | 35 +++++++++++++++++++-------
 templates/repo/editor/commit_form.tmpl |  6 ++---
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
index 63387df281e3f..7697245aa49d2 100644
--- a/routers/web/repo/editor.go
+++ b/routers/web/repo/editor.go
@@ -41,16 +41,39 @@ const (
 	frmCommitChoiceNewBranch string = "commit-to-new-branch"
 )
 
+func canCreateBasePullRequest(ctx *context.Context) bool {
+	baseRepo := ctx.Repo.Repository.BaseRepo
+	return baseRepo != nil && baseRepo.UnitEnabled(ctx, unit.TypePullRequests)
+}
+
 func renderCommitRights(ctx *context.Context) bool {
 	canCommitToBranch, err := ctx.Repo.CanCommitToBranch(ctx, ctx.Doer)
 	if err != nil {
 		log.Error("CanCommitToBranch: %v", err)
 	}
 	ctx.Data["CanCommitToBranch"] = canCommitToBranch
+	ctx.Data["CanCreatePullRequest"] = ctx.Repo.Repository.UnitEnabled(ctx, unit.TypePullRequests) || canCreateBasePullRequest(ctx)
 
 	return canCommitToBranch.CanCommitToBranch
 }
 
+// redirect to pull request after commit to branch
+func redirectToPullRequest(ctx *context.Context, newBranchName string) bool {
+	repo := ctx.Repo.Repository
+	baseBranch := util.PathEscapeSegments(ctx.Repo.BranchName)
+	headBranch := util.PathEscapeSegments(newBranchName)
+	if !repo.UnitEnabled(ctx, unit.TypePullRequests) {
+		if !canCreateBasePullRequest(ctx) {
+			return false
+		}
+		baseBranch = util.PathEscapeSegments(repo.BaseRepo.DefaultBranch)
+		headBranch = util.PathEscapeSegments(repo.Owner.Name) + "/" + util.PathEscapeSegments(repo.Name) + ":" + headBranch
+		repo = repo.BaseRepo
+	}
+	ctx.Redirect(repo.Link() + "/compare/" + baseBranch + "..." + headBranch)
+	return true
+}
+
 // getParentTreeFields returns list of parent tree names and corresponding tree paths
 // based on given tree path.
 func getParentTreeFields(treePath string) (treeNames, treePaths []string) {
@@ -331,9 +354,7 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b
 		_ = repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: ctx.Repo.Repository.ID, IsEmpty: false}, "is_empty")
 	}
 
-	if form.CommitChoice == frmCommitChoiceNewBranch && ctx.Repo.Repository.UnitEnabled(ctx, unit.TypePullRequests) {
-		ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + util.PathEscapeSegments(ctx.Repo.BranchName) + "..." + util.PathEscapeSegments(form.NewBranchName))
-	} else {
+	if !(form.CommitChoice == frmCommitChoiceNewBranch && redirectToPullRequest(ctx, branchName)) {
 		ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(branchName) + "/" + util.PathEscapeSegments(form.TreePath))
 	}
 }
@@ -517,9 +538,7 @@ func DeleteFilePost(ctx *context.Context) {
 	}
 
 	ctx.Flash.Success(ctx.Tr("repo.editor.file_delete_success", ctx.Repo.TreePath))
-	if form.CommitChoice == frmCommitChoiceNewBranch && ctx.Repo.Repository.UnitEnabled(ctx, unit.TypePullRequests) {
-		ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + util.PathEscapeSegments(ctx.Repo.BranchName) + "..." + util.PathEscapeSegments(form.NewBranchName))
-	} else {
+	if !(form.CommitChoice == frmCommitChoiceNewBranch && redirectToPullRequest(ctx, branchName)) {
 		treePath := path.Dir(ctx.Repo.TreePath)
 		if treePath == "." {
 			treePath = "" // the file deleted was in the root, so we return the user to the root directory
@@ -722,9 +741,7 @@ func UploadFilePost(ctx *context.Context) {
 		_ = repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: ctx.Repo.Repository.ID, IsEmpty: false}, "is_empty")
 	}
 
-	if form.CommitChoice == frmCommitChoiceNewBranch && ctx.Repo.Repository.UnitEnabled(ctx, unit.TypePullRequests) {
-		ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + util.PathEscapeSegments(ctx.Repo.BranchName) + "..." + util.PathEscapeSegments(form.NewBranchName))
-	} else {
+	if !(form.CommitChoice == frmCommitChoiceNewBranch && redirectToPullRequest(ctx, branchName)) {
 		ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(branchName) + "/" + util.PathEscapeSegments(form.TreePath))
 	}
 }
diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl
index db798d92e885e..6a3f86f9fc979 100644
--- a/templates/repo/editor/commit_form.tmpl
+++ b/templates/repo/editor/commit_form.tmpl
@@ -41,17 +41,15 @@
 			</div>
 			{{if not .Repository.IsEmpty}}
 			<div class="field">
-				{{$pullRequestEnabled := .Repository.UnitEnabled $.Context $.UnitTypePullRequests}}
-				{{$prUnit := .Repository.MustGetUnit $.Context $.UnitTypePullRequests}}
 				<div class="ui radio checkbox">
-					{{if $pullRequestEnabled}}
+					{{if .CanCreatePullRequest}}
 						<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{.locale.Tr "repo.editor.propose_file_change"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
 					{{else}}
 						<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{.locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
 					{{end}}
 					<label>
 						{{svg "octicon-git-pull-request"}}
-						{{if $pullRequestEnabled}}
+						{{if .CanCreatePullRequest}}
 							{{.locale.Tr "repo.editor.create_new_branch" | Safe}}
 						{{else}}
 							{{.locale.Tr "repo.editor.create_new_branch_np" | Safe}}

From de0b026747e17959248f27430d0c66159055143d Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Wed, 24 May 2023 18:47:13 +0200
Subject: [PATCH 2/3] Try to clarify logic

---
 routers/web/repo/editor.go | 75 ++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
index 7697245aa49d2..c9b2309ab5bf8 100644
--- a/routers/web/repo/editor.go
+++ b/routers/web/repo/editor.go
@@ -57,21 +57,31 @@ func renderCommitRights(ctx *context.Context) bool {
 	return canCommitToBranch.CanCommitToBranch
 }
 
-// redirect to pull request after commit to branch
-func redirectToPullRequest(ctx *context.Context, newBranchName string) bool {
-	repo := ctx.Repo.Repository
-	baseBranch := util.PathEscapeSegments(ctx.Repo.BranchName)
-	headBranch := util.PathEscapeSegments(newBranchName)
-	if !repo.UnitEnabled(ctx, unit.TypePullRequests) {
-		if !canCreateBasePullRequest(ctx) {
-			return false
+// redirectForCommitChoice redirects after committing the edit to a branch
+func redirectForCommitChoice(ctx *context.Context, commitChoice, newBranchName, treePath string) {
+	if commitChoice == frmCommitChoiceNewBranch {
+		// Redirect to a pull request when possible
+		redirectToPullRequest := false
+		repo := ctx.Repo.Repository
+		baseBranch := util.PathEscapeSegments(ctx.Repo.BranchName)
+		headBranch := util.PathEscapeSegments(newBranchName)
+		if repo.UnitEnabled(ctx, unit.TypePullRequests) {
+			redirectToPullRequest = true
+		} else if canCreateBasePullRequest(ctx) {
+			redirectToPullRequest = true
+			baseBranch = util.PathEscapeSegments(repo.BaseRepo.DefaultBranch)
+			headBranch = util.PathEscapeSegments(repo.Owner.Name) + "/" + util.PathEscapeSegments(repo.Name) + ":" + headBranch
+			repo = repo.BaseRepo
+		}
+
+		if redirectToPullRequest {
+			ctx.Redirect(repo.Link() + "/compare/" + baseBranch + "..." + headBranch)
+			return
 		}
-		baseBranch = util.PathEscapeSegments(repo.BaseRepo.DefaultBranch)
-		headBranch = util.PathEscapeSegments(repo.Owner.Name) + "/" + util.PathEscapeSegments(repo.Name) + ":" + headBranch
-		repo = repo.BaseRepo
 	}
-	ctx.Redirect(repo.Link() + "/compare/" + baseBranch + "..." + headBranch)
-	return true
+
+	// Redirect to viewing file or folder
+	ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(newBranchName) + "/" + util.PathEscapeSegments(treePath))
 }
 
 // getParentTreeFields returns list of parent tree names and corresponding tree paths
@@ -354,9 +364,7 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b
 		_ = repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: ctx.Repo.Repository.ID, IsEmpty: false}, "is_empty")
 	}
 
-	if !(form.CommitChoice == frmCommitChoiceNewBranch && redirectToPullRequest(ctx, branchName)) {
-		ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(branchName) + "/" + util.PathEscapeSegments(form.TreePath))
-	}
+	redirectForCommitChoice(ctx, form.CommitChoice, branchName, form.TreePath)
 }
 
 // EditFilePost response for editing file
@@ -538,24 +546,23 @@ func DeleteFilePost(ctx *context.Context) {
 	}
 
 	ctx.Flash.Success(ctx.Tr("repo.editor.file_delete_success", ctx.Repo.TreePath))
-	if !(form.CommitChoice == frmCommitChoiceNewBranch && redirectToPullRequest(ctx, branchName)) {
-		treePath := path.Dir(ctx.Repo.TreePath)
-		if treePath == "." {
-			treePath = "" // the file deleted was in the root, so we return the user to the root directory
-		}
-		if len(treePath) > 0 {
-			// Need to get the latest commit since it changed
-			commit, err := ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.BranchName)
-			if err == nil && commit != nil {
-				// We have the comment, now find what directory we can return the user to
-				// (must have entries)
-				treePath = GetClosestParentWithFiles(treePath, commit)
-			} else {
-				treePath = "" // otherwise return them to the root of the repo
-			}
+	treePath := path.Dir(ctx.Repo.TreePath)
+	if treePath == "." {
+		treePath = "" // the file deleted was in the root, so we return the user to the root directory
+	}
+	if len(treePath) > 0 {
+		// Need to get the latest commit since it changed
+		commit, err := ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.BranchName)
+		if err == nil && commit != nil {
+			// We have the comment, now find what directory we can return the user to
+			// (must have entries)
+			treePath = GetClosestParentWithFiles(treePath, commit)
+		} else {
+			treePath = "" // otherwise return them to the root of the repo
 		}
-		ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(branchName) + "/" + util.PathEscapeSegments(treePath))
 	}
+
+	redirectForCommitChoice(ctx, form.CommitChoice, branchName, treePath)
 }
 
 // UploadFile render upload file page
@@ -741,9 +748,7 @@ func UploadFilePost(ctx *context.Context) {
 		_ = repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: ctx.Repo.Repository.ID, IsEmpty: false}, "is_empty")
 	}
 
-	if !(form.CommitChoice == frmCommitChoiceNewBranch && redirectToPullRequest(ctx, branchName)) {
-		ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(branchName) + "/" + util.PathEscapeSegments(form.TreePath))
-	}
+	redirectForCommitChoice(ctx, form.CommitChoice, branchName, form.TreePath)
 }
 
 func cleanUploadFileName(name string) string {

From 55859b976dbc72bc6b1ab0927870ddf08afd48f1 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Wed, 24 May 2023 19:18:48 +0200
Subject: [PATCH 3/3] Update routers/web/repo/editor.go

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
 routers/web/repo/editor.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
index c9b2309ab5bf8..b94aa1b7ba051 100644
--- a/routers/web/repo/editor.go
+++ b/routers/web/repo/editor.go
@@ -63,19 +63,19 @@ func redirectForCommitChoice(ctx *context.Context, commitChoice, newBranchName,
 		// Redirect to a pull request when possible
 		redirectToPullRequest := false
 		repo := ctx.Repo.Repository
-		baseBranch := util.PathEscapeSegments(ctx.Repo.BranchName)
-		headBranch := util.PathEscapeSegments(newBranchName)
+		baseBranch := ctx.Repo.BranchName
+		headBranch := newBranchName
 		if repo.UnitEnabled(ctx, unit.TypePullRequests) {
 			redirectToPullRequest = true
 		} else if canCreateBasePullRequest(ctx) {
 			redirectToPullRequest = true
-			baseBranch = util.PathEscapeSegments(repo.BaseRepo.DefaultBranch)
-			headBranch = util.PathEscapeSegments(repo.Owner.Name) + "/" + util.PathEscapeSegments(repo.Name) + ":" + headBranch
+			baseBranch = repo.BaseRepo.DefaultBranch
+			headBranch = repo.Owner.Name + "/" + repo.Name + ":" + headBranch
 			repo = repo.BaseRepo
 		}
 
 		if redirectToPullRequest {
-			ctx.Redirect(repo.Link() + "/compare/" + baseBranch + "..." + headBranch)
+			ctx.Redirect(repo.Link() + "/compare/" + util.PathEscapeSegments(baseBranch) + "..." + util.PathEscapeSegments(headBranch))
 			return
 		}
 	}