fix(scm): 🐛 do not await git repo status, just give the repo straight up to scm

joaomoreno · joaomoreno · commit f18b29e13203 · 2021-11-09T15:11:16.000+01:00
on repo discovery, the git extension would run `git status` and wait for that to finish before handing out the repository to scm. this was problematic since the scm default repo selection depends on repos being discovered in a timely fashion. there's no reason not to just hand out the repo to scm and let `git status` finish afterwards Closes: microsoft#120089 Closes: microsoft#113803
diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
@@ -300,7 +300,7 @@ export class Model implements IRemoteSourceProviderRegistry, IPushErrorHandlerRe
 			const repository = new Repository(this.git.open(repositoryRoot, dotGit), this, this, this.globalState, this.outputChannel);
 
 			this.open(repository);
-			await repository.status();
+			repository.status(); // do not await this, we want SCM to know about the repo asap
 		} catch (ex) {
 			// noop
 			this.outputChannel.appendLine(`Opening repository for path='${repoPath}' failed; ex=${ex}`);
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewService.ts b/src/vs/workbench/contrib/scm/browser/scmViewService.ts
@@ -100,8 +100,7 @@ export class SCMViewService implements ISCMViewService {
 	constructor(
 		@ISCMService private readonly scmService: ISCMService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IStorageService private readonly storageService: IStorageService,
-		@ILogService private readonly logService: ILogService
+		@IStorageService private readonly storageService: IStorageService
 	) {
 		this.menus = instantiationService.createInstance(SCMMenus);
 
@@ -123,8 +122,6 @@ export class SCMViewService implements ISCMViewService {
 	}
 
 	private onDidAddRepository(repository: ISCMRepository): void {
-		this.logService.trace('SCMViewService#onDidAddRepository', getProviderStorageKey(repository.provider));
-
 		if (!this.didFinishLoading) {
 			this.eventuallyFinishLoading();
 		}
@@ -135,8 +132,6 @@ export class SCMViewService implements ISCMViewService {
 			const index = this.previousState.all.indexOf(getProviderStorageKey(repository.provider));
 
 			if (index === -1) { // saw a repo we did not expect
-				this.logService.trace('SCMViewService#onDidAddRepository', 'This is a new repository, so we stop the heuristics');
-
 				const added: ISCMRepository[] = [];
 				for (const repo of this.scmService.repositories) { // all should be visible
 					if (!this._visibleRepositoriesSet.has(repo)) {
@@ -179,8 +174,6 @@ export class SCMViewService implements ISCMViewService {
 	}
 
 	private onDidRemoveRepository(repository: ISCMRepository): void {
-		this.logService.trace('SCMViewService#onDidRemoveRepository', getProviderStorageKey(repository.provider));
-
 		if (!this.didFinishLoading) {
 			this.eventuallyFinishLoading();
 		}
@@ -257,7 +250,6 @@ export class SCMViewService implements ISCMViewService {
 
 	@debounce(2000)
 	private eventuallyFinishLoading(): void {
-		this.logService.trace('SCMViewService#eventuallyFinishLoading');
 		this.finishLoading();
 	}
 
@@ -266,7 +258,6 @@ export class SCMViewService implements ISCMViewService {
 			return;
 		}
 
-		this.logService.trace('SCMViewService#finishLoading');
 		this.didFinishLoading = true;
 		this.previousState = undefined;
 	}
