Refactors Git provider into sub-providers

 - Tag operations

Author: eamodio

src/env/node/git/localGitProvider.ts

@@ -142,7 +142,6 @@ import { TimedCancellationSource } from '../../../system/-webview/cancellation';
 import { configuration } from '../../../system/-webview/configuration';
 import { getBestPath, relative, splitPath } from '../../../system/-webview/path';
 import { isFolderUri } from '../../../system/-webview/utils';
-import { filterMap } from '../../../system/array';
 import { gate } from '../../../system/decorators/-webview/gate';
 import { debug, log } from '../../../system/decorators/log';
 import { debounce } from '../../../system/function';
@@ -2440,18 +2439,6 @@ export class LocalGitProvider implements GitProvider, Disposable {
 		return getCommitsForGraphCore.call(this, defaultLimit, selectSha);
 	}
 
-	@log()
-	async getCommitTags(
-		repoPath: string,
-		ref: string,
-		options?: { commitDate?: Date; mode?: 'contains' | 'pointsAt' },
-	): Promise<string[]> {
-		const data = await this.git.branchOrTag__containsOrPointsAt(repoPath, [ref], { type: 'tag', ...options });
-		if (!data) return [];
-
-		return filterMap(data.split('\n'), b => b.trim() || undefined);
-	}
-
 	getConfig(repoPath: string, key: GitConfigKeys): Promise<string | undefined> {
 		return this.git.config__get(key, repoPath);
 	}

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

@@ -228,7 +228,7 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 								all: true,
 								mode: 'pointsAt',
 							}),
-							this.provider.getCommitTags(repoPath, onto, { mode: 'pointsAt' }),
+							this.provider.tags.getTagsWithCommit(repoPath, onto, { mode: 'pointsAt' }),
 						]);
 
 						const mergeBase = getSettledValue(mergeBaseResult);

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

@@ -6,6 +6,7 @@ import type { GitTag } from '../../../../git/models/tag';
 import { parseGitTags, parseGitTagsDefaultFormat } from '../../../../git/parsers/tagParser';
 import type { TagSortOptions } from '../../../../git/utils/-webview/sorting';
 import { sortTags } from '../../../../git/utils/-webview/sorting';
+import { filterMap } from '../../../../system/array';
 import { log } from '../../../../system/decorators/log';
 import type { Git } from '../git';
 
@@ -72,6 +73,18 @@ export class TagsGitSubProvider implements GitTagsSubProvider {
 		return result;
 	}
 
+	@log()
+	async getTagsWithCommit(
+		repoPath: string,
+		commit: string,
+		options?: { commitDate?: Date; mode?: 'contains' | 'pointsAt' },
+	): Promise<string[]> {
+		const data = await this.git.branchOrTag__containsOrPointsAt(repoPath, [commit], { type: 'tag', ...options });
+		if (!data) return [];
+
+		return filterMap(data.split('\n'), b => b.trim() || undefined);
+	}
+
 	@log()
 	async createTag(repoPath: string, name: string, ref: string, message?: string): Promise<void> {
 		try {

src/git/gitProvider.ts

@@ -190,14 +190,6 @@ export interface GitRepositoryProvider {
 			ref?: string;
 		},
 	): Promise<GitGraph>;
-	getCommitTags(
-		repoPath: string,
-		ref: string,
-		options?: {
-			commitDate?: Date | undefined;
-			mode?: 'contains' | 'pointsAt' | undefined;
-		},
-	): Promise<string[]>;
 	getConfig?(repoPath: string, key: GitConfigKeys): Promise<string | undefined>;
 	setConfig?(repoPath: string, key: GitConfigKeys, value: string | undefined): Promise<void>;
 	getCurrentUser(repoPath: string): Promise<GitUser | undefined>;
@@ -390,7 +382,7 @@ export interface GitBranchesSubProvider {
 	getBranchContributionsOverview(repoPath: string, ref: string): Promise<BranchContributionsOverview | undefined>;
 	getBranchesWithCommits(
 		repoPath: string,
-		refs: string[],
+		commits: string[],
 		branch?: string | undefined,
 		options?:
 			| { all?: boolean; commitDate?: Date; mode?: 'contains' | 'pointsAt' }
@@ -565,6 +557,14 @@ export interface GitTagsSubProvider {
 			sort?: boolean | TagSortOptions | undefined;
 		},
 	): Promise<PagedResult<GitTag>>;
+	getTagsWithCommit(
+		repoPath: string,
+		commit: string,
+		options?: {
+			commitDate?: Date | undefined;
+			mode?: 'contains' | 'pointsAt' | undefined;
+		},
+	): Promise<string[]>;
 
 	createTag?(repoPath: string, name: string, ref: string, message?: string): Promise<void>;
 	deleteTag?(repoPath: string, name: string): Promise<void>;

src/git/gitProviderService.ts

@@ -1759,16 +1759,6 @@ export class GitProviderService implements Disposable {
 		return provider.getCommitsForGraph(path, asWebviewUri, options);
 	}
 
-	@log()
-	getCommitTags(
-		repoPath: string | Uri,
-		ref: string,
-		options?: { commitDate?: Date; mode?: 'contains' | 'pointsAt' },
-	): Promise<string[]> {
-		const { provider, path } = this.getProvider(repoPath);
-		return provider.getCommitTags(path, ref, options);
-	}
-
 	@log()
 	async getConfig(repoPath: string | Uri, key: GitConfigKeys): Promise<string | undefined> {
 		const { provider, path } = this.getProvider(repoPath);

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

@@ -1836,8 +1836,8 @@ export class GitHubApi implements Disposable {
 		}
 	}
 
-	@debug<GitHubApi['getCommitTags']>({ args: { 0: '<token>' } })
-	async getCommitTags(token: string, owner: string, repo: string, ref: string, date: Date): Promise<string[]> {
+	@debug<GitHubApi['getTagsWithCommit']>({ args: { 0: '<token>' } })
+	async getTagsWithCommit(token: string, owner: string, repo: string, ref: string, date: Date): Promise<string[]> {
 		const scope = getLogScope();
 
 		interface QueryResult {
@@ -1856,7 +1856,7 @@ export class GitHubApi implements Disposable {
 		}
 
 		try {
-			const query = `query getCommitTags(
+			const query = `query getTagsWithCommit(
 	$owner: String!
 	$repo: String!
 	$since: GitTimestamp!

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

@@ -1423,35 +1423,6 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 		};
 	}
 
-	@log()
-	async getCommitTags(
-		repoPath: string,
-		ref: string,
-		options?: { commitDate?: Date; mode?: 'contains' | 'pointsAt' },
-	): Promise<string[]> {
-		if (repoPath == null || options?.commitDate == null) return [];
-
-		const scope = getLogScope();
-
-		try {
-			const { metadata, github, session } = await this.ensureRepositoryContext(repoPath);
-
-			const tags = await github.getCommitTags(
-				session.accessToken,
-				metadata.repo.owner,
-				metadata.repo.name,
-				stripOrigin(ref),
-				options?.commitDate,
-			);
-
-			return tags;
-		} catch (ex) {
-			Logger.error(ex, scope);
-			debugger;
-			return [];
-		}
-	}
-
 	@gate()
 	@log()
 	async getCurrentUser(repoPath: string): Promise<GitUser | undefined> {

src/plus/integrations/providers/github/sub-providers/tags.ts

@@ -8,6 +8,7 @@ import { log } from '../../../../../system/decorators/log';
 import { Logger } from '../../../../../system/logger';
 import { getLogScope } from '../../../../../system/logger.scope';
 import type { GitHubGitProviderInternal } from '../githubGitProvider';
+import { stripOrigin } from '../githubGitProvider';
 
 const emptyPagedResult: PagedResult<any> = Object.freeze({ values: [] });
 
@@ -113,4 +114,33 @@ export class TagsGitSubProvider implements GitTagsSubProvider {
 
 		return result;
 	}
+
+	@log()
+	async getTagsWithCommit(
+		repoPath: string,
+		commit: string,
+		options?: { commitDate?: Date; mode?: 'contains' | 'pointsAt' },
+	): Promise<string[]> {
+		if (repoPath == null || options?.commitDate == null) return [];
+
+		const scope = getLogScope();
+
+		try {
+			const { metadata, github, session } = await this.provider.ensureRepositoryContext(repoPath);
+
+			const tags = await github.getTagsWithCommit(
+				session.accessToken,
+				metadata.repo.owner,
+				metadata.repo.name,
+				stripOrigin(commit),
+				options?.commitDate,
+			);
+
+			return tags;
+		} catch (ex) {
+			Logger.error(ex, scope);
+			debugger;
+			return [];
+		}
+	}
 }