Combines contains sha call into single git call

src/env/node/git/git.ts

@@ -511,7 +511,7 @@ export class Git {
 
 	branchOrTag__containsOrPointsAt(
 		repoPath: string,
-		ref: string,
+		refs: string[],
 		options?: {
 			type?: 'branch' | 'tag';
 			all?: boolean;
@@ -526,10 +526,13 @@ export class Git {
 		} else if (options?.remotes) {
 			params.push('-r');
 		}
-		params.push(
-			options?.mode === 'pointsAt' ? `--points-at=${ref}` : `--contains=${ref}`,
-			'--format=%(refname:short)',
-		);
+
+		params.push('--format=%(refname:short)');
+
+		for (const ref of refs) {
+			params.push(options?.mode === 'pointsAt' ? `--points-at=${ref}` : `--contains=${ref}`);
+		}
+
 		if (options?.name != null) {
 			params.push(options.name);
 		}

src/env/node/git/localGitProvider.ts

@@ -2235,22 +2235,22 @@ export class LocalGitProvider implements GitProvider, Disposable {
 	@log()
 	async getCommitBranches(
 		repoPath: string,
-		ref: string,
+		refs: string[],
 		branch?: string | undefined,
 		options?:
 			| { all?: boolean; commitDate?: Date; mode?: 'contains' | 'pointsAt' }
 			| { commitDate?: Date; mode?: 'contains' | 'pointsAt'; remotes?: boolean },
 	): Promise<string[]> {
 		if (branch != null) {
-			const data = await this.git.branchOrTag__containsOrPointsAt(repoPath, ref, {
+			const data = await this.git.branchOrTag__containsOrPointsAt(repoPath, refs, {
 				type: 'branch',
 				mode: 'contains',
 				name: branch,
 			});
 			return data ? [data?.trim()] : [];
 		}
 
-		const data = await this.git.branchOrTag__containsOrPointsAt(repoPath, ref, { type: 'branch', ...options });
+		const data = await this.git.branchOrTag__containsOrPointsAt(repoPath, refs, { type: 'branch', ...options });
 		if (!data) return [];
 
 		return filterMap(data.split('\n'), b => b.trim() || undefined);
@@ -2829,7 +2829,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 		ref: string,
 		options?: { commitDate?: Date; mode?: 'contains' | 'pointsAt' },
 	): Promise<string[]> {
-		const data = await this.git.branchOrTag__containsOrPointsAt(repoPath, ref, { type: 'tag', ...options });
+		const data = await this.git.branchOrTag__containsOrPointsAt(repoPath, [ref], { type: 'tag', ...options });
 		if (!data) return [];
 
 		return filterMap(data.split('\n'), b => b.trim() || undefined);
@@ -4056,7 +4056,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 				const [branchResult, mergeBaseResult, possibleSourceBranchesResult] = await Promise.allSettled([
 					this.getBranch(repoPath),
 					this.getMergeBase(repoPath, 'MERGE_HEAD', 'HEAD'),
-					this.getCommitBranches(repoPath, 'MERGE_HEAD', undefined, { all: true, mode: 'pointsAt' }),
+					this.getCommitBranches(repoPath, ['MERGE_HEAD'], undefined, { all: true, mode: 'pointsAt' }),
 				]);
 
 				const branch = getSettledValue(branchResult);
@@ -4142,7 +4142,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 				}
 
 				const [branchTipsResult, tagTipsResult] = await Promise.allSettled([
-					this.getCommitBranches(repoPath, onto, undefined, { all: true, mode: 'pointsAt' }),
+					this.getCommitBranches(repoPath, [onto], undefined, { all: true, mode: 'pointsAt' }),
 					this.getCommitTags(repoPath, onto, { mode: 'pointsAt' }),
 				]);
 

src/git/gitProvider.ts

@@ -245,7 +245,7 @@ export interface GitProvider extends Disposable {
 	getCommit(repoPath: string, ref: string): Promise<GitCommit | undefined>;
 	getCommitBranches(
 		repoPath: string,
-		ref: string,
+		refs: string[],
 		branch?: string | undefined,
 		options?:
 			| { all?: boolean; commitDate?: Date; mode?: 'contains' | 'pointsAt' }

src/git/gitProviderService.ts

@@ -1681,14 +1681,14 @@ export class GitProviderService implements Disposable {
 	@log()
 	getCommitBranches(
 		repoPath: string | Uri,
-		ref: string,
+		refs: string | string[],
 		branch?: string | undefined,
 		options?:
 			| { all?: boolean; commitDate?: Date; mode?: 'contains' | 'pointsAt' }
 			| { commitDate?: Date; mode?: 'contains' | 'pointsAt'; remotes?: boolean },
 	): Promise<string[]> {
 		const { provider, path } = this.getProvider(repoPath);
-		return provider.getCommitBranches(path, ref, branch, options);
+		return provider.getCommitBranches(path, typeof refs === 'string' ? [refs] : refs, branch, options);
 	}
 
 	@log()

src/plus/drafts/draftsService.ts

@@ -241,13 +241,10 @@ export class DraftService implements Disposable {
 		const [branchNamesResult, diffResult, firstShaResult, remoteResult, userResult] = await Promise.allSettled([
 			isWIP
 				? this.container.git.getBranch(change.repository.uri).then(b => (b != null ? [b.name] : undefined))
-				: this.container.git
-						.getCommitBranches(change.repository.uri, change.revision.to)
-						.then(branches =>
-							branches.length
-								? branches
-								: this.container.git.getCommitBranches(change.repository.uri, change.revision.from),
-						),
+				: this.container.git.getCommitBranches(change.repository.uri, [
+						change.revision.to,
+						change.revision.from,
+				  ]),
 			change.contents == null
 				? this.container.git.getDiff(change.repository.path, change.revision.to, change.revision.from)
 				: undefined,

src/plus/integrations/providers/github/github.ts

@@ -1140,7 +1140,14 @@ export class GitHubApi implements Disposable {
 	}
 
 	@debug<GitHubApi['getCommitBranches']>({ args: { 0: '<token>' } })
-	async getCommitBranches(token: string, owner: string, repo: string, ref: string, date: Date): Promise<string[]> {
+	async getCommitBranches(
+		token: string,
+		owner: string,
+		repo: string,
+		refs: string[],
+		mode: 'contains' | 'pointsAt',
+		date?: Date,
+	): Promise<string[]> {
 		const scope = getLogScope();
 
 		interface QueryResult {
@@ -1158,6 +1165,8 @@ export class GitHubApi implements Disposable {
 			};
 		}
 
+		const limit = mode === 'contains' ? 10 : 1;
+
 		try {
 			const query = `query getCommitBranches(
 	$owner: String!
@@ -1171,7 +1180,7 @@ export class GitHubApi implements Disposable {
 				name
 				target {
 					... on Commit {
-						history(first: 3, since: $since until: $until) {
+						history(first: ${limit}, since: $since until: $until) {
 							nodes { oid }
 						}
 					}
@@ -1187,8 +1196,8 @@ export class GitHubApi implements Disposable {
 				{
 					owner: owner,
 					repo: repo,
-					since: date.toISOString(),
-					until: date.toISOString(),
+					since: date?.toISOString(),
+					until: date?.toISOString(),
 				},
 				scope,
 			);
@@ -1200,7 +1209,7 @@ export class GitHubApi implements Disposable {
 
 			for (const branch of nodes) {
 				for (const commit of branch.target.history.nodes) {
-					if (commit.oid === ref) {
+					if (refs.includes(commit.oid)) {
 						branches.push(branch.name);
 						break;
 					}
@@ -1275,8 +1284,9 @@ export class GitHubApi implements Disposable {
 		owner: string,
 		repo: string,
 		branch: string,
-		ref: string,
-		date: Date,
+		refs: string[],
+		mode: 'contains' | 'pointsAt',
+		date?: Date,
 	): Promise<string[]> {
 		const scope = getLogScope();
 
@@ -1291,6 +1301,9 @@ export class GitHubApi implements Disposable {
 				};
 			};
 		}
+
+		const limit = mode === 'contains' ? 100 : 1;
+
 		try {
 			const query = `query getCommitOnBranch(
 	$owner: String!
@@ -1303,7 +1316,7 @@ export class GitHubApi implements Disposable {
 		ref(qualifiedName: $ref) {
 			target {
 				... on Commit {
-					history(first: 3, since: $since until: $until) {
+					history(first: ${limit}, since: $since until: $until) {
 						nodes { oid }
 					}
 				}
@@ -1319,8 +1332,8 @@ export class GitHubApi implements Disposable {
 					owner: owner,
 					repo: repo,
 					ref: `refs/heads/${branch}`,
-					since: date.toISOString(),
-					until: date.toISOString(),
+					since: date?.toISOString(),
+					until: date?.toISOString(),
 				},
 				scope,
 			);
@@ -1331,7 +1344,7 @@ export class GitHubApi implements Disposable {
 			const branches = [];
 
 			for (const commit of nodes) {
-				if (commit.oid === ref) {
+				if (refs.includes(commit.oid)) {
 					branches.push(branch);
 					break;
 				}

src/plus/integrations/providers/github/githubGitProvider.ts

@@ -1059,7 +1059,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 	@log()
 	async getCommitBranches(
 		repoPath: string,
-		ref: string,
+		refs: string[],
 		branch?: string | undefined,
 		options?:
 			| { all?: boolean; commitDate?: Date; mode?: 'contains' | 'pointsAt' }
@@ -1080,15 +1080,17 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 					metadata.repo.owner,
 					metadata.repo.name,
 					branch,
-					ref,
+					refs,
+					options?.mode ?? 'contains',
 					options?.commitDate,
 				);
 			} else {
 				branches = await github.getCommitBranches(
 					session.accessToken,
 					metadata.repo.owner,
 					metadata.repo.name,
-					ref,
+					refs,
+					options?.mode ?? 'contains',
 					options?.commitDate,
 				);
 			}