Optimizes commit signature detection

 - Adds a lightweight method to check for commit signatures
 - Adds short ttl caching to signature check results
 - Adopts the lightweight check in hovers and views

Author: eamodio

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

@@ -1309,7 +1309,12 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 
 		try {
 			const result = await this.git.exec(
-				{ cwd: repoPath, errors: 'ignore', configs: gitConfigsLog },
+				{
+					cwd: repoPath,
+					errors: 'ignore',
+					caching: { cache: this.cache.gitResults, options: { accessTTL: 60 * 1000 } },
+					configs: gitConfigsLog,
+				},
 				'log',
 				`--format=${signatureFormat}`,
 				'-1',
@@ -1324,6 +1329,28 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 			return undefined;
 		}
 	}
+
+	@log()
+	async isCommitSigned(repoPath: string, sha: string): Promise<boolean> {
+		const scope = getLogScope();
+
+		try {
+			const result = await this.git.exec(
+				{
+					cwd: repoPath,
+					errors: 'ignore',
+					caching: { cache: this.cache.gitResults, options: { accessTTL: 60 * 1000 } },
+				},
+				'cat-file',
+				'commit',
+				sha,
+			);
+			return /^gpgsig(-sha256)? /m.test(result.stdout);
+		} catch (ex) {
+			Logger.error(ex, scope);
+			return false;
+		}
+	}
 }
 
 function createCommit(

src/git/gitProvider.ts

@@ -391,8 +391,8 @@ export interface GitCommitsSubProvider {
 		rev: string,
 		cancellation?: CancellationToken,
 	): Promise<GitCommitReachability | undefined>;
-
 	getCommitSignature?(repoPath: string, sha: string): Promise<CommitSignature | undefined>;
+	isCommitSigned?(repoPath: string, sha: string): Promise<boolean>;
 }
 
 export interface GitOperationsSubProvider {

src/git/models/commit.ts

@@ -59,6 +59,7 @@ export class GitCommit implements GitRevisionReference {
 	private _stashUntrackedFilesLoaded = false;
 	private _recomputeStats = false;
 	private _signature: CommitSignature | undefined | null;
+	private _signed: boolean | undefined;
 
 	readonly lines: GitCommitLine[];
 	readonly ref: string;
@@ -601,6 +602,15 @@ export class GitCommit implements GitRevisionReference {
 		return this._signature ?? undefined;
 	}
 
+	async isSigned(): Promise<boolean> {
+		if (this.isUncommitted) return false;
+		if (this._signed != null) return this._signed;
+
+		this._signed =
+			(await this.container.git.getRepositoryService(this.repoPath).commits.isCommitSigned?.(this.sha)) ?? false;
+		return this._signed;
+	}
+
 	async getCommitForFile(file: string | GitFile, staged?: boolean): Promise<GitCommit | undefined> {
 		const path = typeof file === 'string' ? this.container.git.getRelativePath(file, this.repoPath) : file.path;
 		const foundFile = await this.findFile(path, staged);

src/hovers/hovers.ts

@@ -251,7 +251,7 @@ export async function detailsMessage(
 		presenceResult,
 		previousLineComparisonUrisResult,
 		_fullDetailsResult,
-		signatureResult,
+		signedResult,
 	] = await Promise.allSettled([
 		enhancedAutolinks
 			? pauseOnCancelOrTimeoutMapTuplePromise(
@@ -278,9 +278,7 @@ export async function detailsMessage(
 			? commit.getPreviousComparisonUrisForRange(editorLineToDiffRange(editorLine), uri.sha)
 			: undefined,
 		commit.message == null ? commit.ensureFullDetails() : undefined,
-		showSignature
-			? pauseOnCancelOrTimeout(commit.getSignature(), options?.cancellation, options?.timeout)
-			: undefined,
+		showSignature ? commit.isSigned() : undefined,
 	]);
 
 	if (options?.cancellation?.isCancellationRequested) return undefined;
@@ -289,7 +287,7 @@ export async function detailsMessage(
 	const pr = getSettledValue(prResult);
 	const presence = getSettledValue(presenceResult);
 	const previousLineComparisonUris = getSettledValue(previousLineComparisonUrisResult);
-	const signature = getSettledValue(signatureResult);
+	const signed = getSettledValue(signedResult);
 
 	const details = await CommitFormatter.fromTemplateAsync(
 		options.format,
@@ -308,7 +306,7 @@ export async function detailsMessage(
 			previousLineComparisonUris: previousLineComparisonUris,
 			outputFormat: 'markdown',
 			remotes: remotes,
-			signed: signature?.value != null,
+			signed: signed,
 		},
 	);
 

src/views/nodes/commitNode.ts

@@ -275,7 +275,7 @@ export class CommitNode extends ViewRefNode<'commit', ViewsWithCommits | FileHis
 				allowFilteredFiles: this._options.allowFilteredFiles,
 				include: { stats: true },
 			}),
-			showSignature ? pauseOnCancelOrTimeout(this.commit.getSignature(), cancellation) : undefined,
+			showSignature ? pauseOnCancelOrTimeout(this.commit.isSigned(), cancellation) : undefined,
 		]);
 
 		if (cancellation.isCancellationRequested) return undefined;

src/webviews/plus/graph/graphWebview.ts

@@ -1025,17 +1025,17 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			CommitFormatter.has(template, 'signature');
 
 		const svc = this.container.git.getRepositoryService(commit.repoPath);
-		const [remotesResult, _, signatureResult] = await Promise.allSettled([
+		const [remotesResult, _, signedResult] = await Promise.allSettled([
 			svc.remotes.getBestRemotesWithProviders(),
 			commit.ensureFullDetails({ include: { stats: true } }),
-			showSignature ? pauseOnCancelOrTimeout(commit.getSignature(), cancellation) : undefined,
+			showSignature ? commit.isSigned() : undefined,
 		]);
 
 		if (cancellation.isCancellationRequested) throw new CancellationError();
 
 		const remotes = getSettledValue(remotesResult, []);
 		const [remote] = remotes;
-		const signature = getSettledValue(signatureResult);
+		const signed = getSettledValue(signedResult);
 
 		let enrichedAutolinks;
 		let pr;
@@ -1070,7 +1070,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 				pullRequest: pr,
 				outputFormat: 'markdown',
 				remotes: remotes,
-				signed: signature?.value != null,
+				signed: signed,
 				// unpublished: this.unpublished,
 			},
 		);