Skip to content

added option to ignore unversioned files #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 2, 2018
Merged

added option to ignore unversioned files #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6a3d58
added option to ignore unversioned files
JohnstonCode Apr 2, 2018
b290c61
Removed unused file
JohnstonCode Apr 2, 2018
547d683
Changed names to addFileToIgnore
JohnstonCode Apr 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

177 changes: 92 additions & 85 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,9 @@
"bugs": {
"url": "https://github.com/JohnstonCode/svn-scm/issues"
},
"categories": [
"Other",
"SCM Providers"
],
"keywords": [
"multi-root ready",
"scm",
"svn"
],
"activationEvents": [
"*"
],
"categories": ["Other", "SCM Providers"],
"keywords": ["multi-root ready", "scm", "svn"],
"activationEvents": ["*"],
"main": "./out/extension",
"scripts": {
"vscode:prepublish": "tsc -p ./",
Expand Down Expand Up @@ -216,6 +207,11 @@
"command": "svn.patchChangeList",
"title": "Show patch from changelist",
"category": "SVN"
},
{
"command": "svn.addFileToIgnore",
"title": "Ignore",
"category": "SVN"
}
],
"menus": {
Expand All @@ -238,11 +234,13 @@
},
{
"command": "svn.openChangeBase",
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && svnActiveEditorHasChanges"
"when":
"config.svn.enabled && svnOpenRepositoryCount != 0 && svnActiveEditorHasChanges"
},
{
"command": "svn.openChangeHead",
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && svnActiveEditorHasChanges"
"when":
"config.svn.enabled && svnOpenRepositoryCount != 0 && svnActiveEditorHasChanges"
},
{
"command": "svn.openFile",
Expand Down Expand Up @@ -298,7 +296,8 @@
},
{
"command": "svn.revertSelectedRanges",
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && svnHasSupportToRegisterDiffCommand == 1"
"when":
"config.svn.enabled && svnOpenRepositoryCount != 0 && svnHasSupportToRegisterDiffCommand == 1"
},
{
"command": "svn.close",
Expand All @@ -307,6 +306,10 @@
{
"command": "svn.cleanup",
"when": "config.svn.enabled && svnOpenRepositoryCount != 0"
},
{
"command": "svn.addFileToIgnore",
"when": "false"
}
],
"scm/title": [
Expand Down Expand Up @@ -360,73 +363,93 @@
"scm/resourceState/context": [
{
"command": "svn.add",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
"group": "inline"
},
{
"command": "svn.add",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
"group": "1_modification"
},
{
"command": "svn.openFile",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != external",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup != external",
"group": "navigation"
},
{
"command": "svn.openHEADFile",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
"group": "navigation"
},
{
"command": "svn.openChangeBase",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
"group": "navigation"
},
{
"command": "svn.openChangeHead",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
"group": "navigation"
},
{
"command": "svn.patch",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"group": "navigation"
},
{
"command": "svn.resolve",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup == conflicts",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup == conflicts",
"group": "inline"
},
{
"command": "svn.resolve",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup == conflicts",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup == conflicts",
"group": "1_modification"
},
{
"command": "svn.changelist",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"group": "inline"
},
{
"command": "svn.changelist",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"group": "1_modification"
},
{
"command": "svn.commit",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"group": "1_modification"
},
{
"command": "svn.revert",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"group": "2_modification"
},
{
"command": "svn.remove",
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts",
"group": "2_modification"
},
{
"command": "svn.addFileToIgnore",
"when":
"config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
"group": "1_modification"
}
],
"scm/change/title": [
Expand All @@ -439,22 +462,26 @@
{
"command": "svn.openFile",
"group": "navigation",
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != extension && resourceScheme != merge-conflicts.conflicts-diff"
"when":
"config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != extension && resourceScheme != merge-conflicts.conflicts-diff"
},
{
"command": "svn.openChangeBase",
"group": "navigation",
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && svnActiveEditorHasChanges && !isInDiffEditor && resourceScheme == file"
"when":
"config.svn.enabled && svnOpenRepositoryCount != 0 && svnActiveEditorHasChanges && !isInDiffEditor && resourceScheme == file"
},
{
"command": "svn.openChangeHead",
"group": "navigation",
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && svnActiveEditorHasChanges && !isInDiffEditor && resourceScheme == file"
"when":
"config.svn.enabled && svnOpenRepositoryCount != 0 && svnActiveEditorHasChanges && !isInDiffEditor && resourceScheme == file"
},
{
"command": "svn.revertSelectedRanges",
"group": "2_svn@3",
"when": "config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != merge-conflicts.conflicts-diff && && svnHasSupportToRegisterDiffCommand == 1"
"when":
"config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != merge-conflicts.conflicts-diff && && svnHasSupportToRegisterDiffCommand == 1"
}
]
},
Expand All @@ -473,14 +500,12 @@
},
"svn.decorations.enabled": {
"type": "boolean",
"description": "Controls if SVN contributes colors and badges to the explorer and the open (VSCode >= 1.18 with proposed-api)",
"description":
"Controls if SVN contributes colors and badges to the explorer and the open (VSCode >= 1.18 with proposed-api)",
"default": true
},
"svn.path": {
"type": [
"string",
"null"
],
"type": ["string", "null"],
"description": "Path to the svn executable",
"default": null,
"isExecutable": true
Expand All @@ -492,59 +517,47 @@
},
"svn.diff.withHead": {
"type": "boolean",
"description": "Show diff changes using latest revision in the repository. Set false to use latest revision in local folder",
"description":
"Show diff changes using latest revision in the repository. Set false to use latest revision in local folder",
"default": true
},
"svn.layout.trunkRegex": {
"type": [
"string",
"null"
],
"description": "Regex to detect path for 'trunk' in SVN URL, 'null' to disable. (Ex.: '(trunk)', '(main)')",
"type": ["string", "null"],
"description":
"Regex to detect path for 'trunk' in SVN URL, 'null' to disable. (Ex.: '(trunk)', '(main)')",
"default": "(trunk)(/.*)?"
},
"svn.layout.trunkRegexName": {
"type": [
"number"
],
"type": ["number"],
"description": "Regex group position for name of trunk",
"default": 1
},
"svn.layout.branchesRegex": {
"type": [
"string",
"null"
],
"description": "Regex to detect path for 'branches' in SVN URL, 'null' to disable. Subpath use 'branches/[^/]+/([^/]+)(/.*)?' (Ex.: 'branches/...', 'versions/...')",
"type": ["string", "null"],
"description":
"Regex to detect path for 'branches' in SVN URL, 'null' to disable. Subpath use 'branches/[^/]+/([^/]+)(/.*)?' (Ex.: 'branches/...', 'versions/...')",
"default": "branches/([^/]+)(/.*)?"
},
"svn.layout.branchesRegexName": {
"type": [
"number"
],
"type": ["number"],
"description": "Regex group position for name of branch",
"default": 1
},
"svn.layout.tagsRegex": {
"type": [
"string",
"null"
],
"description": "Regex to detect path for 'tags' in SVN URL, 'null' to disable. Subpath use 'tags/[^/]+/([^/]+)(/.*)?'. (Ex.: 'tags/...', 'stamps/...')",
"type": ["string", "null"],
"description":
"Regex to detect path for 'tags' in SVN URL, 'null' to disable. Subpath use 'tags/[^/]+/([^/]+)(/.*)?'. (Ex.: 'tags/...', 'stamps/...')",
"default": "tags/([^/]+)(/.*)?"
},
"svn.layout.tagRegexName": {
"type": [
"number"
],
"type": ["number"],
"description": "Regex group position for name of tag",
"default": 1
},
"svn.layout.showFullName": {
"type": [
"boolean"
],
"description": "Set true to show 'branches/<name>' and false to show only '<name>'",
"type": ["boolean"],
"description":
"Set true to show 'branches/<name>' and false to show only '<name>'",
"default": true
},
"svn.multipleFolders.enabled": {
Expand All @@ -561,29 +574,24 @@
"svn.multipleFolders.ignore": {
"type": "array",
"description": "Folders to ignore using SVN",
"default": [
"**/.git",
"**/.hg",
"**/vendor",
"**/node_modules"
]
"default": ["**/.git", "**/.hg", "**/vendor", "**/node_modules"]
},
"svn.sourceControl.ignoreOnCommit": {
"type": "array",
"description": "Changelists to ignore on commit",
"default": [
"ignore-on-commit"
]
"default": ["ignore-on-commit"]
},
"svn.detectExternals": {
"type": "boolean",
"default": true,
"description": "Controls whether to automatically detect svn externals."
"description":
"Controls whether to automatically detect svn externals."
},
"svn.sourceControl.combineExternalIfSameServer": {
"type": "boolean",
"default": false,
"description": "Combine the svn external in the main if is from the same server."
"description":
"Combine the svn external in the main if is from the same server."
},
"svn.sourceControl.countUnversioned": {
"type": "boolean",
Expand All @@ -608,15 +616,14 @@
},
"svn.update.ignoreExternals": {
"type": "boolean",
"description": "Set to ignore externals definitions on update (add --ignore-externals)",
"description":
"Set to ignore externals definitions on update (add --ignore-externals)",
"default": true
},
"svn.default.encoding": {
"type": [
"string",
"null"
],
"description": "Encoding of svn output if the output is not utf-8. When this parameter is null, the encoding is automatically detected. Example: 'windows-1252'.",
"type": ["string", "null"],
"description":
"Encoding of svn output if the output is not utf-8. When this parameter is null, the encoding is automatically detected. Example: 'windows-1252'.",
"default": null
},
"svn.showUpdateMessage": {
Expand All @@ -627,4 +634,4 @@
}
}
}
}
}
Loading