Adds more advanced data for contributor stats

eamodio · eamodio · commit fe9f7322b6a8 · 2025-04-28T18:19:42.000-04:00
diff --git a/src/env/node/git/sub-providers/branches.ts b/src/env/node/git/sub-providers/branches.ts
@@ -270,7 +270,7 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 			let latestCommitTimestamp;
 
 			for (const c of contributors) {
-				totalCommits += c.commits;
+				totalCommits += c.contributionCount;
 				totalFiles += c.stats?.files ?? 0;
 				totalAdditions += c.stats?.additions ?? 0;
 				totalDeletions += c.stats?.deletions ?? 0;
diff --git a/src/env/node/git/sub-providers/contributors.ts b/src/env/node/git/sub-providers/contributors.ts
@@ -29,7 +29,13 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 	async getContributors(
 		repoPath: string,
 		rev?: string | undefined,
-		options?: { all?: boolean; merges?: boolean | 'first-parent'; stats?: boolean },
+		options?: {
+			all?: boolean;
+			merges?: boolean | 'first-parent';
+			pathspec?: string;
+			since?: string;
+			stats?: boolean;
+		},
 	): Promise<GitContributor[]> {
 		if (repoPath == null) return [];
 
@@ -38,7 +44,13 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 			key += ':all';
 		}
 		if (options?.merges) {
-			key += `:merges:${options.merges}`;
+			key += `:merges=${options.merges}`;
+		}
+		if (options?.pathspec) {
+			key += `:pathspec=${options.pathspec}`;
+		}
+		if (options?.since) {
+			key += `:since=${options.since}`;
 		}
 		if (options?.stats) {
 			key += ':stats';
@@ -67,12 +79,24 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 						args.push('--all', '--single-worktree');
 					}
 
+					if (options?.since) {
+						args.push(`--since="${options.since}"`);
+					}
+
+					if (rev && !isUncommittedStaged(rev)) {
+						args.push(rev);
+					}
+
+					if (options?.pathspec) {
+						args.push('--', options.pathspec);
+					} else {
+						args.push('--');
+					}
+
 					const result = await this.git.exec(
 						{ cwd: repoPath, configs: gitLogDefaultConfigs },
 						'log',
 						...args,
-						rev && !isUncommittedStaged(rev) ? rev : undefined,
-						'--',
 					);
 
 					const contributors = new Map<string, GitContributor>();
@@ -89,25 +113,43 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 								c.email,
 								isUserMatch(currentUser, c.author, c.email),
 								1,
+								[
+									{
+										sha: c.sha,
+										date: new Date(timestamp),
+										message: c.message,
+										files: c.stats?.files,
+										additions: c.stats?.additions,
+										deletions: c.stats?.deletions,
+									},
+								],
 								new Date(timestamp),
 								new Date(timestamp),
 								c.stats
-									? {
-											...c.stats,
-											contributionScore: calculateContributionScore(c.stats, timestamp),
-									  }
+									? { ...c.stats, contributionScore: calculateContributionScore(c.stats, timestamp) }
 									: undefined,
 							);
 							contributors.set(key, contributor);
 						} else {
-							contributor.commits++;
+							contributor.contributionCount++;
 							const date = new Date(timestamp);
 							if (date > contributor.latestCommitDate!) {
 								contributor.latestCommitDate = date;
 							}
 							if (date < contributor.firstCommitDate!) {
 								contributor.firstCommitDate = date;
 							}
+
+							contributor.contributions ??= [];
+							contributor.contributions.push({
+								sha: c.sha,
+								date: new Date(timestamp),
+								message: c.message,
+								files: c.stats?.files,
+								additions: c.stats?.additions,
+								deletions: c.stats?.deletions,
+							});
+
 							if (options?.stats && c.stats != null) {
 								if (contributor.stats == null) {
 									contributor.stats = {
diff --git a/src/git/gitProvider.ts b/src/git/gitProvider.ts
@@ -355,6 +355,8 @@ export interface GitContributorsSubProvider {
 		options?: {
 			all?: boolean | undefined;
 			merges?: boolean | 'first-parent';
+			pathspec?: string;
+			since?: string;
 			stats?: boolean | undefined;
 		},
 	): Promise<GitContributor[]>;
diff --git a/src/git/models/contributor.ts b/src/git/models/contributor.ts
@@ -16,7 +16,8 @@ export class GitContributor {
 		public readonly name: string,
 		public readonly email: string | undefined,
 		public readonly current: boolean,
-		public readonly commits: number,
+		public readonly contributionCount: number,
+		public readonly contributions?: GitContributorContribution[],
 		public readonly latestCommitDate?: Date,
 		public readonly firstCommitDate?: Date,
 		public readonly stats?: GitContributorStats,
@@ -49,6 +50,12 @@ export class GitContributor {
 	}
 }
 
+interface GitContributorContribution extends Partial<GitCommitStats<number>> {
+	readonly sha: string;
+	readonly date: Date;
+	readonly message: string;
+}
+
 export interface GitContributorStats extends GitCommitStats<number> {
 	readonly contributionScore: number;
 }
diff --git a/src/git/parsers/logParser.ts b/src/git/parsers/logParser.ts
@@ -47,7 +47,7 @@ export function getCommitsLogParser(
 	return _commitsParser;
 }
 
-const contributorsMapping = { sha: '%H', author: '%aN', email: '%aE', date: '%at' };
+const contributorsMapping = { sha: '%H', author: '%aN', email: '%aE', date: '%at', message: '%B' };
 
 type ContributorsLogParser = LogParser<typeof contributorsMapping>;
 let _contributorsParser: ContributorsLogParser | undefined;
diff --git a/src/git/utils/-webview/sorting.ts b/src/git/utils/-webview/sorting.ts
@@ -130,7 +130,7 @@ export function sortContributors(
 				return (
 					pickedCompare ||
 					(options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) ||
-					a.commits - b.commits ||
+					a.contributionCount - b.contributionCount ||
 					(a.latestCommitDate?.getTime() ?? 0) - (b.latestCommitDate?.getTime() ?? 0)
 				);
 			});
@@ -144,7 +144,7 @@ export function sortContributors(
 					pickedCompare ||
 					(options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) ||
 					(b.latestCommitDate?.getTime() ?? 0) - (a.latestCommitDate?.getTime() ?? 0) ||
-					b.commits - a.commits
+					b.contributionCount - a.contributionCount
 				);
 			});
 		case 'date:asc':
@@ -157,7 +157,7 @@ export function sortContributors(
 					pickedCompare ||
 					(options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) ||
 					(a.latestCommitDate?.getTime() ?? 0) - (b.latestCommitDate?.getTime() ?? 0) ||
-					b.commits - a.commits
+					b.contributionCount - a.contributionCount
 				);
 			});
 		case 'name:asc':
@@ -194,7 +194,7 @@ export function sortContributors(
 					pickedCompare ||
 					(options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) ||
 					(b.stats?.contributionScore ?? 0) - (a.stats?.contributionScore ?? 0) ||
-					b.commits - a.commits ||
+					b.contributionCount - a.contributionCount ||
 					(b.latestCommitDate?.getTime() ?? 0) - (a.latestCommitDate?.getTime() ?? 0)
 				);
 			});
@@ -208,7 +208,7 @@ export function sortContributors(
 					pickedCompare ||
 					(options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) ||
 					(a.stats?.contributionScore ?? 0) - (b.stats?.contributionScore ?? 0) ||
-					a.commits - b.commits ||
+					a.contributionCount - b.contributionCount ||
 					(a.latestCommitDate?.getTime() ?? 0) - (b.latestCommitDate?.getTime() ?? 0)
 				);
 			});
@@ -222,7 +222,7 @@ export function sortContributors(
 				return (
 					pickedCompare ||
 					(options.current ? (a.current ? -1 : 1) - (b.current ? -1 : 1) : 0) ||
-					b.commits - a.commits ||
+					b.contributionCount - a.contributionCount ||
 					(b.latestCommitDate?.getTime() ?? 0) - (a.latestCommitDate?.getTime() ?? 0)
 				);
 			});
diff --git a/src/git/utils/contributor.utils.ts b/src/git/utils/contributor.utils.ts
@@ -24,7 +24,7 @@ export const defaultContributorScoreOptions: ContributorScoreOptions = {
 };
 
 export function calculateContributionScore(
-	stats: GitCommitStats<number> | undefined,
+	stats: GitCommitStats | undefined,
 	timestamp: number,
 	options: ContributorScoreOptions = defaultContributorScoreOptions,
 ): number {
diff --git a/src/plus/integrations/providers/github/sub-providers/branches.ts b/src/plus/integrations/providers/github/sub-providers/branches.ts
@@ -240,7 +240,7 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 			let latestCommitTimestamp;
 
 			for (const c of contributors) {
-				totalCommits += c.commits;
+				totalCommits += c.contributionCount;
 				totalFiles += c.stats?.files ?? 0;
 				totalAdditions += c.stats?.additions ?? 0;
 				totalDeletions += c.stats?.deletions ?? 0;
diff --git a/src/plus/integrations/providers/github/sub-providers/contributors.ts b/src/plus/integrations/providers/github/sub-providers/contributors.ts
diff --git a/src/views/nodes/contributorNode.ts b/src/views/nodes/contributorNode.ts
diff --git a/src/webviews/home/homeWebview.ts b/src/webviews/home/homeWebview.ts

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export function getCommitsLogParser(`
`47`	`47`	`return _commitsParser;`
`48`	`48`	`}`
`49`	`49`
`50`		`-const contributorsMapping = { sha: '%H', author: '%aN', email: '%aE', date: '%at' };`
	`50`	`+const contributorsMapping = { sha: '%H', author: '%aN', email: '%aE', date: '%at', message: '%B' };`
`51`	`51`
`52`	`52`	`type ContributorsLogParser = LogParser<typeof contributorsMapping>;`
`53`	`53`	`let _contributorsParser: ContributorsLogParser \| undefined;`