Merge pull request #91 from rwatts3/master

Feature | Add SVN Patch

Author: JohnstonCode

package.json

@@ -16,9 +16,18 @@
   "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 ./",
@@ -89,6 +98,11 @@
         "command": "svn.update",
         "title": "Svn update",
         "category": "SVN"
+      },
+      {
+        "command": "svn.patch",
+        "title": "Svn patch",
+        "category": "SVN"
       }
     ],
     "menus": {
@@ -106,6 +120,10 @@
         {
           "command": "svn.update",
           "when": "config.svn.enabled"
+        },
+        {
+          "command": "svn.patch",
+          "when": "config.svn.enabled"
         }
       ],
       "scm/resourceGroup/context": [],
@@ -142,33 +160,41 @@
           "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": {

src/commands.ts

@@ -4,7 +4,8 @@ import {
   window,
   Uri,
   TextDocumentShowOptions,
-  QuickPickItem
+  QuickPickItem,
+  workspace
 } from "vscode";
 import { inputCommitMessage } from "./messages";
 import { Svn } from "./svn";
@@ -346,6 +347,21 @@ export class SvnCommands {
       window.showErrorMessage("Unable to update");
     }
   }
+  
+  @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);
+      });
+      window.showInformationMessage("Files Patched");
+    } catch (error) {
+      console.error(error);
+      window.showErrorMessage("Unable to patch");
+    }
+  }
 
   private runByRepository<T>(
     resource: Uri,

src/svn.ts

@@ -246,4 +246,8 @@ export class Svn {
   update(root: string) {
     return this.exec(root, ["update"]);
   }
+  
+  patch(root: string) {
+    return this.exec(root, ["diff"]);
+  }
 }

src/svnRepository.ts

@@ -236,4 +236,14 @@ export class Repository {
 
     return message;
   }
+  
+  async patch() {
+    const result = await this.svn.patch(this.root);
+    if (result.exitCode !== 0) {
+      throw new Error(result.stderr);
+    }
+    
+    const message = result.stdout;
+      return message;
+  }
 }