Skip to content

Commit 3d90a0e

Browse files
authored
Merge branch 'master' into commit-dir-changes
2 parents db6c180 + 3048c2a commit 3d90a0e

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ Example:
105105
|`svn.sourceControl.combineExternalIfSameServer`|Combine the svn external in the main if is from the same server.|`false`|
106106
|`svn.sourceControl.countUnversioned`|Allow to count unversioned files in status count|`true`|
107107
|`svn.sourceControl.countIgnoreOnCommit`|Allow to count ignored files to commit in status count|`false`|
108+
|`svn.sourceControl.hideUnversioned`|Hide unversioned files in Source Control UI|`false`|
108109
|`svn.log.length`|Number of commit messages to log|`50`|
109110
|`svn.showOutput`|Show the output window when the extension starts|`false`|
110111
|`svn.conflicts.autoResolve`|Set file to status resolved after fix conflictss|`false`|

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,11 @@
741741
"type": "number",
742742
"description": "Set the interval in seconds to check changed files on remote repository and show in statusbar. 0 to disable",
743743
"default": 300
744+
},
745+
"svn.sourceControl.hideUnversioned": {
746+
"type": "boolean",
747+
"description": "Hide unversioned files in Source Control UI",
748+
"default": false
744749
}
745750
}
746751
}

src/repository.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,10 @@ export class Repository {
372372
);
373373
});
374374

375+
const hideUnversioned = configuration.get<boolean>(
376+
"sourceControl.hideUnversioned"
377+
);
378+
375379
for (const status of statusesRepository) {
376380
if (status.path === ".") {
377381
this.isIncomplete = status.status === Status.INCOMPLETE;
@@ -434,6 +438,10 @@ export class Repository {
434438
} else if (status.status === Status.CONFLICTED) {
435439
conflicts.push(resource);
436440
} else if (status.status === Status.UNVERSIONED) {
441+
if (hideUnversioned) {
442+
continue;
443+
}
444+
437445
const matches = status.path.match(
438446
/(.+?)\.(mine|working|merge-\w+\.r\d+|r\d+)$/
439447
);

0 commit comments

Comments
 (0)