Merge pull request #345 from edgardmessias/fix_280

fix: Fixed badge status count for changelists (Close #280)

Author: JohnstonCode

README.md

@@ -89,6 +89,7 @@ Example:
 |`svn.decorations.enabled`|Controls if SVN contributes colors and badges to the explorer and the open (VSCode \>= 1.18 with proposed-api)|`true`|
 |`svn.path`|Path to the svn executable|`null`|
 |`svn.ignoreMissingSvnWarning`|Ignores the warning when SVN is missing|`false`|
+|`svn.ignoreWorkingCopyIsTooOld`|Ignores the warning when working copy is too old|`false`|
 |`svn.diff.withHead`|Show diff changes using latest revision in the repository. Set false to use latest revision in local folder|`true`|
 |`svn.layout.trunkRegex`|Regex to detect path for 'trunk' in SVN URL, 'null' to disable. (Ex.: '(trunk)', '(main)')|`"(trunk)(/.*)?"`|
 |`svn.layout.trunkRegexName`|Regex group position for name of trunk|`1`|
@@ -101,15 +102,15 @@ Example:
 |`svn.multipleFolders.depth`|Maximum depth to find subfolders using SVN|`4`|
 |`svn.multipleFolders.ignore`|Folders to ignore using SVN|`["**/.git","**/.hg","**/vendor","**/node_modules"]`|
 |`svn.sourceControl.ignoreOnCommit`|Changelists to ignore on commit|`["ignore-on-commit"]`|
+|`svn.sourceControl.ignoreOnStatusCount`|Changelists to ignore on status count|`["ignore-on-commit"]`|
 |`svn.detectExternals`|Controls whether to automatically detect svn externals.|`true`|
 |`svn.sourceControl.combineExternalIfSameServer`|Combine the svn external in the main if is from the same server.|`false`|
 |`svn.sourceControl.countUnversioned`|Allow to count unversioned files in status count|`true`|
-|`svn.sourceControl.countIgnoreOnCommit`|Allow to count ignored files to commit in status count|`false`|
-|`svn.sourceControl.hideUnversioned`|Hide unversioned files in Source Control UI|`false`|
 |`svn.log.length`|Number of commit messages to log|`50`|
 |`svn.showOutput`|Show the output window when the extension starts|`false`|
 |`svn.conflicts.autoResolve`|Set file to status resolved after fix conflictss|`false`|
 |`svn.update.ignoreExternals`|Set to ignore externals definitions on update (add --ignore-externals)|`true`|
 |`svn.default.encoding`|Encoding of svn output if the output is not utf-8. When this parameter is null, the encoding is automatically detected. Example: 'windows-1252'.|`null`|
 |`svn.showUpdateMessage`|Show the update message when update is run|`true`|
 |`svn.remoteChanges.checkFrequency`|Set the interval in seconds to check changed files on remote repository and show in statusbar. 0 to disable|`300`|
+|`svn.sourceControl.hideUnversioned`|Hide unversioned files in Source Control UI|`false`|

package.json

@@ -683,6 +683,13 @@
             "ignore-on-commit"
           ]
         },
+        "svn.sourceControl.ignoreOnStatusCount": {
+          "type": "array",
+          "description": "Changelists to ignore on status count",
+          "default": [
+            "ignore-on-commit"
+          ]
+        },
         "svn.detectExternals": {
           "type": "boolean",
           "default": true,
@@ -698,11 +705,6 @@
           "description": "Allow to count unversioned files in status count",
           "default": true
         },
-        "svn.sourceControl.countIgnoreOnCommit": {
-          "type": "boolean",
-          "description": "Allow to count ignored files to commit in status count",
-          "default": false
-        },
         "svn.log.length": {
           "type": "number",
           "minimum": 1,

src/repository.ts

@@ -517,14 +517,14 @@ export class Repository {
 
     const counts = [this.changes, this.conflicts];
 
-    const countIgnoreOnCommit = configuration.get<boolean>(
-      "sourceControl.countIgnoreOnCommit",
-      false
-    );
     const ignoreOnCommitList = configuration.get<string[]>(
       "sourceControl.ignoreOnCommit"
     );
 
+    const ignoreOnStatusCountList = configuration.get<string[]>(
+      "sourceControl.ignoreOnStatusCount"
+    );
+
     changelists.forEach((resources, changelist) => {
       let group = this.changelists.get(changelist);
       if (!group) {
@@ -541,7 +541,7 @@ export class Repository {
 
       group.resourceStates = resources;
 
-      if (countIgnoreOnCommit && ignoreOnCommitList.includes(changelist)) {
+      if (!ignoreOnStatusCountList.includes(changelist)) {
         counts.push(group);
       }
     });