Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 20:13:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

more submodule support, diff colorization

Browse Source
This commit is contained in:
Joao Moreno
2017-12-13 16:21:12 +01:00
parent 0cd53b2d9b
commit 9f131c1762
10 changed files with 455 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
extensions/git/src/commands.ts
View File

@@ -169,14 +169,33 @@ export class CommandCenter {
}
private async _openResource(resource: Resource, preview?: boolean, preserveFocus?: boolean, preserveSelection?: boolean): Promise<void> {
const stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
let stat: Stats | undefined;
if (stat.isDirectory()) {
return;
try {
stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
} catch (err) {
// noop
}
const left = await this.getLeftResource(resource);
const right = await this.getRightResource(resource);
let left: Uri | undefined;
let right: Uri | undefined;
if (stat && stat.isDirectory()) {
outer:
for (const repository of this.model.repositories) {
for (const submodule of repository.submodules) {
const submodulePath = path.join(repository.root, submodule.path);
if (submodulePath === resource.resourceUri.fsPath) {
right = toGitUri(Uri.file(submodulePath), resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
break outer;
}
}
}
} else {
left = await this.getLeftResource(resource);
right = await this.getRightResource(resource);
}
const title = this.getTitle(resource);
@@ -1697,7 +1716,7 @@ export class CommandCenter {
const isSingleResource = arg instanceof Uri;
const groups = resources.reduce((result, resource) => {
const repository = this.model.getRepository(resource);
const repository = this.model.getRepository(resource, true);
if (!repository) {
console.warn('Could not find git repository for ', resource);