Fixes issue with incorrect local branch matching

Improves matching performance

Author: eamodio

src/plus/focus/focusProvider.ts

@@ -7,13 +7,13 @@ import { CancellationError } from '../../errors';
 import { openComparisonChanges } from '../../git/actions/commit';
 import type { Account } from '../../git/models/author';
 import type { GitBranch } from '../../git/models/branch';
+import { getLocalBranchByUpstream } from '../../git/models/branch';
 import type { SearchedIssue } from '../../git/models/issue';
 import type { SearchedPullRequest } from '../../git/models/pullRequest';
 import { getComparisonRefsForPullRequest } from '../../git/models/pullRequest';
 import type { GitRemote } from '../../git/models/remote';
 import type { Repository } from '../../git/models/repository';
 import type { CodeSuggestionCounts, Draft } from '../../gk/models/drafts';
-import { getPathFromProviderIdentity } from '../../gk/models/repositoryIdentities';
 import { executeCommand, registerCommand } from '../../system/command';
 import { configuration } from '../../system/configuration';
 import { getSettledValue } from '../../system/promise';
@@ -426,39 +426,57 @@ export class FocusProvider implements Disposable {
 		);
 	}
 
-	async getMatchingOpenRepository(pr: EnrichablePullRequest): Promise<OpenRepository | undefined> {
+	async getMatchingOpenRepository(
+		pr: EnrichablePullRequest,
+		matchingRemoteMap: Map<string, [Repository, GitRemote]>,
+	): Promise<OpenRepository | undefined> {
+		if (pr.repoIdentity.remote.url == null) return undefined;
+
+		const match = matchingRemoteMap.get(pr.repoIdentity.remote.url);
+		if (match == null) return undefined;
+
+		const [repo, remote] = match;
+		const remoteBranchName = `${remote.name}/${pr.refs?.head.branch ?? pr.headRef?.name}`;
+		const matchingLocalBranch = await getLocalBranchByUpstream(repo, remoteBranchName);
+
+		return { repo: repo, remote: remote, localBranch: matchingLocalBranch };
+	}
+
+	private async getMatchingRemoteMap(actionableItems: FocusPullRequest[]) {
+		const uniqueRemoteUrls = new Set<string>();
+		for (const item of actionableItems) {
+			if (item.repoIdentity.remote.url != null) {
+				uniqueRemoteUrls.add(item.repoIdentity.remote.url);
+			}
+		}
+
+		// Get the repo/remote pairs for the unique remote urls
+		const repoRemotes = new Map<string, [Repository, GitRemote]>();
+
 		for (const repo of this.container.git.openRepositories) {
-			const matchingRemote = (
-				await repo.getRemotes({
-					filter: r =>
-						r.matches(pr.repoIdentity.remote.url!) ||
-						r.matches(
-							pr.repoIdentity.provider.domain,
-							getPathFromProviderIdentity(pr.repoIdentity.provider),
-						),
-				})
-			)?.[0];
-			if (matchingRemote == null) continue;
-
-			const matchingRemoteBranch = (
-				await repo.getBranches({
-					filter: b =>
-						b.remote &&
-						b.getRemoteName() === matchingRemote.name &&
-						b.getNameWithoutRemote() === pr.headRef?.name,
-				})
-			)?.values[0];
-			if (matchingRemoteBranch == null) continue;
-
-			const matchingLocalBranches = (
-				await repo.getBranches({ filter: b => b.upstream?.name === matchingRemoteBranch.name })
-			)?.values;
-			const matchingLocalBranch = matchingLocalBranches?.find(b => b.current) ?? matchingLocalBranches?.[0];
-
-			return { repo: repo, remote: matchingRemote, localBranch: matchingLocalBranch };
+			const remotes = await repo.getRemotes();
+			for (const remote of remotes) {
+				if (uniqueRemoteUrls.has(remote.url)) {
+					repoRemotes.set(remote.url, [repo, remote]);
+					uniqueRemoteUrls.delete(remote.url);
+
+					if (uniqueRemoteUrls.size === 0) return repoRemotes;
+				} else {
+					for (const url of uniqueRemoteUrls) {
+						if (remote.matches(url)) {
+							repoRemotes.set(url, [repo, remote]);
+							uniqueRemoteUrls.delete(url);
+
+							if (uniqueRemoteUrls.size === 0) return repoRemotes;
+
+							break;
+						}
+					}
+				}
+			}
 		}
 
-		return undefined;
+		return repoRemotes;
 	}
 
 	async getCategorizedItems(
@@ -495,6 +513,7 @@ export class FocusProvider implements Disposable {
 		]);
 
 		if (cancellation?.isCancellationRequested) throw new CancellationError();
+
 		let categorized: FocusItem[] = [];
 
 		// TODO: Since this is all repos we probably should order by repos you are a contributor on (or even filter out one you aren't)
@@ -515,6 +534,7 @@ export class FocusProvider implements Disposable {
 		if (prsWithSuggestionCounts != null) {
 			const { prs, suggestionCounts } = prsWithSuggestionCounts;
 			if (prs == null) return categorized;
+
 			const filteredPrs = !ignoredRepositories.size
 				? prs
 				: prs.filter(
@@ -526,14 +546,17 @@ export class FocusProvider implements Disposable {
 
 			const github = await this.container.integrations.get(HostingIntegrationId.GitHub);
 			const myAccount = await github.getCurrentAccount();
+
 			const inputPrs: EnrichablePullRequest[] = filteredPrs.map(pr => {
 				const providerPr = toProviderPullRequestWithUniqueId(pr.pullRequest);
+
 				const enrichable = {
 					type: 'pr',
 					id: providerPr.uuid,
 					url: pr.pullRequest.url,
 					provider: 'github',
 				} satisfies EnrichableItem;
+
 				const repoIdentity = {
 					remote: {
 						url: pr.pullRequest.refs?.head?.url,
@@ -566,6 +589,10 @@ export class FocusProvider implements Disposable {
 				{ id: myAccount!.username! },
 				{ enrichedItemsByUniqueId: enrichedItemsByEntityId },
 			) as FocusPullRequest[];
+
+			// Get the unique remote urls
+			const mappedRemotesPromise = await this.getMatchingRemoteMap(actionableItems);
+
 			// Map from shared category label to local actionable category, and get suggested actions
 			categorized = (await Promise.all(
 				actionableItems.map(async item => {
@@ -577,7 +604,7 @@ export class FocusProvider implements Disposable {
 					} else if (codeSuggestionsCount > 0 && item.viewer.isAuthor) {
 						actionableCategory = 'code-suggestions';
 					}
-					const openRepository = await this.getMatchingOpenRepository(item);
+					const openRepository = await this.getMatchingOpenRepository(item, mappedRemotesPromise);
 					const suggestedActions = getSuggestedActions(
 						actionableCategory,
 						openRepository?.localBranch?.current ?? false,