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

Author: edgardmessias

CHANGELOG.md

@@ -1,3 +1,18 @@
+# **v1.4.0 under development**
+
+## 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
+
+## Bug Fixes
+
+* @edgardmessias Fixed config option form svn path
+
 # **v1.3.2**
 
 ## Bug Fixes

README.md

@@ -3,7 +3,7 @@
 [![rating](https://img.shields.io/vscode-marketplace/r/johnstoncode.svn-scm.svg)](https://marketplace.visualstudio.com/items?itemName=johnstoncode.svn-scm)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](https://github.com/JohnstonCode/svn-scm/pulls)
 
-# svn-scm
+# Subversion source control for VS Code
 
 # Prerequisites
 
@@ -30,3 +30,8 @@ Files\TortoiseSVN\bin` is available in PATH.
   [Issues](https://github.com/JohnstonCode/svn-scm/issues)
 * Feel free to submit
   [pull requests](https://github.com/JohnstonCode/svn-scm/pulls)
+
+## Contributors
+
+* @JohnstonCode
+* @edgardmessias

package.json

@@ -124,13 +124,33 @@
           "type": "boolean",
           "description": "Whether svn is enabled",
           "default": true
+        },
+        "svn.path": {
+          "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",
+          "default": true
+        },
+        "svn.layout.trunk": {
+          "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')",
+          "default": "branches"
+        },
+        "svn.layout.tags": {
+          "type": ["string", "null"],
+          "description": "Relative path for 'tags' in SVN URL, 'null' to disable. (Ex.: 'tags', 'stamps')",
+          "default": "tags"
         }
-      },
-      "svn.path": {
-        "type": ["string", "null"],
-        "description": "Path to the svn executable",
-        "default": null,
-        "isExecutable": true
       }
     }
   }

src/commands.ts

@@ -63,7 +63,7 @@ class SwitchBranchItem implements QuickPickItem {
       this.tree = parts[0];
       this.name = parts[1];
     } else {
-      this.tree = "trunk";
+      this.tree = parts[0];
       this.name = parts[0];
     }
   }

src/repository.ts

@@ -166,8 +166,8 @@ export class Repository {
     return uri.with({ scheme: "svn", query: uri.path, path: uri.path });
   }
 
-  show(filePath: string): Promise<string> {
-    return this.repository.show(filePath);
+  show(filePath: string, revision?: string): Promise<string> {
+    return this.repository.show(filePath, revision);
   }
 
   addFile(filePath: string) {

src/svn.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from "events";
-import { window } from "vscode";
+import { window, workspace } from "vscode";
 import * as cp from "child_process";
 import * as iconv from "iconv-lite";
 import * as jschardet from "jschardet";
@@ -177,8 +177,14 @@ export class Svn {
     return this.exec("", ["add", path]);
   }
 
-  show(path: string, options: CpOptions = {}) {
-    return this.exec("", ["cat", "-r", "HEAD", path], options);
+  show(path: string, revision?: string, options: CpOptions = {}) {
+    var args = ["cat", path];
+
+    if (revision) {
+      args.push("-r", revision);
+    }
+
+    return this.exec("", args, options);
   }
 
   list(path: string) {

src/svnContentProvider.ts

@@ -13,8 +13,17 @@ export class SvnContentProvider {
       return "";
     }
 
+    let revision = undefined;
+
+    const config = workspace.getConfiguration("svn");
+    const diffWithHead = config.get<boolean>("diff.withHead");
+
+    if (diffWithHead) {
+      revision = "HEAD";
+    }
+
     try {
-      return repository.show(uri.fsPath);
+      return repository.show(uri.fsPath, revision);
     } catch (error) {
       return "";
     }

src/svnRepository.ts

@@ -1,3 +1,4 @@
+import { workspace } from "vscode";
 import { Svn, CpOptions } from "./svn";
 
 export class Repository {
@@ -23,8 +24,8 @@ export class Repository {
     return status;
   }
 
-  async show(path: string, options: CpOptions = {}): Promise<string> {
-    const result = await this.svn.show(path, options);
+  async show(path: string, revision?: string, options: CpOptions = {}): Promise<string> {
+    const result = await this.svn.show(path, revision, options);
 
     if (result.exitCode !== 0) {
       throw new Error(result.stderr);
@@ -62,16 +63,22 @@ export class Repository {
   }
 
   async getRepoUrl() {
+    const config = workspace.getConfiguration("svn");
+    const trunkLayout = config.get<string>("layout.trunk");
+    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 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(regex);
 
     if (match && match[1]) {
       repoUrl = match[1];
@@ -81,30 +88,45 @@ export class Repository {
   }
 
   async getBranches() {
+    const config = workspace.getConfiguration("svn");
+    const trunkLayout = config.get<string>("layout.trunk");
+    const branchesLayout = config.get<string>("layout.branches");
+    const tagsLayout = config.get<string>("layout.tags");
+
     const repoUrl = await this.getRepoUrl();
 
     let branches: string[] = [];
 
     let promises = [];
 
-    promises.push(
-      new Promise<string[]>(async resolve => {
-        let trunkExists = await this.svn.exec("", [
-          "ls",
-          repoUrl + "/trunk",
-          "--depth",
-          "empty"
-        ]);
-
-        if (trunkExists.exitCode === 0) {
-          resolve(["trunk"]);
-          return;
-        }
-        resolve([]);
-      })
-    );
-
-    const trees = ["branches", "tags"];
+    if (trunkLayout) {
+      promises.push(
+        new Promise<string[]>(async resolve => {
+          let trunkExists = await this.svn.exec("", [
+            "ls",
+            repoUrl + "/" + trunkLayout,
+            "--depth",
+            "empty"
+          ]);
+
+          if (trunkExists.exitCode === 0) {
+            resolve([trunkLayout]);
+            return;
+          }
+          resolve([]);
+        })
+      );
+    }
+
+    let trees: string[] = [];
+
+    if (branchesLayout) {
+      trees.push(branchesLayout);
+    }
+
+    if (tagsLayout) {
+      trees.push(tagsLayout);
+    }
 
     for (let index in trees) {
       promises.push(
@@ -139,11 +161,20 @@ export class Repository {
   }
 
   async branch(name: string) {
+    const config = workspace.getConfiguration("svn");
+    const branchesLayout = config.get<string>("layout.branches");
+
+    if (!branchesLayout) {
+      return false;
+    }
+
     const repoUrl = await this.getRepoUrl();
-    const newBranch = repoUrl + "/branches/" + name;
-    const rootUrl = repoUrl + "/trunk";
+    const newBranch = repoUrl + "/" + branchesLayout + "/" + name;
+    const resultBranch = await this.svn.info(this.root);
+    const currentBranch = resultBranch.stdout
+      .match(/<url>(.*?)<\/url>/)[1];
 
-    const result = await this.svn.copy(rootUrl, newBranch, name);
+    const result = await this.svn.copy(currentBranch, newBranch, name);
 
     if (result.exitCode !== 0) {
       throw new Error(result.stderr);