Add checkoutPullRequestBaseBranch options to postDone setting

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

package.json

@@ -476,13 +476,17 @@
 					"type": "string",
 					"enum": [
 						"checkoutDefaultBranch",
-						"checkoutDefaultBranchAndPull"
+						"checkoutDefaultBranchAndPull",
+						"checkoutPullRequestBaseBranch",
+						"checkoutPullRequestBaseBranchAndPull"
 					],
 					"description": "%githubPullRequests.postDone.description%",
 					"default": "checkoutDefaultBranch",
 					"enumDescriptions": [
 						"%githubPullRequests.postDone.checkoutDefaultBranch%",
-						"%githubPullRequests.postDone.checkoutDefaultBranchAndPull%"
+						"%githubPullRequests.postDone.checkoutDefaultBranchAndPull%",
+						"%githubPullRequests.postDone.checkoutPullRequestBaseBranch%",
+						"%githubPullRequests.postDone.checkoutPullRequestBaseBranchAndPull%"
 					]
 				},
 				"githubPullRequests.defaultCommentType": {

package.nls.json

@@ -81,6 +81,8 @@
 	"githubPullRequests.postDone.description": "The action to take after using the 'checkout default branch' or 'delete branch' actions on a currently checked out pull request.",
 	"githubPullRequests.postDone.checkoutDefaultBranch": "Checkout the default branch of the repository",
 	"githubPullRequests.postDone.checkoutDefaultBranchAndPull": "Checkout the default branch of the repository and pull the latest changes",
+	"githubPullRequests.postDone.checkoutPullRequestBaseBranch": "Checkout the pull request's base branch",
+	"githubPullRequests.postDone.checkoutPullRequestBaseBranchAndPull": "Checkout the pull request's base branch and pull the latest changes",
 	"githubPullRequests.defaultCommentType.description": "The default comment type to use when submitting a comment and there is no active review",
 	"githubPullRequests.defaultCommentType.single": "Submits the comment as a single comment that will be immediately visible to other users",
 	"githubPullRequests.defaultCommentType.review": "Submits the comment as a review comment that will be visible to other users once the review is submitted",

src/commands.ts

@@ -771,7 +771,7 @@ export function registerCommands(
 					const manager = reposManager.getManagerForIssueModel(pullRequestModel);
 					if (manager) {
 						const prBranch = manager.repository.state.HEAD?.name;
-						await manager.checkoutDefaultBranch(branch);
+						await manager.checkoutDefaultBranch(branch, pullRequestModel);
 						if (prBranch) {
 							await manager.cleanupAfterPullRequest(prBranch, pullRequestModel!);
 						}

src/github/folderRepositoryManager.ts

@@ -2383,16 +2383,25 @@ export class FolderRepositoryManager extends Disposable {
 		}
 	}
 
-	public async checkoutDefaultBranch(branch: string): Promise<void> {
+	public async checkoutDefaultBranch(branch: string, pullRequestModel?: PullRequestModel): Promise<void> {
 		const CHECKOUT_DEFAULT_BRANCH = 'checkoutDefaultBranch';
 		const CHECKOUT_DEFAULT_BRANCH_AND_PULL = 'checkoutDefaultBranchAndPull';
+		const CHECKOUT_PR_BASE_BRANCH = 'checkoutPullRequestBaseBranch';
+		const CHECKOUT_PR_BASE_BRANCH_AND_PULL = 'checkoutPullRequestBaseBranchAndPull';
 
-		const postDoneAction = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<typeof CHECKOUT_DEFAULT_BRANCH | typeof CHECKOUT_DEFAULT_BRANCH_AND_PULL>(POST_DONE, CHECKOUT_DEFAULT_BRANCH);
+		const postDoneAction = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<typeof CHECKOUT_DEFAULT_BRANCH | typeof CHECKOUT_DEFAULT_BRANCH_AND_PULL | typeof CHECKOUT_PR_BASE_BRANCH | typeof CHECKOUT_PR_BASE_BRANCH_AND_PULL>(POST_DONE, CHECKOUT_DEFAULT_BRANCH);
 
-		if (postDoneAction === CHECKOUT_DEFAULT_BRANCH_AND_PULL) {
-			await this.checkoutDefaultBranchAndPull(branch);
+		// Determine which branch to checkout
+		let targetBranch = branch;
+		if (pullRequestModel && (postDoneAction === CHECKOUT_PR_BASE_BRANCH || postDoneAction === CHECKOUT_PR_BASE_BRANCH_AND_PULL)) {
+			// Use the PR's base branch if the setting specifies it
+			targetBranch = pullRequestModel.base.ref;
+		}
+
+		if (postDoneAction === CHECKOUT_DEFAULT_BRANCH_AND_PULL || postDoneAction === CHECKOUT_PR_BASE_BRANCH_AND_PULL) {
+			await this.checkoutDefaultBranchAndPull(targetBranch);
 		} else {
-			await this.checkoutDefaultBranchOnly(branch);
+			await this.checkoutDefaultBranchOnly(targetBranch);
 		}
 	}
 

src/github/pullRequestReviewCommon.ts

@@ -145,7 +145,7 @@ export namespace PullRequestReviewCommon {
 	export async function checkoutDefaultBranch(ctx: ReviewContext, message: IRequestMessage<string>): Promise<void> {
 		try {
 			const prBranch = ctx.folderRepositoryManager.repository.state.HEAD?.name;
-			await ctx.folderRepositoryManager.checkoutDefaultBranch(message.args);
+			await ctx.folderRepositoryManager.checkoutDefaultBranch(message.args, ctx.item);
 			if (prBranch) {
 				await ctx.folderRepositoryManager.cleanupAfterPullRequest(prBranch, ctx.item);
 			}
@@ -372,7 +372,7 @@ export namespace PullRequestReviewCommon {
 									return;
 								}
 							}
-							await folderRepositoryManager.checkoutDefaultBranch(defaultBranch);
+							await folderRepositoryManager.checkoutDefaultBranch(defaultBranch, item);
 						}
 						await folderRepositoryManager.repository.deleteBranch(branchInfo!.branch, true);
 						return deletedBranchTypes.push(action.type);