Refactors Git provider into sub-providers

 - Contributor operations

Author: eamodio

src/commands/quickCommand.steps.ts

@@ -1371,7 +1371,7 @@ export function* pickContributorsStep<
 
 		const items = [];
 
-		for (const c of await state.repo.git.getContributors()) {
+		for (const c of await state.repo.git.contributors().getContributors()) {
 			items.push(
 				await createContributorQuickPickItem(c, message?.includes(c.getCoauthor()), {
 					buttons: [RevealInSideBarQuickInputButton],

src/env/node/git/localGitProvider.ts

@@ -54,9 +54,6 @@ import {
 	getRemoteNameFromBranchName,
 } from '../../../git/models/branch.utils';
 import type { GitCommit, GitStashCommit } from '../../../git/models/commit';
-import type { GitContributorStats } from '../../../git/models/contributor';
-import { GitContributor } from '../../../git/models/contributor';
-import { calculateContributionScore } from '../../../git/models/contributor.utils';
 import type {
 	GitDiff,
 	GitDiffFile,
@@ -114,7 +111,6 @@ import {
 import {
 	createLogParserSingle,
 	createLogParserWithFilesAndStats,
-	getContributorsParser,
 	getGraphParser,
 	getGraphStatsParser,
 	getRefAndDateParser,
@@ -182,6 +178,7 @@ import type { GitLocation } from './locator';
 import { findGitPath, InvalidGitConfigError, UnableToFindGitError } from './locator';
 import { CancelledRunError, fsExists } from './shell';
 import { BranchesGitSubProvider } from './sub-providers/branches';
+import { ContributorsGitSubProvider } from './sub-providers/contributors';
 import { PatchGitSubProvider } from './sub-providers/patch';
 import { RemotesGitSubProvider } from './sub-providers/remotes';
 import { StagingGitSubProvider } from './sub-providers/staging';
@@ -2454,162 +2451,6 @@ export class LocalGitProvider implements GitProvider, Disposable {
 		return this.git.config__set(key, value, repoPath);
 	}
 
-	@log()
-	async getContributorsStats(
-		repoPath: string,
-		options?: { merges?: boolean; since?: string },
-	): Promise<GitContributorStats | undefined> {
-		if (repoPath == null) return undefined;
-
-		const scope = getLogScope();
-
-		const args = ['shortlog', '-s', '--all'];
-		if (!options?.merges) {
-			args.push('--no-merges');
-		}
-		if (options?.since) {
-			args.push(`--since=${options.since}`);
-		}
-
-		try {
-			const data = await this.git.exec<string>({ cwd: repoPath }, ...args);
-			if (data == null) return undefined;
-
-			const contributions = data
-				.split('\n')
-				.map(line => parseInt(line.trim().split('\t', 1)[0], 10))
-				.filter(c => !isNaN(c))
-				.sort((a, b) => b - a);
-
-			const result: GitContributorStats = {
-				count: contributions.length,
-				contributions: contributions,
-			};
-			return result;
-		} catch (ex) {
-			Logger.error(ex, scope);
-			debugger;
-
-			return undefined;
-		}
-	}
-
-	@log()
-	async getContributors(
-		repoPath: string,
-		options?: { all?: boolean; merges?: boolean | 'first-parent'; ref?: string; stats?: boolean },
-	): Promise<GitContributor[]> {
-		if (repoPath == null) return [];
-
-		let key = options?.ref ?? '';
-		if (options?.all) {
-			key += ':all';
-		}
-		if (options?.merges) {
-			key += `:merges:${options.merges}`;
-		}
-		if (options?.stats) {
-			key += ':stats';
-		}
-
-		const contributorsCache = this._cache.contributors?.get(repoPath);
-
-		let contributors = contributorsCache?.get(key);
-		if (contributors == null) {
-			async function load(this: LocalGitProvider) {
-				try {
-					repoPath = normalizePath(repoPath);
-					const currentUser = await this.getCurrentUser(repoPath);
-					const parser = getContributorsParser(options?.stats);
-
-					const args = [...parser.arguments, '--full-history', '--use-mailmap'];
-
-					const merges = options?.merges ?? true;
-					if (merges) {
-						args.push(merges === 'first-parent' ? '--first-parent' : '--no-min-parents');
-					} else {
-						args.push('--no-merges');
-					}
-
-					if (options?.all) {
-						args.push('--all', '--single-worktree');
-					}
-
-					const data = await this.git.log(repoPath, { ref: options?.ref }, ...args);
-
-					const contributors = new Map<string, GitContributor>();
-					const commits = parser.parse(data);
-					for (const c of commits) {
-						const key = `${c.author}|${c.email}`;
-						const timestamp = Number(c.date) * 1000;
-
-						let contributor: Mutable<GitContributor> | undefined = contributors.get(key);
-						if (contributor == null) {
-							contributor = new GitContributor(
-								repoPath,
-								c.author,
-								c.email,
-								1,
-								new Date(timestamp),
-								new Date(timestamp),
-								isUserMatch(currentUser, c.author, c.email),
-								c.stats
-									? {
-											...c.stats,
-											contributionScore: calculateContributionScore(c.stats, timestamp),
-									  }
-									: undefined,
-							);
-							contributors.set(key, contributor);
-						} else {
-							contributor.commits++;
-							const date = new Date(timestamp);
-							if (date > contributor.latestCommitDate!) {
-								contributor.latestCommitDate = date;
-							}
-							if (date < contributor.firstCommitDate!) {
-								contributor.firstCommitDate = date;
-							}
-							if (options?.stats && c.stats != null) {
-								if (contributor.stats == null) {
-									contributor.stats = {
-										...c.stats,
-										contributionScore: calculateContributionScore(c.stats, timestamp),
-									};
-								} else {
-									contributor.stats = {
-										additions: contributor.stats.additions + c.stats.additions,
-										deletions: contributor.stats.deletions + c.stats.deletions,
-										files: contributor.stats.files + c.stats.files,
-										contributionScore:
-											contributor.stats.contributionScore +
-											calculateContributionScore(c.stats, timestamp),
-									};
-								}
-							}
-						}
-					}
-
-					return [...contributors.values()];
-				} catch (_ex) {
-					contributorsCache?.delete(key);
-
-					return [];
-				}
-			}
-
-			contributors = load.call(this);
-
-			if (contributorsCache == null) {
-				this._cache.contributors?.set(repoPath, new Map([[key, contributors]]));
-			} else {
-				contributorsCache.set(key, contributors);
-			}
-		}
-
-		return contributors;
-	}
-
 	@gate()
 	@log()
 	async getCurrentUser(repoPath: string): Promise<GitUser | undefined> {
@@ -4833,6 +4674,11 @@ export class LocalGitProvider implements GitProvider, Disposable {
 		return (this._branches ??= new BranchesGitSubProvider(this.container, this.git, this._cache, this));
 	}
 
+	private _contributors: ContributorsGitSubProvider | undefined;
+	get contributors(): ContributorsGitSubProvider {
+		return (this._contributors ??= new ContributorsGitSubProvider(this.container, this.git, this._cache, this));
+	}
+
 	private _patch: PatchGitSubProvider | undefined;
 	get patch(): PatchGitSubProvider | undefined {
 		return (this._patch ??= new PatchGitSubProvider(this.container, this.git, this));

src/env/node/git/operations/branches.ts

@@ -181,7 +181,7 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 			const mergeBase = await this.getMergeBase(repoPath, ref, baseOrTargetBranch);
 			if (mergeBase == null) return undefined;
 
-			const contributors = await this.provider.getContributors(repoPath, {
+			const contributors = await this.provider.contributors.getContributors(repoPath, {
 				ref: createRevisionRange(mergeBase, ref, '..'),
 				stats: true,
 			});

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

@@ -181,7 +181,7 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 			const mergeBase = await this.getMergeBase(repoPath, ref, baseOrTargetBranch);
 			if (mergeBase == null) return undefined;
 
-			const contributors = await this.provider.getContributors(repoPath, {
+			const contributors = await this.provider.contributors.getContributors(repoPath, {
 				ref: createRevisionRange(mergeBase, ref, '..'),
 				stats: true,
 			});