Put an edit file button on pull request files to allow a quick operation

routers/web/repo/editor.go

@@ -8,7 +8,9 @@ import (
 	"io"
 	"net/http"
 	"path"
+	"regexp"
 	"strings"
+	"time"
 
 	"code.gitea.io/gitea/models"
 	git_model "code.gitea.io/gitea/models/git"
@@ -80,6 +82,21 @@ func redirectForCommitChoice(ctx *context.Context, commitChoice, newBranchName,
 		}
 	}
 
+	prIndex := ctx.FormInt64("back_to_pr")
+	if prIndex > 0 {
+		// Redirect to the PR's files tab
+		link := ctx.Repo.RepoLink + fmt.Sprintf("/pulls/%d/files?refresh=%d", prIndex, time.Now().Unix())
+		diffHash := ctx.FormString("back_to_diff_hash")
+		r := regexp.MustCompile(`^[0-9a-f]{40}$`)
+		if len(diffHash) == 40 && r.MatchString(diffHash) {
+			link += "#diff-" + diffHash
+		}
+		// FIXME: Because PushToBaseRepo is async, we need to wait a bit before redirecting
+		time.Sleep(2 * time.Second)
+		ctx.Redirect(link, 302)
+		return
+	}
+
 	// Redirect to viewing file or folder
 	ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(newBranchName) + "/" + util.PathEscapeSegments(treePath))
 }
@@ -190,6 +207,9 @@ func editFile(ctx *context.Context, isNewFile bool) {
 	ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",")
 	ctx.Data["EditorconfigJson"] = GetEditorConfig(ctx, treePath)
 
+	ctx.Data["CanCreateNewBranch"] = !ctx.FormBool("hide_create_new_branch")
+	ctx.Data["CanCreatePullRequest"] = !ctx.FormBool("hide_create_pr")
+
 	ctx.HTML(http.StatusOK, tplEditFile)
 }
 

routers/web/repo/pull.go

@@ -1071,6 +1071,25 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 	ctx.Data["CanBlockUser"] = func(blocker, blockee *user_model.User) bool {
 		return user_service.CanBlockUser(ctx, ctx.Doer, blocker, blockee)
 	}
+	if !willShowSpecifiedCommit && !willShowSpecifiedCommitRange {
+		ctx.Data["SourcePath"] = pull.HeadRepo.Link() + "/src/branch/" + url.PathEscape(pull.HeadBranch)
+
+		if !pull.HasMerged && ctx.Doer != nil {
+			if err := pull.LoadHeadRepo(ctx); err != nil {
+				ctx.ServerError("LoadHeadRepo", err)
+				return
+			}
+			perm, err := access_model.GetUserRepoPermission(ctx, pull.HeadRepo, ctx.Doer)
+			if err != nil {
+				ctx.ServerError("GetUserRepoPermission", err)
+				return
+			}
+			ctx.Data["CanEditFile"] = perm.CanWrite(unit.TypeCode) || issues_model.CanMaintainerWriteToBranch(ctx, perm, pull.HeadBranch, ctx.Doer)
+			ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.edit_this_file")
+			ctx.Data["HeadRepoLink"] = pull.HeadRepo.Link()
+			ctx.Data["HeadBranchName"] = pull.HeadBranch
+		}
+	}
 
 	ctx.HTML(http.StatusOK, tplPullFiles)
 }

templates/repo/diff/box.tmpl

@@ -165,6 +165,9 @@
 									{{if $file.IsDeleted}}
 										<a class="ui basic tiny button" rel="nofollow" href="{{$.BeforeSourcePath}}/{{PathEscapeSegments .Name}}">{{ctx.Locale.Tr "repo.diff.view_file"}}</a>
 									{{else}}
+										{{if and $.Repository.CanEnableEditor $.CanEditFile (not $file.IsLFSFile)}}
+											<a class="ui basic tiny button" rel="nofollow" href="{{$.HeadRepoLink}}/_edit/{{PathEscapeSegments $.HeadBranchName}}/{{PathEscapeSegments $file.Name}}?hide_create_pr=true&hide_create_new_branch=true&back_to_pr={{$.Issue.Index}}&back_to_diff_hash={{$file.NameHash}}">{{ctx.Locale.Tr "repo.editor.edit_this_file"}}</a>
+										{{end}}
 										<a class="ui basic tiny button" rel="nofollow" href="{{$.SourcePath}}/{{PathEscapeSegments .Name}}">{{ctx.Locale.Tr "repo.diff.view_file"}}</a>
 									{{end}}
 								{{end}}

templates/repo/editor/commit_form.tmpl

@@ -40,6 +40,7 @@
 				</div>
 			</div>
 			{{if not .Repository.IsEmpty}}
+			{{if .CanCreatePullRequest}}
 			<div class="field">
 				<div class="ui radio checkbox">
 					{{if .CanCreatePullRequest}}
@@ -57,6 +58,8 @@
 					</label>
 				</div>
 			</div>
+			{{end}}
+			{{if .CanCreateNewBranch}}
 			<div class="quick-pull-branch-name {{if not (eq .commit_choice "commit-to-new-branch")}}gt-hidden{{end}}">
 				<div class="new-branch-name-input field {{if .Err_NewBranchName}}error{{end}}">
 					{{svg "octicon-git-branch"}}
@@ -65,6 +68,7 @@
 				</div>
 			</div>
 			{{end}}
+			{{end}}
 		</div>
 	</div>
 	<button id="commit-button" type="submit" class="ui primary button">

tests/integration/git_test.go

@@ -461,6 +461,14 @@ func doMergeFork(ctx, baseCtx APITestContext, baseBranch, headBranch string) fun
 		// Ensure the PR page works
 		t.Run("EnsureCanSeePull", doEnsureCanSeePull(baseCtx, pr))
 
+		t.Run("EnsureCanEditPullFile", func(t *testing.T) {
+			req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/pulls/%d/files", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame), pr.Index))
+			resp := ctx.Session.MakeRequest(t, req, http.StatusOK)
+			doc := NewHTMLParser(t, resp.Body)
+			editButtonCount := doc.doc.Find("div.diff-file-header-actions a[href*='/_edit/']").Length()
+			assert.Greater(t, editButtonCount, 0, "Expected to find a button to edit a file in the PR diff view but there were none")
+		})
+
 		// Then get the diff string
 		var diffHash string
 		var diffLength int