Merge remote-tracking branch 'remotes/upstream/master' into multiple_svn_folders

Author: edgardmessias

CHANGELOG.md

@@ -2,16 +2,26 @@
 
 ## What's New
 
-* @edgardmessias Added support to configure non-standard layout. To configure, edit the options:
-  * "svn.layout.trunk" : Relative path for 'trunk' in SVN URL, 'null' to disable. (Ex.: 'trunk', 'main')
-  * "svn.layout.branches" : Relative path for 'branches' in SVN URL, 'null' to disable. (Ex.: 'branches', 'versions')
-  * "svn.layout.tags" : Relative path for 'tags' in SVN URL, 'null' to disable. (Ex.: 'tags', 'stamps')
-* @edgardmessias Added support to configure diff changes. To configure, edit the options:
-  * "svn.diff.withHead" : Show diff changes using latest revision in the repository. Set false to use latest revision in local folder
+* @edgardmessias Added support to configure non-standard layout. To configure,
+  edit the options:
+  * "svn.layout.trunk" : Relative path for 'trunk' in SVN URL, 'null' to
+    disable. (Ex.: 'trunk', 'main')
+  * "svn.layout.branches" : Relative path for 'branches' in SVN URL, 'null' to
+    disable. (Ex.: 'branches', 'versions')
+  * "svn.layout.tags" : Relative path for 'tags' in SVN URL, 'null' to disable.
+    (Ex.: 'tags', 'stamps')
+* @edgardmessias Added support to configure diff changes. To configure, edit the
+  options:
+  * "svn.diff.withHead" : Show diff changes using latest revision in the
+    repository. Set false to use latest revision in local folder
+* @JohnstonCode Commit info message now shows what revision it was
+* @JohnstonCode Added svn update to scm title commands
+* @JohnstonCode Added confirmation message to revert command
 
 ## Bug Fixes
 
 * @edgardmessias Fixed config option form svn path
+* @JohnstonCode Fixed conflicted files not having an icon
 
 # **v1.3.2**
 

icons/dark/conflicted.svg icons/dark/conflict.svgicons/dark/conflicted.svg renamed to icons/dark/conflict.svg

@@ -77,6 +77,11 @@
         "command": "svn.revert",
         "title": "Revert Selected",
         "category": "SVN"
+      },
+      {
+        "command": "svn.update",
+        "title": "Svn update",
+        "category": "SVN"
       }
     ],
     "menus": {
@@ -90,6 +95,10 @@
         {
           "command": "svn.switchBranch",
           "when": "config.svn.enabled"
+        },
+        {
+          "command": "svn.update",
+          "when": "config.svn.enabled"
         }
       ],
       "scm/resourceGroup/context": [],
@@ -133,22 +142,26 @@
         },
         "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')",
+          "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')",
+          "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')",
+          "description":
+            "Relative path for 'tags' in SVN URL, 'null' to disable. (Ex.: 'tags', 'stamps')",
           "default": "tags"
         }
       }

icons/light/conflicted.svg icons/light/conflict.svgicons/light/conflicted.svg renamed to icons/light/conflict.svg

@@ -6,7 +6,7 @@ import {
   TextDocumentShowOptions,
   QuickPickItem
 } from "vscode";
-import { inputCommitMessage, changesCommitted } from "./messages";
+import { inputCommitMessage } from "./messages";
 import { Svn } from "./svn";
 import { Model } from "./model";
 import { Repository } from "./repository";
@@ -154,9 +154,12 @@ export class SvnCommands {
     });
 
     try {
-      await repository.repository.commitFiles(message, filePaths);
+      const result = await repository.repository.commitFiles(
+        message,
+        filePaths
+      );
+      window.showInformationMessage(result);
       repository.inputBox.value = "";
-      changesCommitted();
       repository.update();
     } catch (error) {
       console.error(error);
@@ -182,7 +185,6 @@ export class SvnCommands {
 
   @command("svn.commit", { repository: true })
   async commit(repository: Repository, ...args: any[][]): Promise<void> {
-    console.log(args);
     try {
       const paths = args[0].map(state => {
         return state.resourceUri.fsPath;
@@ -193,8 +195,8 @@ export class SvnCommands {
         return;
       }
 
-      await repository.repository.commitFiles(message, paths);
-      changesCommitted();
+      const result = await repository.repository.commitFiles(message, paths);
+      window.showInformationMessage(result);
       repository.update();
     } catch (error) {
       console.error(error);
@@ -302,6 +304,16 @@ export class SvnCommands {
 
   @command("svn.revert", { repository: true })
   async revert(repository: Repository, ...args: any[][]) {
+    const yes = "Yes I'm sure";
+    const answer = await window.showWarningMessage(
+      "Are you sure? This will wipe all local changes.",
+      yes
+    );
+
+    if (answer !== yes) {
+      return;
+    }
+
     try {
       const paths = args[0].map(state => {
         return state.resourceUri.fsPath;
@@ -314,4 +326,15 @@ export class SvnCommands {
       window.showErrorMessage("Unable to revert");
     }
   }
+
+  @command("svn.update", { repository: true })
+  async update(repository: Repository) {
+    try {
+      const result = await repository.repository.update();
+      window.showInformationMessage(result);
+    } catch (error) {
+      console.error(error);
+      window.showErrorMessage("Unable to update");
+    }
+  }
 }

package.json

@@ -21,7 +21,3 @@ export function inputCommitMessage(message?: string) {
       .then(string => resolve(string));
   });
 }
-
-export function changesCommitted() {
-  return window.showInformationMessage("Files Committed");
-}

src/commands.ts

@@ -45,7 +45,7 @@ export class Resource {
         Modified: this.getIconUri("modified", "light"),
         Added: this.getIconUri("added", "light"),
         Deleted: this.getIconUri("deleted", "light"),
-        Conflicted: this.getIconUri("conflicted", "light"),
+        conflict: this.getIconUri("conflict", "light"),
         Replaced: this.getIconUri("replaced", "light"),
         Unversioned: this.getIconUri("unversioned", "light"),
         Missing: this.getIconUri("missing", "light")
@@ -54,7 +54,7 @@ export class Resource {
         Modified: this.getIconUri("modified", "dark"),
         Added: this.getIconUri("added", "dark"),
         Deleted: this.getIconUri("deleted", "dark"),
-        Conflicted: this.getIconUri("conflicted", "dark"),
+        conflict: this.getIconUri("conflict", "dark"),
         Replaced: this.getIconUri("replaced", "dark"),
         Unversioned: this.getIconUri("unversioned", "dark"),
         Missing: this.getIconUri("missing", "dark")
@@ -64,8 +64,8 @@ export class Resource {
     switch (this.type) {
       case "added":
         return Icons[theme].Added;
-      case "conflicted":
-        return Icons[theme].Conflicted;
+      case "conflict":
+        return Icons[theme].conflict;
       case "deleted":
         return Icons[theme].Deleted;
       case "modified":

src/messages.ts

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

src/resource.ts

@@ -24,7 +24,11 @@ export class Repository {
     return status;
   }
 
-  async show(path: string, revision?: string, options: CpOptions = {}): Promise<string> {
+  async show(
+    path: string,
+    revision?: string,
+    options: CpOptions = {}
+  ): Promise<string> {
     const result = await this.svn.show(path, revision, options);
 
     if (result.exitCode !== 0) {
@@ -41,7 +45,9 @@ export class Repository {
       throw new Error(result.stderr);
     }
 
-    return result.stdout;
+    const outputMessage = result.stdout.match(/Committed revision (.*)\./i)[0];
+
+    return outputMessage;
   }
 
   addFile(filePath: string) {
@@ -68,8 +74,10 @@ export class Repository {
     const branchesLayout = config.get<string>("layout.branches");
     const tagsLayout = config.get<string>("layout.tags");
 
-    const trees = [trunkLayout, branchesLayout, tagsLayout].filter(x => x != null);
-    const regex = new RegExp("<url>(.*?)\/(" + trees.join("|") + ").*?<\/url>");
+    const trees = [trunkLayout, branchesLayout, tagsLayout].filter(
+      x => x != null
+    );
+    const regex = new RegExp("<url>(.*?)/(" + trees.join("|") + ").*?</url>");
 
     const info = await this.svn.info(this.root);
 
@@ -171,9 +179,7 @@ export class Repository {
     const repoUrl = await this.getRepoUrl();
     const newBranch = repoUrl + "/" + branchesLayout + "/" + name;
     const resultBranch = await this.svn.info(this.root);
-    const currentBranch = resultBranch.stdout
-      .match(/<url>(.*?)<\/url>/)[1];
-
+    const currentBranch = resultBranch.stdout.match(/<url>(.*?)<\/url>/)[1];
     const result = await this.svn.copy(currentBranch, newBranch, name);
 
     if (result.exitCode !== 0) {
@@ -212,4 +218,16 @@ export class Repository {
 
     return result.stdout;
   }
+
+  async update() {
+    const result = await this.svn.update(this.root);
+
+    if (result.exitCode !== 0) {
+      throw new Error(result.stderr);
+    }
+
+    const message = result.stdout.match(/At revision (.*)\./i)[0];
+
+    return message;
+  }
 }