Hard-code recently used branches limit to 10 and allow branches not in list

- Remove recentlyUsedBranchesCount setting as requested
- Hard-code limit to 10 branches instead of using configurable setting
- Allow recently used branches even if they're not in the fetched branch list
  This ensures branches like 'develop' are shown even when timeout cuts off the list

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

Author: Copilot

package.json

@@ -198,13 +198,6 @@
 					"minimum": 1000,
 					"markdownDescription": "%githubPullRequests.branchListTimeout.description%"
 				},
-				"githubPullRequests.recentlyUsedBranchesCount": {
-					"type": "number",
-					"default": 5,
-					"minimum": 0,
-					"maximum": 20,
-					"markdownDescription": "%githubPullRequests.recentlyUsedBranchesCount.description%"
-				},
 				"githubPullRequests.remotes": {
 					"type": "array",
 					"default": [

package.nls.json

@@ -21,7 +21,6 @@
 		]
 	},
 	"githubPullRequests.branchListTimeout.description": "Maximum time in milliseconds to wait when fetching the list of branches for pull request creation. Repositories with thousands of branches may need a higher value to ensure all branches (including the default branch) are retrieved. Minimum value is 1000 (1 second).",
-	"githubPullRequests.recentlyUsedBranchesCount.description": "The maximum number of recently used base branches to track and show at the top of the branch picker when creating a pull request. Set to 0 to disable this feature.",
 	"githubPullRequests.codingAgent.description": "Enables integration with the asynchronous Copilot coding agent. The '#copilotCodingAgent' tool will be available in agent mode when this setting is enabled.",
 	"githubPullRequests.codingAgent.uiIntegration.description": "Enables UI integration within VS Code to create new coding agent sessions.",
 	"githubPullRequests.codingAgent.autoCommitAndPush.description": "Allow automatic git operations (commit, push) to be performed when starting a coding agent session",

src/common/settingKeys.ts

@@ -7,7 +7,6 @@ export const PR_SETTINGS_NAMESPACE = 'githubPullRequests';
 export const TERMINAL_LINK_HANDLER = 'terminalLinksHandler';
 export const BRANCH_PUBLISH = 'createOnPublishBranch';
 export const BRANCH_LIST_TIMEOUT = 'branchListTimeout';
-export const RECENTLY_USED_BRANCHES_COUNT = 'recentlyUsedBranchesCount';
 export const USE_REVIEW_MODE = 'useReviewMode';
 export const FILE_LIST_LAYOUT = 'fileListLayout';
 export const HIDE_VIEWED_FILES = 'hideViewedFiles';

src/github/createPRViewProvider.ts

@@ -34,8 +34,7 @@ import {
 	PR_SETTINGS_NAMESPACE,
 	PULL_REQUEST_DESCRIPTION,
 	PULL_REQUEST_LABELS,
-	PUSH_BRANCH,
-	RECENTLY_USED_BRANCHES_COUNT
+	PUSH_BRANCH
 } from '../common/settingKeys';
 import { ITelemetry } from '../common/telemetry';
 import { asPromise, compareIgnoreCase, formatError, promiseWithTimeout } from '../common/utils';
@@ -134,27 +133,13 @@ export abstract class BaseCreatePullRequestViewProvider<T extends BasePullReques
 		return repo.getRepoAccessAndMergeMethods(refetch);
 	}
 
-	private getRecentlyUsedBranchesMaxCount(): number {
-		return vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<number>(RECENTLY_USED_BRANCHES_COUNT, 5);
-	}
-
 	protected getRecentlyUsedBranches(owner: string, repositoryName: string): string[] {
-		const maxCount = this.getRecentlyUsedBranchesMaxCount();
-		if (maxCount === 0) {
-			return [];
-		}
-
 		const repoKey = `${owner}/${repositoryName}`;
 		const state = this._folderRepositoryManager.context.workspaceState.get<RecentlyUsedBranchesState>(RECENTLY_USED_BRANCHES, { branches: {} });
 		return state.branches[repoKey] || [];
 	}
 
 	protected saveRecentlyUsedBranch(owner: string, repositoryName: string, branchName: string): void {
-		const maxCount = this.getRecentlyUsedBranchesMaxCount();
-		if (maxCount === 0) {
-			return;
-		}
-
 		const repoKey = `${owner}/${repositoryName}`;
 		const state = this._folderRepositoryManager.context.workspaceState.get<RecentlyUsedBranchesState>(RECENTLY_USED_BRANCHES, { branches: {} });
 
@@ -167,8 +152,8 @@ export abstract class BaseCreatePullRequestViewProvider<T extends BasePullReques
 		// Add it to the front
 		recentBranches.unshift(branchName);
 
-		// Limit to maxCount
-		recentBranches = recentBranches.slice(0, maxCount);
+		// Limit to 10 branches
+		recentBranches = recentBranches.slice(0, 10);
 
 		// Save back to state
 		state.branches[repoKey] = recentBranches;
@@ -871,9 +856,10 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 		let otherBranches: string[] = branchNames;
 		if (isBase) {
 			const recentlyUsed = this.getRecentlyUsedBranches(githubRepository.remote.owner, githubRepository.remote.repositoryName);
-			// Filter to only include branches that exist in the current branch list
-			recentBranches = recentlyUsed.filter(recent => branchNames.includes(recent));
-			// Remove recently used branches from the main list
+			// Include all recently used branches, even if they're not in the current branch list
+			// This allows showing branches that weren't fetched due to timeout
+			recentBranches = recentlyUsed;
+			// Remove recently used branches from the main list (if they exist there)
 			otherBranches = branchNames.filter(name => !recentBranches.includes(name));
 		}