Skip to content

Commit

Permalink
published v1.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnstonCode committed Dec 21, 2017
1 parent adc942c commit 3ba53e4
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 39 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# **v1.5.0 UNDER DEVELOPMENT**
# **v1.5.0**

## What's New

* @rwatts3 Added Svn patch command

# **v1.4.6**

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ If you use [TortoiseSVN](https://tortoisesvn.net/), make sure the option
* @JohnstonCode
* @edgardmessias
* @csholmq
* @rwatts3
49 changes: 16 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "svn-scm",
"displayName": "SVN",
"description": "Integrated Subversion source control",
"version": "1.4.6",
"version": "1.5.0",
"publisher": "johnstoncode",
"engines": {
"vscode": "^1.17.0"
Expand All @@ -16,18 +16,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 @@ -160,41 +151,33 @@
"default": true
},
"svn.path": {
"type": [
"string",
"null"
],
"type": ["string", "null"],
"description": "Path to the svn executable",
"default": null,
"isExecutable": true
},
"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.trunk": {
"type": [
"string",
"null"
],
"description": "Relative path for 'trunk' in SVN URL, 'null' to disable. (Ex.: 'trunk', 'main')",
"type": ["string", "null"],
"description":
"Relative path for 'trunk' in SVN URL, 'null' to disable. (Ex.: 'trunk', 'main')",
"default": "trunk"
},
"svn.layout.branches": {
"type": [
"string",
"null"
],
"description": "Relative path for 'branches' in SVN URL, 'null' to disable. (Ex.: 'branches', 'versions')",
"type": ["string", "null"],
"description":
"Relative path for 'branches' in SVN URL, 'null' to disable. (Ex.: 'branches', 'versions')",
"default": "branches"
},
"svn.layout.tags": {
"type": [
"string",
"null"
],
"description": "Relative path for 'tags' in SVN URL, 'null' to disable. (Ex.: 'tags', 'stamps')",
"type": ["string", "null"],
"description":
"Relative path for 'tags' in SVN URL, 'null' to disable. (Ex.: 'tags', 'stamps')",
"default": "tags"
},
"svn.multipleFolders.enabled": {
Expand Down
12 changes: 7 additions & 5 deletions src/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -347,15 +347,17 @@ export class SvnCommands {
window.showErrorMessage("Unable to update");
}
}
@command('svn.patch', { repository: true })

@command("svn.patch", { repository: true })
async patch(repository: Repository) {
try {
const result = await repository.repository.patch();
// send the patch results to a new tab
workspace.openTextDocument({language: 'diff', content: result }).then(doc => {
window.showTextDocument(doc);
});
workspace
.openTextDocument({ language: "diff", content: result })
.then(doc => {
window.showTextDocument(doc);
});
window.showInformationMessage("Files Patched");
} catch (error) {
console.error(error);
Expand Down

0 comments on commit 3ba53e4

Please sign in to comment.