Moves local branch lookup into the sub-provider

Author: eamodio

src/commands/ghpr/openOrCreateWorktree.ts

@@ -3,7 +3,6 @@ import { window } from 'vscode';
 import { GlCommand } from '../../constants.commands';
 import type { Container } from '../../container';
 import { create as createWorktree, open as openWorktree } from '../../git/actions/worktree';
-import { getLocalBranchByUpstream } from '../../git/models/branch.utils';
 import type { GitBranchReference } from '../../git/models/reference';
 import { createReference, getReferenceFromBranch } from '../../git/models/reference.utils';
 import type { GitRemote } from '../../git/models/remote';
@@ -113,7 +112,7 @@ export class OpenOrCreateWorktreeCommand extends GlCommandBase {
 		let branchRef: GitBranchReference;
 		let createBranch: string | undefined;
 
-		const localBranch = await getLocalBranchByUpstream(repo, remoteBranchName);
+		const localBranch = await repo.git.branches().getLocalBranchByUpstream?.(remoteBranchName);
 		if (localBranch != null) {
 			branchRef = getReferenceFromBranch(localBranch);
 			// TODO@eamodio check if we are behind and if so ask the user to fast-forward

src/env/node/git/sub-providers/branches.ts

@@ -9,7 +9,7 @@ import type {
 	PagingOptions,
 } from '../../../../git/gitProvider';
 import { GitBranch } from '../../../../git/models/branch';
-import { isDetachedHead } from '../../../../git/models/branch.utils';
+import { getLocalBranchByUpstream, isDetachedHead } from '../../../../git/models/branch.utils';
 import type { MergeConflict } from '../../../../git/models/mergeConflict';
 import { createRevisionRange } from '../../../../git/models/revision.utils';
 import { parseGitBranches } from '../../../../git/parsers/branchParser';
@@ -21,6 +21,7 @@ import { gate } from '../../../../system/decorators/gate';
 import { log } from '../../../../system/decorators/log';
 import { Logger } from '../../../../system/logger';
 import { getLogScope } from '../../../../system/logger.scope';
+import { PageableResult } from '../../../../system/paging';
 import { getSettledValue } from '../../../../system/promise';
 import { configuration } from '../../../../system/vscode/configuration';
 import type { Git } from '../git';
@@ -309,6 +310,14 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 		await this.git.branch(repoPath, name, ref);
 	}
 
+	@log()
+	async getLocalBranchByUpstream(repoPath: string, remoteBranchName: string): Promise<GitBranch | undefined> {
+		const branches = new PageableResult<GitBranch>(p =>
+			this.getBranches(repoPath, p != null ? { paging: p } : undefined),
+		);
+		return getLocalBranchByUpstream(remoteBranchName, branches);
+	}
+
 	@log()
 	async getPotentialMergeOrRebaseConflict(
 		repoPath: string,

src/git/gitProvider.ts

@@ -398,6 +398,7 @@ export interface GitBranchesSubProvider {
 	): Promise<string | undefined>;
 
 	createBranch?(repoPath: string, name: string, ref: string): Promise<void>;
+	getLocalBranchByUpstream?(repoPath: string, remoteBranchName: string): Promise<GitBranch | undefined>;
 	getPotentialMergeOrRebaseConflict?(
 		repoPath: string,
 		branch: string,

src/git/models/branch.utils.ts

@@ -9,14 +9,13 @@ import {
 	getIssueFromGitConfigEntityIdentifier,
 } from '../../plus/integrations/providers/utils';
 import { Logger } from '../../system/logger';
-import { PageableResult } from '../../system/paging';
+import type { PageableResult } from '../../system/paging';
 import type { MaybePausedResult } from '../../system/promise';
 import { getSettledValue, pauseOnCancelOrTimeout } from '../../system/promise';
 import type { GitBranch } from './branch';
 import type { Issue } from './issue';
 import type { PullRequest } from './pullRequest';
 import type { GitBranchReference, GitReference } from './reference';
-import type { Repository } from './repository';
 import { shortenRevision } from './revision.utils';
 
 const detachedHEADRegex = /^(HEAD|\(.*\))$/;
@@ -100,9 +99,8 @@ export async function getDefaultBranchName(
 }
 
 export async function getLocalBranchByUpstream(
-	repo: Repository,
 	remoteBranchName: string,
-	branches?: PageableResult<GitBranch> | Map<unknown, GitBranch>,
+	branches: PageableResult<GitBranch> | Map<unknown, GitBranch>,
 ): Promise<GitBranch | undefined> {
 	let qualifiedRemoteBranchName;
 	if (remoteBranchName.startsWith('remotes/')) {
@@ -112,10 +110,6 @@ export async function getLocalBranchByUpstream(
 		qualifiedRemoteBranchName = `remotes/${remoteBranchName}`;
 	}
 
-	branches ??= new PageableResult<GitBranch>(p =>
-		repo.git.branches().getBranches(p != null ? { paging: p } : undefined),
-	);
-
 	function matches(branch: GitBranch): boolean {
 		return (
 			!branch.remote &&

src/plus/launchpad/launchpadProvider.ts

@@ -14,7 +14,6 @@ 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.utils';
 import type { PullRequest, SearchedPullRequest } from '../../git/models/pullRequest';
 import {
 	getComparisonRefsForPullRequest,
@@ -533,7 +532,7 @@ export class LaunchpadProvider implements Disposable {
 		const [repo, remote] = match;
 
 		const remoteBranchName = `${remote.name}/${pr.refs?.head.branch ?? pr.headRef?.name}`;
-		const matchingLocalBranch = await getLocalBranchByUpstream(repo, remoteBranchName);
+		const matchingLocalBranch = await repo.git.branches().getLocalBranchByUpstream?.(remoteBranchName);
 
 		return { repo: repo, remote: remote, localBranch: matchingLocalBranch };
 	}

src/webviews/plus/graph/graphWebview.ts

@@ -2754,11 +2754,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 							type: 'remote',
 						});
 
-						const localDefault = await getLocalBranchByUpstream(
-							this.repository!,
-							defaultBranchName,
-							graph.branches,
-						);
+						const localDefault = await getLocalBranchByUpstream(defaultBranchName, graph.branches);
 						if (localDefault != null) {
 							refs.push({
 								id: localDefault.id,
@@ -2899,11 +2895,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 							});
 						}
 
-						const localDefault = await getLocalBranchByUpstream(
-							this.repository!,
-							defaultBranchName,
-							graph.branches,
-						);
+						const localDefault = await getLocalBranchByUpstream(defaultBranchName, graph.branches);
 						if (localDefault != null) {
 							if (!refs.has(localDefault.id)) {
 								refs.set(localDefault.id, {