Merge branch 'main' into copilot/fix-worktree-merge-issue

Author: alexr00

package.json

@@ -41,10 +41,10 @@
 		"treeItemMarkdownLabel",
 		"treeViewMarkdownMessage"
 	],
-	"version": "0.128.0",
+	"version": "0.130.0",
 	"publisher": "GitHub",
 	"engines": {
-		"vscode": "^1.109.0"
+		"vscode": "^1.110.0"
 	},
 	"categories": [
 		"Other",

src/api/api.d.ts

@@ -54,8 +54,8 @@ export interface Remote {
 }
 
 export interface Worktree {
-	readonly path: string;
 	readonly name: string;
+	readonly path: string;
 	readonly ref: string;
 	readonly main: boolean;
 	readonly detached: boolean;

src/github/createPRViewProvider.ts

@@ -10,7 +10,7 @@ import {
 	PullRequestDefaults,
 	titleAndBodyFrom,
 } from './folderRepositoryManager';
-import { GitHubRepository } from './githubRepository';
+import { GitHubRepository, isRateLimitError, ViewerPermission } from './githubRepository';
 import { IAccount, ILabel, IMilestone, IProject, isITeam, ITeam, MergeMethod, RepoAccessAndMergeMethods } from './interface';
 import { BaseBranchMetadata, PullRequestGitHelper } from './pullRequestGitHelper';
 import { PullRequestModel } from './pullRequestModel';
@@ -211,13 +211,47 @@ export abstract class BaseCreatePullRequestViewProvider<T extends BasePullReques
 
 		const defaultBaseBranch = detectedBaseMetadata?.branch ?? this._pullRequestDefaults.base;
 
-		const [defaultTitleAndDescription, mergeConfiguration, viewerPermission, mergeQueueMethodForBranch, labels] = await Promise.all([
-			this.getTitleAndDescription(defaultCompareBranch, defaultBaseBranch),
-			this.getMergeConfiguration(defaultBaseRemote.owner, defaultBaseRemote.repositoryName),
-			defaultOrigin.getViewerPermission(),
-			this._folderRepositoryManager.mergeQueueMethodForBranch(defaultBaseBranch, defaultBaseRemote.owner, defaultBaseRemote.repositoryName),
-			this.getPullRequestDefaultLabels(defaultBaseRemote)
-		]);
+		let defaultTitleAndDescription: { title: string; description: string };
+		let mergeConfiguration: RepoAccessAndMergeMethods;
+		let viewerPermission: ViewerPermission;
+		let mergeQueueMethodForBranch: MergeMethod | undefined;
+		let labels: ILabel[];
+		try {
+			[defaultTitleAndDescription, mergeConfiguration, viewerPermission, mergeQueueMethodForBranch, labels] = await Promise.all([
+				this.getTitleAndDescription(defaultCompareBranch, defaultBaseBranch),
+				this.getMergeConfiguration(defaultBaseRemote.owner, defaultBaseRemote.repositoryName),
+				defaultOrigin.getViewerPermission(),
+				this._folderRepositoryManager.mergeQueueMethodForBranch(defaultBaseBranch, defaultBaseRemote.owner, defaultBaseRemote.repositoryName),
+				this.getPullRequestDefaultLabels(defaultBaseRemote)
+			]);
+		} catch (e) {
+			if (isRateLimitError(e)) {
+				vscode.window.showErrorMessage(vscode.l10n.t('GitHub API rate limit exceeded. Please wait and try again.'));
+			}
+			Logger.error(`Error initializing create pull request view: ${e}`, BaseCreatePullRequestViewProvider.ID);
+			return {
+				canModifyBranches: true,
+				defaultBaseRemote,
+				defaultBaseBranch,
+				defaultCompareRemote,
+				defaultCompareBranch: this._defaultCompareBranch,
+				defaultTitle: '',
+				defaultDescription: '',
+				baseHasMergeQueue: false,
+				remoteCount: remotes.length,
+				autoMergeDefault: false,
+				createError: '',
+				isDraftDefault: false,
+				isDarkTheme: vscode.window.activeColorTheme.kind === vscode.ColorThemeKind.Dark,
+				generateTitleAndDescriptionTitle: undefined,
+				creating: false,
+				initializeWithGeneratedTitleAndDescription: false,
+				preReviewState: PreReviewState.None,
+				preReviewer: undefined,
+				reviewing: false,
+				usingTemplate: false,
+			};
+		}
 
 		const defaultCreateOption = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<'lastUsed' | 'create' | 'createDraft' | 'createAutoMerge'>(DEFAULT_CREATE_OPTION, 'lastUsed');
 		const lastCreateMethod: { autoMerge: boolean, mergeMethod: MergeMethod | undefined, isDraft: boolean } | undefined = this._folderRepositoryManager.context.workspaceState.get<{ autoMerge: boolean, mergeMethod: MergeMethod, isDraft } | undefined>(PREVIOUS_CREATE_METHOD, undefined);
@@ -724,7 +758,8 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 
 		const name = compareBranch.name;
 		const branchNameTitle = (name: string) => {
-			return `${name.charAt(0).toUpperCase()}${name.slice(1)}`;
+			const nameWithSpaces = name.replace(/[-_]/g, ' ');
+			return `${nameWithSpaces.charAt(0).toUpperCase()}${nameWithSpaces.slice(1)}`;
 		};
 
 		// If branchName is selected, use the branch name as the title
@@ -994,7 +1029,18 @@ Don't forget to commit your template file to the repository so that it can be us
 	}
 
 	private async processRemoteAndBranchResult(githubRepository: GitHubRepository, result: { remote: RemoteInfo, branch: string }, isBase: boolean) {
-		const [defaultBranch, viewerPermission] = await Promise.all([githubRepository.getDefaultBranch(), githubRepository.getViewerPermission()]);
+		let viewerPermission: ViewerPermission;
+		try {
+			viewerPermission = await githubRepository.getViewerPermission();
+		} catch (e) {
+			if (isRateLimitError(e)) {
+				vscode.window.showErrorMessage(vscode.l10n.t('GitHub API rate limit exceeded. Please wait and try again.'));
+				viewerPermission = ViewerPermission.Unknown;
+			} else {
+				throw e;
+			}
+		}
+		const defaultBranch = await githubRepository.getDefaultBranch();
 
 		commands.setContext(contexts.CREATE_PR_PERMISSIONS, viewerPermission);
 		let chooseResult: ChooseBaseRemoteAndBranchResult | ChooseCompareRemoteAndBranchResult;

src/github/folderRepositoryManager.ts

@@ -11,7 +11,7 @@ import { ConflictModel } from './conflictGuide';
 import { ConflictResolutionCoordinator } from './conflictResolutionCoordinator';
 import { Conflict, ConflictResolutionModel } from './conflictResolutionModel';
 import { CredentialStore } from './credentials';
-import { CopilotWorkingStatus, GitHubRepository, ItemsData, PULL_REQUEST_PAGE_SIZE, PullRequestChangeEvent, PullRequestData, TeamReviewerRefreshKind, ViewerPermission } from './githubRepository';
+import { CopilotWorkingStatus, GitHubRepository, isRateLimitError, ItemsData, PULL_REQUEST_PAGE_SIZE, PullRequestChangeEvent, PullRequestData, TeamReviewerRefreshKind, ViewerPermission } from './githubRepository';
 import { PullRequestResponse, PullRequestState } from './graphql';
 import { IAccount, ILabel, IMilestone, IProject, IPullRequestsPagingOptions, Issue, ITeam, MergeMethod, PRType, PullRequestMergeability, RepoAccessAndMergeMethods, User } from './interface';
 import { IssueModel } from './issueModel';
@@ -2515,7 +2515,7 @@ export class FolderRepositoryManager extends Disposable {
 			}
 		}
 
-		if (pullRequest.item.mergeable !== PullRequestMergeability.Conflict) {
+		if (pullRequest.item.mergeable !== PullRequestMergeability.Conflict && !pullRequest.githubRepository.remote.isEnterprise) {
 			const result = await vscode.window.withProgress(
 				{ location: vscode.ProgressLocation.Notification, title: vscode.l10n.t('Updating branch...') },
 				async () => {
@@ -2986,7 +2986,16 @@ export class FolderRepositoryManager extends Disposable {
 			pushRemote,
 			this.credentialStore,
 		);
-		const permission = await githubRepo.getViewerPermission();
+		let permission: ViewerPermission;
+		try {
+			permission = await githubRepo.getViewerPermission();
+		} catch (e) {
+			if (isRateLimitError(e)) {
+				vscode.window.showErrorMessage(vscode.l10n.t('GitHub API rate limit exceeded. Please wait and try again.'), { modal: true });
+				return;
+			}
+			throw e;
+		}
 		let selectedRemote: GitHubRemote | undefined;
 		if (
 			permission === ViewerPermission.Read ||

src/github/githubRepository.ts

@@ -124,6 +124,26 @@ export enum ViewerPermission {
 	Write = 'WRITE',
 }
 
+export class RateLimitError extends Error {
+	constructor(message?: string) {
+		super(message ?? 'GitHub API rate limit exceeded');
+		this.name = 'RateLimitError';
+	}
+}
+
+export function isRateLimitError(e: unknown): boolean {
+	if (e instanceof RateLimitError) {
+		return true;
+	}
+	if (e instanceof Error) {
+		const msg = e.message.toLowerCase();
+		if (msg.includes('rate limit') || msg.includes('secondary rate') || msg.includes('abuse detection')) {
+			return true;
+		}
+	}
+	return false;
+}
+
 export enum TeamReviewerRefreshKind {
 	None,
 	Try,
@@ -941,6 +961,9 @@ export class GitHubRepository extends Disposable {
 			return parseGraphQLViewerPermission(data);
 		} catch (e) {
 			Logger.error(`Unable to fetch viewer permission: ${e}`, this.id);
+			if (isRateLimitError(e)) {
+				throw new RateLimitError();
+			}
 			return ViewerPermission.Unknown;
 		}
 	}

src/github/pullRequestOverview.ts

@@ -274,6 +274,11 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 	private isUpdateBranchWithGitHubEnabled(): boolean {
 		// With the GraphQL UpdatePullRequestBranch API, we can update branches even when not checked out
 		// (as long as there are no conflicts). If there are conflicts, we need the branch to be checked out.
+		// GitHub Enterprise doesn't support the GraphQL UpdatePullRequestBranch mutation,
+		// so we always need the branch to be checked out for enterprise.
+		if (this._item.githubRepository.remote.isEnterprise) {
+			return this._item.isActive;
+		}
 		const hasConflicts = this._item.item.mergeable === PullRequestMergeability.Conflict;
 		if (hasConflicts) {
 			return this._item.isActive;

src/github/repositoriesManager.ts

@@ -91,10 +91,39 @@ export class RepositoriesManager extends Disposable {
 			folderManager.onDidChangeAnyPullRequests(e => this._onDidChangeAnyPullRequests.fire(e)),
 			folderManager.onDidAddPullRequest(e => this._onDidAddPullRequest.fire(e)),
 			folderManager.onDidChangeGithubRepositories(() => this._onDidAddAnyGitHubRepository.fire(folderManager)),
+			folderManager.repository.state.onDidChange(() => this.checkWorktreeChanges(folderManager.repository)),
 		];
 		this._subs.set(folderManager, disposables);
 	}
 
+	private _previousWorktrees: Map<string, Set<string>> = new Map();
+
+	private checkWorktreeChanges(repo: Repository): void {
+		const worktrees = repo.state.worktrees;
+		if (!worktrees) {
+			return;
+		}
+
+		const repoKey = repo.rootUri.toString();
+		const currentPaths = new Set(worktrees.map(wt => vscode.Uri.file(wt.path).toString()));
+		const previousPaths = this._previousWorktrees.get(repoKey);
+		this._previousWorktrees.set(repoKey, currentPaths);
+
+		if (!previousPaths) {
+			return;
+		}
+
+		for (const previousPath of previousPaths) {
+			if (!currentPaths.has(previousPath)) {
+				const folderManager = this._folderManagers.find(m => m.repository.rootUri.toString() === previousPath);
+				if (folderManager) {
+					Logger.appendLine(`Removing folder manager for removed worktree ${previousPath}`, RepositoriesManager.ID);
+					this.removeRepo(folderManager.repository);
+				}
+			}
+		}
+	}
+
 	insertFolderManager(folderManager: FolderRepositoryManager) {
 		this.registerFolderListeners(folderManager);
 
@@ -127,7 +156,7 @@ export class RepositoriesManager extends Disposable {
 			const folderManager = this._folderManagers[existingFolderManagerIndex];
 			disposeAll(this._subs.get(folderManager)!);
 			this._subs.delete(folderManager);
-			this._folderManagers.splice(existingFolderManagerIndex);
+			this._folderManagers.splice(existingFolderManagerIndex, 1);
 			folderManager.dispose();
 			this.updateActiveReviewCount();
 			this._onDidChangeFolderRepositories.fire({});