Skip to content

Commit 4dc54fa

Browse files
committed
fixes #82
1 parent c6b6977 commit 4dc54fa

File tree

4 files changed

+26
-39
lines changed

4 files changed

+26
-39
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# **v1.5.0 UNDER DEVELOPMENT**
22

3+
# **v1.4.6**
4+
5+
## Bug Fixes
6+
7+
* @JohnstonCode fixed #82. Checks encoding guess is above 0.8 confidance
8+
39
# **v1.4.5**
410

511
## Bug Fixes
@@ -58,7 +64,7 @@
5864
* "svn.multipleFolders.enabled" : Allow to find subfolders using SVN
5965
* "svn.layout.depth" : Maximum depth to find subfolders using SVN
6066
* "svn.multipleFolders.ignore" : Folders to ignore using SVN (Ex.:
61-
'\**/vendor', '\**/node_modules')
67+
'\*\*/vendor', '\*\*/node_modules')
6268
* @edgardmessias Added support for enable/disable without reload window,
6369

6470
## Bug Fixes

package.json

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "svn-scm",
33
"displayName": "SVN",
44
"description": "Integrated Subversion source control",
5-
"version": "1.4.5",
5+
"version": "1.4.6",
66
"publisher": "johnstoncode",
77
"engines": {
88
"vscode": "^1.17.0"
@@ -16,18 +16,9 @@
1616
"bugs": {
1717
"url": "https://github.com/JohnstonCode/svn-scm/issues"
1818
},
19-
"categories": [
20-
"Other",
21-
"SCM Providers"
22-
],
23-
"keywords": [
24-
"multi-root ready",
25-
"scm",
26-
"svn"
27-
],
28-
"activationEvents": [
29-
"*"
30-
],
19+
"categories": ["Other", "SCM Providers"],
20+
"keywords": ["multi-root ready", "scm", "svn"],
21+
"activationEvents": ["*"],
3122
"main": "./out/extension",
3223
"scripts": {
3324
"vscode:prepublish": "tsc -p ./",
@@ -151,41 +142,33 @@
151142
"default": true
152143
},
153144
"svn.path": {
154-
"type": [
155-
"string",
156-
"null"
157-
],
145+
"type": ["string", "null"],
158146
"description": "Path to the svn executable",
159147
"default": null,
160148
"isExecutable": true
161149
},
162150
"svn.diff.withHead": {
163151
"type": "boolean",
164-
"description": "Show diff changes using latest revision in the repository. Set false to use latest revision in local folder",
152+
"description":
153+
"Show diff changes using latest revision in the repository. Set false to use latest revision in local folder",
165154
"default": true
166155
},
167156
"svn.layout.trunk": {
168-
"type": [
169-
"string",
170-
"null"
171-
],
172-
"description": "Relative path for 'trunk' in SVN URL, 'null' to disable. (Ex.: 'trunk', 'main')",
157+
"type": ["string", "null"],
158+
"description":
159+
"Relative path for 'trunk' in SVN URL, 'null' to disable. (Ex.: 'trunk', 'main')",
173160
"default": "trunk"
174161
},
175162
"svn.layout.branches": {
176-
"type": [
177-
"string",
178-
"null"
179-
],
180-
"description": "Relative path for 'branches' in SVN URL, 'null' to disable. (Ex.: 'branches', 'versions')",
163+
"type": ["string", "null"],
164+
"description":
165+
"Relative path for 'branches' in SVN URL, 'null' to disable. (Ex.: 'branches', 'versions')",
181166
"default": "branches"
182167
},
183168
"svn.layout.tags": {
184-
"type": [
185-
"string",
186-
"null"
187-
],
188-
"description": "Relative path for 'tags' in SVN URL, 'null' to disable. (Ex.: 'tags', 'stamps')",
169+
"type": ["string", "null"],
170+
"description":
171+
"Relative path for 'tags' in SVN URL, 'null' to disable. (Ex.: 'tags', 'stamps')",
189172
"default": "tags"
190173
},
191174
"svn.multipleFolders.enabled": {

src/svn.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ export class Svn {
145145
]);
146146

147147
const encodingGuess = jschardet.detect(stdout);
148-
const encoding = iconv.encodingExists(encodingGuess.encoding)
149-
? encodingGuess.encoding
150-
: "utf8";
148+
149+
const encoding =
150+
encodingGuess.confidence > 0.8 ? encodingGuess.encoding : "utf8";
151151

152152
stdout = iconv.decode(stdout, encoding);
153153

test.py

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)