Skip to content

Commit 6c9e3c0

Browse files
JohnstonCodeJohnstonCode
committed
fixed 149
1 parent 13a52a5 commit 6c9e3c0

File tree

3 files changed

+71
-64
lines changed

3 files changed

+71
-64
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# **v1.17.1**
2+
3+
## Bug Fixes
4+
5+
* @JohnstonCode Fixed #149
6+
17
# **v1.17.0**
28

39
## What's New

‎package.json‎

Lines changed: 60 additions & 63 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.17.0",
5+
"version": "1.17.1",
66
"publisher": "johnstoncode",
77
"engines": {
88
"vscode": "^1.17.0"
@@ -17,18 +17,9 @@
1717
"bugs": {
1818
"url": "https://github.com/JohnstonCode/svn-scm/issues"
1919
},
20-
"categories": [
21-
"Other",
22-
"SCM Providers"
23-
],
24-
"keywords": [
25-
"multi-root ready",
26-
"scm",
27-
"svn"
28-
],
29-
"activationEvents": [
30-
"*"
31-
],
20+
"categories": ["Other", "SCM Providers"],
21+
"keywords": ["multi-root ready", "scm", "svn"],
22+
"activationEvents": ["*"],
3223
"main": "./out/extension",
3324
"scripts": {
3425
"vscode:prepublish": "tsc -p ./",
@@ -237,7 +228,8 @@
237228
},
238229
{
239230
"command": "svn.revertSelectedRanges",
240-
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && svnHasSupportToRegisterDiffCommand == 1"
231+
"when":
232+
"config.svn.enabled && svnOpenRepositoryCount != 0 && svnHasSupportToRegisterDiffCommand == 1"
241233
}
242234
],
243235
"scm/title": [
@@ -276,67 +268,80 @@
276268
"scm/resourceState/context": [
277269
{
278270
"command": "svn.add",
279-
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
271+
"when":
272+
"config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
280273
"group": "inline"
281274
},
282275
{
283276
"command": "svn.add",
284-
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
277+
"when":
278+
"config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
285279
"group": "1_modification"
286280
},
287281
{
288282
"command": "svn.openFile",
289-
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != external",
283+
"when":
284+
"config.svn.enabled && scmProvider == svn && scmResourceGroup != external",
290285
"group": "navigation"
291286
},
292287
{
293288
"command": "svn.openHEADFile",
294-
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
289+
"when":
290+
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
295291
"group": "navigation"
296292
},
297293
{
298294
"command": "svn.openChangeBase",
299-
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
295+
"when":
296+
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
300297
"group": "navigation"
301298
},
302299
{
303300
"command": "svn.openChangeHead",
304-
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
301+
"when":
302+
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
305303
"group": "navigation"
306304
},
307305
{
308306
"command": "svn.addChangelist",
309-
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
307+
"when":
308+
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
310309
"group": "inline"
311310
},
312311
{
313312
"command": "svn.addChangelist",
314-
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
313+
"when":
314+
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
315315
"group": "1_modification"
316316
},
317317
{
318318
"command": "svn.removeChangelist",
319-
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != changes && scmResourceGroup != unversioned && scmResourceGroup != external",
319+
"when":
320+
"config.svn.enabled && scmProvider == svn && scmResourceGroup != changes && scmResourceGroup != unversioned && scmResourceGroup != external",
320321
"group": "inline"
321322
},
322323
{
323324
"command": "svn.removeChangelist",
324-
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != changes && scmResourceGroup != unversioned && scmResourceGroup != external",
325+
"when":
326+
"config.svn.enabled && scmProvider == svn && scmResourceGroup != changes && scmResourceGroup != unversioned && scmResourceGroup != external",
325327
"group": "1_modification"
326328
},
327329
{
328330
"command": "svn.commit",
329-
"when": "scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
331+
"when":
332+
"scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
330333
"group": "1_modification"
331334
},
332335
{
333336
"command": "svn.revert",
334-
"when": "scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
337+
"when":
338+
"scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
335339
"group": "1_modification"
336340
},
337341
{
338342
"command": "svn.remove",
339-
"when": "scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
343+
"when":
344+
"scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
340345
"group": "2_modification"
341346
}
342347
],
@@ -350,22 +355,26 @@
350355
{
351356
"command": "svn.openFile",
352357
"group": "navigation",
353-
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != extension && resourceScheme != merge-conflict.conflict-diff"
358+
"when":
359+
"config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != extension && resourceScheme != merge-conflict.conflict-diff"
354360
},
355361
{
356362
"command": "svn.openChangeBase",
357363
"group": "navigation",
358-
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file"
364+
"when":
365+
"config.svn.enabled && svnOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file"
359366
},
360367
{
361368
"command": "svn.openChangeHead",
362369
"group": "navigation",
363-
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file"
370+
"when":
371+
"config.svn.enabled && svnOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file"
364372
},
365373
{
366374
"command": "svn.revertSelectedRanges",
367375
"group": "2_svn@3",
368-
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != merge-conflict.conflict-diff && && svnHasSupportToRegisterDiffCommand == 1"
376+
"when":
377+
"config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != merge-conflict.conflict-diff && && svnHasSupportToRegisterDiffCommand == 1"
369378
}
370379
]
371380
},
@@ -384,51 +393,45 @@
384393
},
385394
"svn.decorations.enabled": {
386395
"type": "boolean",
387-
"description": "Controls if SVN contributes colors and badges to the explorer and the open (VSCode >= 1.18 with proposed-api)",
396+
"description":
397+
"Controls if SVN contributes colors and badges to the explorer and the open (VSCode >= 1.18 with proposed-api)",
388398
"default": true
389399
},
390400
"svn.path": {
391-
"type": [
392-
"string",
393-
"null"
394-
],
401+
"type": ["string", "null"],
395402
"description": "Path to the svn executable",
396403
"default": null,
397404
"isExecutable": true
398405
},
399406
"svn.diff.withHead": {
400407
"type": "boolean",
401-
"description": "Show diff changes using latest revision in the repository. Set false to use latest revision in local folder",
408+
"description":
409+
"Show diff changes using latest revision in the repository. Set false to use latest revision in local folder",
402410
"default": true
403411
},
404412
"svn.layout.trunk": {
405-
"type": [
406-
"string",
407-
"null"
408-
],
409-
"description": "Relative path for 'trunk' in SVN URL, 'null' to disable. (Ex.: 'trunk', 'main')",
413+
"type": ["string", "null"],
414+
"description":
415+
"Relative path for 'trunk' in SVN URL, 'null' to disable. (Ex.: 'trunk', 'main')",
410416
"default": "trunk"
411417
},
412418
"svn.layout.branches": {
413-
"type": [
414-
"string",
415-
"null"
416-
],
417-
"description": "Relative path for 'branches' in SVN URL, 'null' to disable. (Ex.: 'branches', 'versions')",
419+
"type": ["string", "null"],
420+
"description":
421+
"Relative path for 'branches' in SVN URL, 'null' to disable. (Ex.: 'branches', 'versions')",
418422
"default": "branches"
419423
},
420424
"svn.layout.tags": {
421-
"type": [
422-
"string",
423-
"null"
424-
],
425-
"description": "Relative path for 'tags' in SVN URL, 'null' to disable. (Ex.: 'tags', 'stamps')",
425+
"type": ["string", "null"],
426+
"description":
427+
"Relative path for 'tags' in SVN URL, 'null' to disable. (Ex.: 'tags', 'stamps')",
426428
"default": "tags"
427429
},
428430
"svn.branch.update": {
429431
"type": "number",
430432
"minimum": 0,
431-
"description": "How frequently (in minutes) to check branch changes. Set to `0` to avoid periodic checks.",
433+
"description":
434+
"How frequently (in minutes) to check branch changes. Set to `0` to avoid periodic checks.",
432435
"default": 5
433436
},
434437
"svn.multipleFolders.enabled": {
@@ -445,23 +448,17 @@
445448
"svn.multipleFolders.ignore": {
446449
"type": "array",
447450
"description": "Folders to ignore using SVN",
448-
"default": [
449-
"**/.git",
450-
"**/.hg",
451-
"**/vendor",
452-
"**/node_modules"
453-
]
451+
"default": ["**/.git", "**/.hg", "**/vendor", "**/node_modules"]
454452
},
455453
"svn.sourceControl.ignoreOnCommit": {
456454
"type": "array",
457455
"description": "Changelists to ignore on commit",
458-
"default": [
459-
"ignore-on-commit"
460-
]
456+
"default": ["ignore-on-commit"]
461457
},
462458
"svn.sourceControl.showExternal": {
463459
"type": "boolean",
464-
"description": "Allow to show in source control the list the external folders",
460+
"description":
461+
"Allow to show in source control the list the external folders",
465462
"default": false
466463
},
467464
"svn.sourceControl.countExternal": {

‎src/model.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,11 @@ export class Model implements IDisposable {
257257

258258
if (hint instanceof Uri) {
259259
for (const liveRepository of this.openRepositories) {
260-
if (liveRepository.repository.workspaceRoot.split(path.sep)[0] !== hint.fsPath.split(path.sep)[0]) {
260+
//if on different drive not need to check
261+
if (
262+
liveRepository.repository.workspaceRoot.split(path.sep)[0] !==
263+
hint.fsPath.split(path.sep)[0]
264+
) {
261265
return undefined;
262266
}
263267

0 commit comments

Comments
 (0)