Change request revision rounds

custom/options/locale/locale_en-US.ini

@@ -1120,8 +1120,10 @@ editor.change_request_description_label = Add a description
 editor.change_request_description_placeholder = Explain what you changed and why
 editor.change_request_title_required = Please enter a title for your change request
 editor.content_required = Content is required
+editor.commit_message_required = Commit message is required
 editor.cannot_submit_change_request_to_own_repo = You cannot submit a change request to your own repository. Use direct edit instead.
 editor.cannot_create_branch = Failed to submit your changes.
+editor.file_not_found = The article file could not be found.
 editor.no_change_request_permission = You do not have permission to submit change requests to this repository.
 editor.editing_unavailable = Editing is currently unavailable.
 editor.sign_in_to_edit = Sign in to Edit
@@ -1409,7 +1411,7 @@ editor.new_file = New File
 editor.create_article = Create Article
 editor.article_creation = Article creation
 editor.upload_file = Upload File
-editor.edit_file = Edit File
+editor.edit_file = Edit
 editor.preview_changes = Preview Changes
 editor.cannot_edit_lfs_files = LFS files cannot be edited in the web interface.
 editor.cannot_edit_too_large_file = The file is too large to be edited.
@@ -1431,6 +1433,7 @@ editor.commit_changes = Commit Changes
 editor.add_tmpl = Add '{filename}'
 editor.add = Add %s
 editor.update = Update %s
+editor.update_article = Update article
 editor.delete = Delete %s
 editor.patch = Apply Patch
 editor.patching = Patching:
@@ -1829,8 +1832,8 @@ issues.due_date = Due Date
 issues.invalid_due_date_format = "Due date format must be 'yyyy-mm-dd'."
 issues.error_modifying_due_date = "Failed to modify the due date."
 issues.error_removing_due_date = "Failed to remove the due date."
-issues.push_commit_1 = "added %d commit %s"
-issues.push_commits_n = "added %d commits %s"
+issues.push_commit_1 = "added %d change %s"
+issues.push_commits_n = "added %d changes %s"
 issues.force_push_codes = `force-pushed %[1]s from <a class="ui sha" href="%[3]s"><code>%[2]s</code></a> to <a class="ui sha" href="%[5]s"><code>%[4]s</code></a> %[6]s`
 issues.force_push_compare = Compare
 issues.due_date_form = "yyyy-mm-dd"
@@ -1928,6 +1931,8 @@ pulls.new = New Change Request
 pulls.new.blocked_user = Cannot create change request because you are blocked by the repository owner.
 pulls.new.must_collaborator = You must be a collaborator to create change request.
 pulls.edit.already_changed = Unable to save changes to the change request. It appears the content has already been changed by another user. Please refresh the page and try editing again to avoid overwriting their changes.
+pulls.edit.ref_update_failed = Your changes were saved, but the change request display could not be updated. Reload the page to see the latest diff and commit count.
+pulls.edit.reviews_stale_failed = Your changes were saved, but the existing reviews could not be marked as stale. They may not visually update until the next review activity.
 pulls.view = View Change Request
 pulls.compare_changes = New Change Request
 pulls.allow_edits_from_maintainers = Allow edits from maintainers

custom/templates/repo/pulls/edit.tmpl

@@ -0,0 +1,50 @@
+{{template "base/head" .}}
+<div role="main" aria-label="{{.Title}}" class="page-content repository view issue pull">
+	{{template "repo/header" .}}
+	<div class="ui container">
+		{{template "repo/issue/view_title" .}}
+		{{template "repo/pulls/tab_menu" .}}
+		<div class="ui bottom attached">
+			<form class="ui edit form" id="article-edit-form" method="post" action="{{.Issue.Link}}/edit">
+				{{.CsrfTokenHtml}}
+				<input type="hidden" name="last_commit" value="{{.LastCommitID}}">
+				<input type="hidden" name="tree_path" value="{{.ReadmeTreePath}}">
+				<input type="hidden" name="commit_choice" value="direct">
+
+				<div class="field">
+					<div class="tw-p-0">
+						<textarea id="edit_area" name="content" class="tw-hidden" data-id="repo-{{.Repository.Name}}-{{.ReadmeTreePath}}">{{.FileContent}}</textarea>
+						<div class="editor-loading is-loading"></div>
+						<div id="toast-editor-container" style="min-height: 500px;"></div>
+					</div>
+				</div>
+
+				{{/* Commit form */}}
+				<div class="tw-mt-4 tw-p-4" style="border-top: 1px solid var(--color-secondary);">
+					<div class="ui form">
+						<div class="field">
+							<label for="commit_summary">{{ctx.Locale.Tr "repo.diff.review.add_title"}}</label>
+							<input type="text" id="commit_summary" name="commit_summary" maxlength="100">
+						</div>
+						<div class="field">
+							<label for="review_comment">{{ctx.Locale.Tr "repo.diff.review.summary"}}</label>
+							<textarea id="review_comment" name="review_comment" rows="4" placeholder="{{ctx.Locale.Tr "repo.diff.review.placeholder"}}"></textarea>
+						</div>
+						<div class="tw-mt-4 tw-flex tw-justify-end tw-gap-2">
+							<a class="ui button" href="{{.Issue.Link}}">
+								{{svg "octicon-x" 16 "tw-mr-1"}}
+								{{ctx.Locale.Tr "cancel"}}
+							</a>
+							<button type="button" class="ui primary button" id="submit-changes-button">
+								{{svg "octicon-check" 16 "tw-mr-1"}}
+								{{ctx.Locale.Tr "repo.editor.submit_changes"}}
+							</button>
+						</div>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}
+

custom/templates/repo/pulls/tab_menu.tmpl

@@ -5,11 +5,18 @@
 			{{template "shared/misc/tabtitle" (ctx.Locale.Tr "repo.pulls.tab_conversation")}}
 			<span class="ui small label">{{.Issue.NumComments}}</span>
 		</a>
+		{{if and .IsIssuePoster (not .Issue.IsClosed) (not .Issue.PullRequest.HasMerged) .HasChangesRequested}}
+		<a class="item {{if .PageIsPullEdit}}active{{end}}" href="{{.Issue.Link}}/edit">
+			{{svg "octicon-pencil"}}
+			{{template "shared/misc/tabtitle" (ctx.Locale.Tr "repo.editor.edit_file")}}
+		</a>
+		{{end}}
 		<a class="item {{if .PageIsPullFiles}}active{{end}}" href="{{.Issue.Link}}/files">
 			{{svg "octicon-diff"}}
 			{{template "shared/misc/tabtitle" (ctx.Locale.Tr "repo.pulls.tab_files")}}
-			<span class="ui small label pill-label">{{if .NumFiles}}{{.NumFiles}}{{else}}-{{end}}</span>
+			<span class="ui small label pill-label">{{.NumCommits}}</span>
 		</a>
 	</div>
 	<div class="ui tabs divider"></div>
 </div>
+

options/locale/locale_en-US.ini

@@ -1364,6 +1364,7 @@ editor.commit_changes = Commit Changes
 editor.add_tmpl = Add '{filename}'
 editor.add = Add %s
 editor.update = Update %s
+editor.update_article = Update article
 editor.delete = Delete %s
 editor.patch = Apply Patch
 editor.patching = Patching:

routers/web/repo/editor.go

@@ -608,6 +608,8 @@ func handleForkAndEdit(ctx *context.Context) *repo_model.Repository {
 
 // cleanupOrphanedBranch attempts to delete a branch that was created but is no longer needed
 // (e.g., when PR creation fails after the branch was already created).
+// It performs both a soft-delete (via DeleteBranch) and a hard-delete of the DB
+// record, since the branch was never meant to exist and should leave no trace.
 // It logs any errors but does not propagate them to the caller.
 func cleanupOrphanedBranch(ctx *context.Context, repo *repo_model.Repository, gitRepo *git.Repository, branchName string) {
 	if gitRepo == nil {
@@ -622,6 +624,19 @@ func cleanupOrphanedBranch(ctx *context.Context, repo *repo_model.Repository, gi
 		SkipPermissionCheck: true,
 	}); err != nil {
 		log.Error("cleanupOrphanedBranch: failed to cleanup branch %s: %v", branchName, err)
+		return
+	}
+
+	// Hard-delete the soft-deleted DB record so the orphaned branch leaves no
+	// trace. DeleteBranch only marks the record as deleted (is_deleted=true);
+	// without this step the branch would still appear in unfiltered queries.
+	branch, err := git_model.GetBranch(ctx, repo.ID, branchName)
+	if err != nil {
+		log.Error("cleanupOrphanedBranch: failed to get branch record for %s: %v", branchName, err)
+		return
+	}
+	if err := git_model.RemoveDeletedBranchByID(ctx, repo.ID, branch.ID); err != nil {
+		log.Error("cleanupOrphanedBranch: failed to hard-delete branch record for %s: %v", branchName, err)
 	}
 }
 
@@ -687,7 +702,12 @@ func handleSubmitChangeRequest(ctx *context.Context, form *forms.EditRepoFileFor
 	// The ChangeRepoFiles function will create the new branch from the default branch
 	// We use InternalPush to skip pre-receive hooks since this is a programmatic operation
 	// where we've already verified the user can submit change requests (via middleware)
-	defaultCommitMessage := ctx.Locale.TrString("repo.editor.update", form.TreePath)
+	defaultCommitMessage := ctx.Locale.TrString("repo.editor.update_article")
+	commitMessage := parsed.GetCommitMessage(defaultCommitMessage)
+	if strings.TrimSpace(commitMessage) == "" {
+		ctx.JSONError(ctx.Tr("repo.editor.commit_message_required"))
+		return nil
+	}
 	_, err = files_service.ChangeRepoFiles(ctx, targetRepo, ctx.Doer, &files_service.ChangeRepoFilesOptions{
 		// Use an empty LastCommitID so ChangeRepoFiles bases the new commit on the current
 		// HEAD of OldBranch. In this workflow we always create a new branch (NewBranch != OldBranch),
@@ -697,7 +717,7 @@ func handleSubmitChangeRequest(ctx *context.Context, form *forms.EditRepoFileFor
 		LastCommitID: "",
 		OldBranch:    targetRepo.DefaultBranch,
 		NewBranch:    branchName,
-		Message:      parsed.GetCommitMessage(defaultCommitMessage),
+		Message:      commitMessage,
 		Files: []*files_service.ChangeRepoFile{
 			{
 				Operation:     "update",
@@ -727,6 +747,26 @@ func handleSubmitChangeRequest(ctx *context.Context, form *forms.EditRepoFileFor
 	}
 	defer gitRepo.Close()
 
+	// Sync the newly created branch to the database. The InternalPush above
+	// bypasses post-receive hooks, so the branch exists only in git at this
+	// point. Without this sync, any subsequent operation that checks branch
+	// existence via the DB (e.g. ChangeRepoFiles from the API) would fail
+	// with "branch does not exist".
+	newCommitID, err := gitRepo.GetBranchCommitID(branchName)
+	if err != nil {
+		log.Error("handleSubmitChangeRequest: failed to get branch commit ID: %v", err)
+		cleanupOrphanedBranch(ctx, targetRepo, gitRepo, branchName)
+		ctx.ServerError("GetBranchCommitID", err)
+		return nil
+	}
+	if err := repo_service.SyncBranchesToDB(ctx, targetRepo.ID, ctx.Doer.ID,
+		[]string{branchName}, []string{newCommitID}, gitRepo.GetCommit); err != nil {
+		log.Error("handleSubmitChangeRequest: failed to sync branch to DB: %v", err)
+		cleanupOrphanedBranch(ctx, targetRepo, gitRepo, branchName)
+		ctx.ServerError("SyncBranchesToDB", err)
+		return nil
+	}
+
 	// Same-repo CR: both head and base are in the target repository
 	compareInfo, err := pull_service.GetCompareInfo(ctx, targetRepo, targetRepo, gitRepo,
 		git.BranchPrefix+targetRepo.DefaultBranch, git.BranchPrefix+branchName, false, false)

routers/web/repo/issue_view.go

@@ -417,6 +417,12 @@ func ViewIssue(ctx *context.Context) {
 	ctx.Data["LockReasons"] = setting.Repository.Issue.LockReasons
 	ctx.Data["RefEndName"] = git.RefName(issue.Ref).ShortName()
 
+	// Set HasChangesRequested for the Edit tab in the PR tab menu.
+	preparePullEditTabVisibility(ctx, issue)
+	if ctx.Written() {
+		return
+	}
+
 	tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
 	if err != nil {
 		ctx.ServerError("GetTagNamesByRepoID", err)