added ability to revert

CHANGELOG.md

@@ -1,3 +1,9 @@
+# **v1.1.0**
+
+## What's New
+
+* Added file revert command
+
 # **v1.0.3**
 
 ## Changes

package.json

@@ -2,7 +2,7 @@
   "name": "svn-scm",
   "displayName": "SVN",
   "description": "Integrated Subversion source control",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "publisher": "johnstoncode",
   "engines": {
     "vscode": "^1.17.0"
@@ -71,6 +71,11 @@
         "command": "svn.switchBranch",
         "title": "Switch Branch",
         "category": "SVN"
+      },
+      {
+        "command": "svn.revert",
+        "title": "Revert Selected",
+        "category": "SVN"
       }
     ],
     "menus": {
@@ -102,6 +107,11 @@
           "command": "svn.openDiffHead",
           "when": "scmProvider == svn && scmResourceGroup == changes",
           "group": "1_modification"
+        },
+        {
+          "command": "svn.revert",
+          "when": "scmProvider == svn && scmResourceGroup == changes",
+          "group": "1_modification"
         }
       ],
       "editor/title": []

src/commands.ts

@@ -37,7 +37,7 @@ class CreateBranchItem implements QuickPickItem {
 class SwitchBranchItem implements QuickPickItem {
   protected tree: string = "";
   protected name: string = "";
-  
+
   constructor(protected ref: string) {
     let parts = ref.split("/");
     if (parts[1]) {
@@ -106,6 +106,11 @@ export class SvnCommands {
         commandId: "svn.branch",
         method: this.branch,
         options: { repository: true }
+      },
+      {
+        commandId: "svn.revert",
+        method: this.revert,
+        options: { repository: true }
       }
     ];
 
@@ -313,4 +318,18 @@ export class SvnCommands {
     );
     await repository.branch(name);
   }
+
+  async revert(repository: Repository, ...args: any[][]) {
+    try {
+      const paths = args[0].map(state => {
+        return state.resourceUri.fsPath;
+      });
+
+      await repository.repository.revert(paths);
+      repository.update();
+    } catch (error) {
+      console.error(error);
+      window.showErrorMessage("Unable to revert");
+    }
+  }
 }

src/svn.ts

@@ -123,6 +123,16 @@ export class Svn {
   switchBranch(root: string, path: string) {
     return this.exec(root, ["switch", path]);
   }
+
+  revert(files: any[]) {
+    let args = ["revert"];
+
+    for (let file of files) {
+      args.push(file);
+    }
+
+    return this.exec("", args);
+  }
 }
 
 export class Repository {
@@ -188,13 +198,15 @@ export class Repository {
 
   async getRepoUrl() {
     const info = await this.svn.info(this.root);
-    
+
     if (info.exitCode !== 0) {
       throw new Error(info.stderr);
     }
 
     let repoUrl = info.stdout.match(/<root>(.*?)<\/root>/)[1];
-    const match = info.stdout.match(/<url>(.*?)\/(trunk|branches|tags).*?<\/url>/);
+    const match = info.stdout.match(
+      /<url>(.*?)\/(trunk|branches|tags).*?<\/url>/
+    );
 
     if (match[1]) {
       repoUrl = match[1];
@@ -208,7 +220,12 @@ export class Repository {
 
     const branches = [];
 
-    let trunkExists = await this.svn.exec("", ["ls", repoUrl + "/trunk", "--depth", "empty"]);
+    let trunkExists = await this.svn.exec("", [
+      "ls",
+      repoUrl + "/trunk",
+      "--depth",
+      "empty"
+    ]);
 
     if (trunkExists.exitCode === 0) {
       branches.push("trunk");
@@ -219,23 +236,21 @@ export class Repository {
     for (let index in trees) {
       const tree = trees[index];
       const branchUrl = repoUrl + "/" + tree;
-
-        const result = await this.svn.list(branchUrl);
-
-        if (result.exitCode !== 0) {
-          continue;
-        }
-
-        const list = result.stdout
-          .trim()
-          .replace(/\/|\\/g, "")
-          .split(/[\r\n]+/)
-          .map((i: string) => tree + "/" + i);
-
-        branches.push(...list);
-
-    }
 
+      const result = await this.svn.list(branchUrl);
+
+      if (result.exitCode !== 0) {
+        continue;
+      }
+
+      const list = result.stdout
+        .trim()
+        .replace(/\/|\\/g, "")
+        .split(/[\r\n]+/)
+        .map((i: string) => tree + "/" + i);
+
+      branches.push(...list);
+    }
 
     return branches;
   }
@@ -262,7 +277,7 @@ export class Repository {
 
   async switchBranch(ref: string) {
     const repoUrl = await this.getRepoUrl();
-    
+
     var branchUrl = repoUrl + "/" + ref;
 
     const switchBranch = await this.svn.switchBranch(this.root, branchUrl);
@@ -273,4 +288,14 @@ export class Repository {
 
     return true;
   }
+
+  async revert(files: any[]) {
+    const result = await this.svn.revert(files);
+
+    if (result.exitCode !== 0) {
+      throw new Error(result.stderr);
+    }
+
+    return result.stdout;
+  }
 }