Skip to content

Avoids extra repo creation during discovery #3663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Avoids extra repo creation during discovery #3663

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions src/env/node/git/localGitProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ import type {
GraphItemRefGroupContext,
GraphTagContextValue,
} from '../../../plus/webviews/graph/protocol';
import { asRepoComparisonKey } from '../../../repositories';
import { countStringLength, filterMap } from '../../../system/array';
import { gate } from '../../../system/decorators/gate';
import { debug, log } from '../../../system/decorators/log';
Expand Down Expand Up @@ -721,6 +722,26 @@ export class LocalGitProvider implements GitProvider, Disposable {
let rootPath;
let canonicalRootPath;

function maybeAddRepo(this: LocalGitProvider, uri: Uri, folder: WorkspaceFolder | undefined, root: boolean) {
const comparisonId = asRepoComparisonKey(uri);
if (repositories.some(r => r.id === comparisonId)) {
Logger.log(scope, `found ${root ? 'root ' : ''}repository in '${uri.fsPath}'; skipping - duplicate`);
return;
}

const repo = this.container.git.getRepository(uri);
if (repo != null) {
if (repo.closed && silent === false) {
repo.closed = false;
}
Logger.log(scope, `found ${root ? 'root ' : ''}repository in '${uri.fsPath}'; skipping - already open`);
return;
}

Logger.log(scope, `found ${root ? 'root ' : ''}repository in '${uri.fsPath}'`);
repositories.push(...this.openRepository(folder, uri, root, undefined, silent));
}

const uri = await this.findRepositoryUri(rootUri, true);
if (uri != null) {
rootPath = normalizePath(uri.fsPath);
Expand All @@ -730,8 +751,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
canonicalRootPath = normalizePath(canonicalUri.fsPath);
}

Logger.log(scope, `found root repository in '${uri.fsPath}'`);
repositories.push(...this.openRepository(folder, uri, true, undefined, silent));
maybeAddRepo.call(this, uri, folder, true);
}

if (depth <= 0 || cancellation?.isCancellationRequested) return repositories;
Expand Down Expand Up @@ -788,8 +808,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
const rp = await this.findRepositoryUri(Uri.file(p), true);
if (rp == null) continue;

Logger.log(scope, `found repository in '${rp.fsPath}'`);
repositories.push(...this.openRepository(folder, rp, false, undefined, silent));
maybeAddRepo.call(this, rp, folder, false);
}

return repositories;
Expand Down
Loading