Improves loading performance of the Commits view

Author: eamodio

src/views/nodes/branchNode.ts

@@ -5,6 +5,7 @@ import type { ViewShowBranchComparison } from '../../config';
 import { GlyphChars } from '../../constants';
 import type { Colors } from '../../constants.colors';
 import type { Container } from '../../container';
+import type { GitRepositoryService } from '../../git/gitRepositoryService';
 import type { GitUri } from '../../git/gitUri';
 import { unknownGitUri } from '../../git/gitUri';
 import type { GitBranch } from '../../git/models/branch';
@@ -223,15 +224,13 @@ export class BranchNode
 			const [
 				logResult,
 				getBranchAndTagTipsResult,
-				statusResult,
 				pausedOpStatusResult,
 				unpublishedCommitsResult,
 				baseResult,
 				targetResult,
 			] = await Promise.allSettled([
-				this.getLog(),
+				this.getLog(svc),
 				svc.getBranchesAndTagsTipsLookup(branch.name),
-				this.options.showStatus && branch.current ? svc.status.getStatus() : undefined,
 				this.options.showStatus && branch.current ? svc.status.getPausedOperationStatus?.() : undefined,
 				!branch.remote
 					? getBranchAheadRange(svc, branch).then(range =>
@@ -253,7 +252,6 @@ export class BranchNode
 
 			const children = [];
 
-			const status = getSettledValue(statusResult);
 			const pausedOpsStatus = getSettledValue(pausedOpStatusResult);
 			const unpublishedCommits = new Set(getSettledValue(unpublishedCommitsResult));
 
@@ -262,17 +260,7 @@ export class BranchNode
 			}
 
 			if (pausedOpsStatus != null) {
-				children.push(
-					new PausedOperationStatusNode(
-						this.view,
-						this,
-						branch,
-						pausedOpsStatus,
-						status ??
-							(await this.view.container.git.getRepositoryService(this.uri.repoPath!).status.getStatus()),
-						this.root,
-					),
-				);
+				children.push(new PausedOperationStatusNode(this.view, this, branch, pausedOpsStatus, this.root));
 			} else if (this.options.showTracking) {
 				const status = {
 					ref: branch.ref,
@@ -471,7 +459,7 @@ export class BranchNode
 	}
 
 	private _log: GitLog | undefined;
-	private async getLog() {
+	private async getLog(svc: GitRepositoryService): Promise<GitLog | undefined> {
 		if (this._log == null) {
 			let limit =
 				this.limit ??
@@ -484,14 +472,12 @@ export class BranchNode
 				limit = Math.min(ahead + 1, limit * 2);
 			}
 
-			this._log = await this.view.container.git
-				.getRepositoryService(this.uri.repoPath!)
-				.commits.getLog(this.ref.ref, {
-					limit: limit,
-					authors: this.options?.authors,
-					merges: this.options?.showMergeCommits,
-					stashes: this.options?.showStashes,
-				});
+			this._log = await svc.commits.getLog(this.ref.ref, {
+				limit: limit,
+				authors: this.options?.authors,
+				merges: this.options?.showMergeCommits,
+				stashes: this.options?.showStashes,
+			});
 		}
 
 		return this._log;
@@ -503,11 +489,8 @@ export class BranchNode
 
 	@gate()
 	async loadMore(limit?: number | { until?: any }): Promise<void> {
-		let log = await window.withProgress(
-			{
-				location: { viewId: this.view.id },
-			},
-			() => this.getLog(),
+		let log = await window.withProgress({ location: { viewId: this.view.id } }, () =>
+			this.getLog(this.view.container.git.getRepositoryService(this.uri.repoPath!)),
 		);
 		if (!log?.hasMore) return;
 

src/views/nodes/pausedOperationStatusNode.ts

@@ -6,6 +6,7 @@ import type { GitPausedOperationStatus } from '../../git/models/pausedOperationS
 import type { GitStatus } from '../../git/models/status';
 import { pausedOperationStatusStringsByType } from '../../git/utils/pausedOperationStatus.utils';
 import { getReferenceLabel } from '../../git/utils/reference.utils';
+import { Lazy } from '../../system/lazy';
 import { pluralize } from '../../system/string';
 import type { ViewsWithCommits } from '../viewBase';
 import { createViewDecorationUri } from '../viewDecorationProvider';
@@ -14,29 +15,44 @@ import { MergeConflictFilesNode } from './mergeConflictFilesNode';
 import { RebaseCommitNode } from './rebaseCommitNode';
 
 export class PausedOperationStatusNode extends ViewNode<'paused-operation-status', ViewsWithCommits> {
+	private _status: GitStatus | undefined;
+	private readonly _lazyStatus: Lazy<GitStatus | Promise<GitStatus | undefined> | undefined>;
+
 	constructor(
 		view: ViewsWithCommits,
 		protected override readonly parent: ViewNode,
 		public readonly branch: GitBranch,
 		public readonly pausedOpStatus: GitPausedOperationStatus,
-		public readonly status: GitStatus | undefined,
 		// Specifies that the node is shown as a root
 		public readonly root: boolean,
+		status?: GitStatus | undefined,
 	) {
 		super('paused-operation-status', GitUri.fromRepoPath(pausedOpStatus.repoPath), view, parent);
 
 		this.updateContext({ branch: branch, root: root, pausedOperation: pausedOpStatus.type });
 		this._uniqueId = getViewNodeId(this.type, this.context);
+
+		this._status = status;
+		this._lazyStatus = new Lazy<GitStatus | Promise<GitStatus | undefined> | undefined>(
+			() =>
+				status ??
+				this.view.container.git
+					.getRepositoryService(this.repoPath)
+					.status.getStatus()
+					.then(s => (this._status = s)),
+		);
 	}
 
 	get repoPath(): string {
 		return this.uri.repoPath!;
 	}
 
 	async getChildren(): Promise<ViewNode[]> {
+		const status = await this._lazyStatus.value;
+
 		if (this.pausedOpStatus.type !== 'rebase') {
-			return this.status?.hasConflicts
-				? [new MergeConflictFilesNode(this.view, this, this.pausedOpStatus, this.status.conflicts)]
+			return status?.hasConflicts
+				? [new MergeConflictFilesNode(this.view, this, this.pausedOpStatus, status.conflicts)]
 				: [];
 		}
 
@@ -55,17 +71,19 @@ export class PausedOperationStatusNode extends ViewNode<'paused-operation-status
 			}
 		}
 
-		if (this.status?.hasConflicts) {
-			children.push(new MergeConflictFilesNode(this.view, this, this.pausedOpStatus, this.status.conflicts));
+		if (status?.hasConflicts) {
+			children.push(new MergeConflictFilesNode(this.view, this, this.pausedOpStatus, status.conflicts));
 		}
 
 		return children;
 	}
 
-	getTreeItem(): TreeItem {
-		const hasConflicts = this.status?.hasConflicts === true;
+	async getTreeItem(): Promise<TreeItem> {
+		const status = await this._lazyStatus.value;
+
+		const hasConflicts = status?.hasConflicts === true;
 		const hasChildren =
-			this.status?.hasConflicts ||
+			status?.hasConflicts ||
 			(this.pausedOpStatus.type === 'rebase' &&
 				this.pausedOpStatus.steps.total > 0 &&
 				this.pausedOpStatus.steps.current.commit != null);
@@ -91,7 +109,7 @@ export class PausedOperationStatusNode extends ViewNode<'paused-operation-status
 				break;
 		}
 
-		item.description = hasConflicts ? pluralize('conflict', this.status.conflicts.length) : undefined;
+		item.description = hasConflicts ? pluralize('conflict', status.conflicts.length) : undefined;
 
 		const iconColor: Colors = hasConflicts
 			? 'gitlens.decorations.statusMergingOrRebasingConflictForegroundColor'
@@ -108,7 +126,7 @@ export class PausedOperationStatusNode extends ViewNode<'paused-operation-status
 	}
 
 	private get label(): string {
-		const hasConflicts = this.status?.hasConflicts === true;
+		const hasConflicts = this._status?.hasConflicts === true;
 
 		if (this.pausedOpStatus.type !== 'rebase') {
 			const strings = pausedOperationStatusStringsByType[this.pausedOpStatus.type];
@@ -136,17 +154,16 @@ export class PausedOperationStatusNode extends ViewNode<'paused-operation-status
 	}
 
 	private get tooltip(): MarkdownString {
-		const hasConflicts = this.status?.hasConflicts === true;
+		const status = this._status;
+		const hasConflicts = status?.hasConflicts === true;
 
 		let tooltip;
 		if (this.pausedOpStatus.type !== 'rebase') {
 			const strings = pausedOperationStatusStringsByType[this.pausedOpStatus.type];
 			tooltip = `${strings.label} ${getReferenceLabel(this.pausedOpStatus.incoming, { label: false })} ${
 				strings.directionality
 			} ${getReferenceLabel(this.pausedOpStatus.current, { label: false })}${
-				hasConflicts
-					? `\n\nResolve ${pluralize('conflict', this.status.conflicts.length)} before continuing`
-					: ''
+				hasConflicts ? `\n\nResolve ${pluralize('conflict', status.conflicts.length)} before continuing` : ''
 			}`;
 		} else {
 			const started = this.pausedOpStatus.steps.total > 0;
@@ -161,7 +178,7 @@ export class PausedOperationStatusNode extends ViewNode<'paused-operation-status
 							this.pausedOpStatus.steps.total
 					  }${
 							hasConflicts
-								? `\\\nResolve ${pluralize('conflict', this.status.conflicts.length)} before continuing`
+								? `\\\nResolve ${pluralize('conflict', status.conflicts.length)} before continuing`
 								: ''
 					  }`
 					: ''

src/views/nodes/repositoryNode.ts

@@ -98,7 +98,7 @@ export class RepositoryNode extends SubscribeableViewNode<'repository', ViewsWit
 
 				const pausedOpStatus = await this.repo.git.status.getPausedOperationStatus?.();
 				if (pausedOpStatus != null) {
-					children.push(new PausedOperationStatusNode(this.view, this, branch, pausedOpStatus, status, true));
+					children.push(new PausedOperationStatusNode(this.view, this, branch, pausedOpStatus, true, status));
 				} else if (this.view.config.showUpstreamStatus) {
 					if (status.upstream) {
 						if (!status.upstream.state.behind && !status.upstream.state.ahead) {