git: improved multirepo model

This commit is contained in:
Joao Moreno
2017-08-18 17:35:24 +02:00
parent a01de65061
commit 93011ff01c
4 changed files with 111 additions and 52 deletions

View File

@@ -9,7 +9,6 @@ import * as nls from 'vscode-nls';
const localize = nls.config(process.env.VSCODE_NLS_CONFIG)();
import { ExtensionContext, workspace, window, Disposable, commands, Uri } from 'vscode';
import { findGit, Git, IGit } from './git';
import { Repository } from './repository';
import { Model } from './model';
import { CommandCenter } from './commands';
import { GitContentProvider } from './contentProvider';
@@ -33,7 +32,7 @@ async function init(context: ExtensionContext, disposables: Disposable[]): Promi
const askpass = new Askpass();
const env = await askpass.getEnv();
const git = new Git({ gitPath: info.path, version: info.version, env });
const model = new Model();
const model = new Model(git);
disposables.push(model);
if (!enabled) {
@@ -42,13 +41,6 @@ async function init(context: ExtensionContext, disposables: Disposable[]): Promi
return;
}
for (const folder of workspace.workspaceFolders || []) {
const repositoryRoot = await git.getRepositoryRoot(folder.uri.fsPath);
const repository = new Repository(git.open(repositoryRoot));
model.register(repository);
}
outputChannel.appendLine(localize('using git', "Using git {0} from {1}", info.version, info.path));
const onOutput = str => outputChannel.append(str);
@@ -63,7 +55,6 @@ async function init(context: ExtensionContext, disposables: Disposable[]): Promi
commandCenter,
contentProvider,
// autoFetcher,
// repository
);
await checkGitVersion(info);