Fixes timing issues with first time loading

Author: eamodio

src/views/branchesView.ts

@@ -8,7 +8,7 @@ import type { GitCommit } from '../git/models/commit';
 import { isCommit } from '../git/models/commit';
 import type { GitBranchReference, GitRevisionReference } from '../git/models/reference';
 import { getReferenceLabel } from '../git/models/reference';
-import type { Repository, RepositoryChangeEvent } from '../git/models/repository';
+import type { RepositoryChangeEvent } from '../git/models/repository';
 import { groupRepositories, RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository';
 import { getWorktreesByBranch } from '../git/models/worktree';
 import { gate } from '../system/decorators/gate';
@@ -56,22 +56,22 @@ export class BranchesViewNode extends RepositoriesSubscribeableNode<BranchesView
 		this.view.message = undefined;
 
 		if (this.children == null) {
-			let grouped: Map<Repository, Map<string, Repository>> | undefined;
-
-			let repositories = this.view.container.git.openRepositories;
-			if (configuration.get('views.collapseWorktreesWhenPossible')) {
-				grouped = await groupRepositories(repositories);
-				repositories = [...grouped.keys()];
+			if (this.view.container.git.isDiscoveringRepositories) {
+				this.view.message = 'Loading branches...';
+				await this.view.container.git.isDiscoveringRepositories;
 			}
 
+			let repositories = this.view.container.git.openRepositories;
 			if (repositories.length === 0) {
-				this.view.message = this.view.container.git.isDiscoveringRepositories
-					? 'Loading branches...'
-					: 'No branches could be found.';
-
+				this.view.message = 'No branches could be found.';
 				return [];
 			}
 
+			if (configuration.get('views.collapseWorktreesWhenPossible')) {
+				const grouped = await groupRepositories(repositories);
+				repositories = [...grouped.keys()];
+			}
+
 			// Get all the worktree branches (and track if they are opened) to pass along downstream, e.g. in the BranchNode to display an indicator
 			const worktreesByBranch = await getWorktreesByBranch(repositories, { includeDefault: true });
 			this.updateContext({

src/views/commitsView.ts

@@ -125,15 +125,18 @@ export class CommitsRepositoryNode extends RepositoryFolderNode<CommitsView, Bra
 
 export class CommitsViewNode extends RepositoriesSubscribeableNode<CommitsView, CommitsRepositoryNode> {
 	async getChildren(): Promise<ViewNode[]> {
+		this.view.description = this.view.getViewDescription();
+		this.view.message = undefined;
+
 		if (this.children == null) {
-			this.view.description = this.view.getViewDescription();
-			this.view.message = undefined;
+			if (this.view.container.git.isDiscoveringRepositories) {
+				this.view.message = 'Loading commits...';
+				await this.view.container.git.isDiscoveringRepositories;
+			}
 
 			const repositories = this.view.container.git.openRepositories;
 			if (repositories.length === 0) {
-				this.view.message = this.view.container.git.isDiscoveringRepositories
-					? 'Loading commits...'
-					: 'No commits could be found.';
+				this.view.message = 'No commits could be found.';
 
 				return [];
 			}

src/views/contributorsView.ts

@@ -57,7 +57,17 @@ export class ContributorsViewNode extends RepositoriesSubscribeableNode<Contribu
 		this.view.message = undefined;
 
 		if (this.children == null) {
+			if (this.view.container.git.isDiscoveringRepositories) {
+				this.view.message = 'Loading contributors...';
+				await this.view.container.git.isDiscoveringRepositories;
+			}
+
 			let repositories = this.view.container.git.openRepositories;
+			if (repositories.length === 0) {
+				this.view.message = 'No contributors could be found.';
+				return [];
+			}
+
 			if (
 				configuration.get('views.collapseWorktreesWhenPossible') &&
 				configuration.get('views.contributors.showAllBranches')
@@ -66,14 +76,6 @@ export class ContributorsViewNode extends RepositoriesSubscribeableNode<Contribu
 				repositories = [...grouped.keys()];
 			}
 
-			if (repositories.length === 0) {
-				this.view.message = this.view.container.git.isDiscoveringRepositories
-					? 'Loading contributors...'
-					: 'No contributors could be found.';
-
-				return [];
-			}
-
 			const splat = repositories.length === 1;
 			this.children = repositories.map(
 				r => new ContributorsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),

src/views/remotesView.ts

@@ -52,20 +52,22 @@ export class RemotesViewNode extends RepositoriesSubscribeableNode<RemotesView,
 		this.view.message = undefined;
 
 		if (this.children == null) {
-			let repositories = this.view.container.git.openRepositories;
-			if (configuration.get('views.collapseWorktreesWhenPossible')) {
-				const grouped = await groupRepositories(repositories);
-				repositories = [...grouped.keys()];
+			if (this.view.container.git.isDiscoveringRepositories) {
+				this.view.message = 'Loading remotes...';
+				await this.view.container.git.isDiscoveringRepositories;
 			}
 
+			let repositories = this.view.container.git.openRepositories;
 			if (repositories.length === 0) {
-				this.view.message = this.view.container.git.isDiscoveringRepositories
-					? 'Loading remotes...'
-					: 'No remotes could be found.';
-
+				this.view.message = 'No remotes could be found.';
 				return [];
 			}
 
+			if (configuration.get('views.collapseWorktreesWhenPossible')) {
+				const grouped = await groupRepositories(repositories);
+				repositories = [...grouped.keys()];
+			}
+
 			const splat = repositories.length === 1;
 			this.children = repositories.map(
 				r => new RemotesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),

src/views/stashesView.ts

@@ -38,20 +38,22 @@ export class StashesViewNode extends RepositoriesSubscribeableNode<StashesView,
 		this.view.message = undefined;
 
 		if (this.children == null) {
-			let repositories = this.view.container.git.openRepositories;
-			if (configuration.get('views.collapseWorktreesWhenPossible')) {
-				const grouped = await groupRepositories(repositories);
-				repositories = [...grouped.keys()];
+			if (this.view.container.git.isDiscoveringRepositories) {
+				this.view.message = 'Loading stashes...';
+				await this.view.container.git.isDiscoveringRepositories;
 			}
 
+			let repositories = this.view.container.git.openRepositories;
 			if (repositories.length === 0) {
-				this.view.message = this.view.container.git.isDiscoveringRepositories
-					? 'Loading stashes...'
-					: 'No stashes could be found.';
-
+				this.view.message = 'No stashes could be found.';
 				return [];
 			}
 
+			if (configuration.get('views.collapseWorktreesWhenPossible')) {
+				const grouped = await groupRepositories(repositories);
+				repositories = [...grouped.keys()];
+			}
+
 			const splat = repositories.length === 1;
 			this.children = repositories.map(
 				r => new StashesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),

src/views/tagsView.ts

@@ -39,20 +39,22 @@ export class TagsViewNode extends RepositoriesSubscribeableNode<TagsView, TagsRe
 		this.view.message = undefined;
 
 		if (this.children == null) {
-			let repositories = this.view.container.git.openRepositories;
-			if (configuration.get('views.collapseWorktreesWhenPossible')) {
-				const grouped = await groupRepositories(repositories);
-				repositories = [...grouped.keys()];
+			if (this.view.container.git.isDiscoveringRepositories) {
+				this.view.message = 'Loading tags...';
+				await this.view.container.git.isDiscoveringRepositories;
 			}
 
+			let repositories = this.view.container.git.openRepositories;
 			if (repositories.length === 0) {
-				this.view.message = this.view.container.git.isDiscoveringRepositories
-					? 'Loading tags...'
-					: 'No tags could be found.';
-
+				this.view.message = 'No tags could be found.';
 				return [];
 			}
 
+			if (configuration.get('views.collapseWorktreesWhenPossible')) {
+				const grouped = await groupRepositories(repositories);
+				repositories = [...grouped.keys()];
+			}
+
 			const splat = repositories.length === 1;
 			this.children = repositories.map(
 				r => new TagsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),

src/views/worktreesView.ts

@@ -58,20 +58,22 @@ export class WorktreesViewNode extends RepositoriesSubscribeableNode<WorktreesVi
 			const access = await this.view.container.git.access(PlusFeatures.Worktrees);
 			if (access.allowed === false) return [];
 
-			let repositories = this.view.container.git.openRepositories;
-			if (configuration.get('views.collapseWorktreesWhenPossible')) {
-				const grouped = await groupRepositories(repositories);
-				repositories = [...grouped.keys()];
+			if (this.view.container.git.isDiscoveringRepositories) {
+				this.view.message = 'Loading worktrees...';
+				await this.view.container.git.isDiscoveringRepositories;
 			}
 
+			let repositories = this.view.container.git.openRepositories;
 			if (repositories.length === 0) {
-				this.view.message = this.view.container.git.isDiscoveringRepositories
-					? 'Loading worktrees...'
-					: 'No worktrees could be found.';
-
+				this.view.message = 'No worktrees could be found.';
 				return [];
 			}
 
+			if (configuration.get('views.collapseWorktreesWhenPossible')) {
+				const grouped = await groupRepositories(repositories);
+				repositories = [...grouped.keys()];
+			}
+
 			const splat = repositories.length === 1;
 			this.children = repositories.map(
 				r => new WorktreesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),