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

💄

Browse Source
This commit is contained in:
Joao Moreno
2019-10-25 15:19:30 +02:00
parent a8b09d4711
commit 179154d3f5
1 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/git/src/repository.ts
View File

@@ -1521,29 +1521,11 @@ export class Repository implements Disposable {
: undefined;
switch (raw.x + raw.y) {
case '??':
switch (handleUntracked) {
case 'withchanges':
return workingTree.push(
new Resource(
ResourceGroupType.WorkingTree,
uri,
Status.UNTRACKED,
useIcons
)
);
case 'separate':
return untracked.push(
new Resource(
ResourceGroupType.Untracked,
uri,
Status.UNTRACKED,
useIcons
)
);
case 'hide':
return undefined;
}
case '??': switch (handleUntracked) {
case 'withchanges': return workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.UNTRACKED, useIcons));
case 'separate': return untracked.push(new Resource(ResourceGroupType.Untracked, uri, Status.UNTRACKED, useIcons));
default: return undefined;
}
case '!!': return workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.IGNORED, useIcons));
case 'DD': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.BOTH_DELETED, useIcons));
case 'AU': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.ADDED_BY_US, useIcons));
@@ -1567,6 +1549,7 @@ export class Repository implements Disposable {
case 'D': workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.DELETED, useIcons, renameUri)); break;
case 'A': workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.INTENT_TO_ADD, useIcons, renameUri)); break;
}
return undefined;
});