Merge pull request #39 from edgardmessias/support_to_subpath

Added support to subpath for project, in switching branches

Author: JohnstonCode

src/commands.ts

@@ -35,14 +35,26 @@ class CreateBranchItem implements QuickPickItem {
 }
 
 class SwitchBranchItem implements QuickPickItem {
-  constructor(protected ref: string) {}
+  protected tree: string = "";
+  protected name: string = "";
+  
+  constructor(protected ref: string) {
+    let parts = ref.split("/");
+    if (parts[1]) {
+      this.tree = parts[0];
+      this.name = parts[1];
+    } else {
+      this.tree = "trunk";
+      this.name = parts[0];
+    }
+  }
 
   get label(): string {
-    return this.ref;
+    return this.name;
   }
 
   get description(): string {
-    return "";
+    return this.tree;
   }
 
   async run(repository: Repository): Promise<void> {

src/svn.ts

@@ -186,38 +186,62 @@ export class Repository {
     }
   }
 
-  async getBranches() {
+  async getRepoUrl() {
     const info = await this.svn.info(this.root);
-
+    
     if (info.exitCode !== 0) {
       throw new Error(info.stderr);
     }
 
-    const repoUrl = info.stdout.match(/<root>(.*?)<\/root>/)[1];
-    const branchUrl = repoUrl + "/branches";
+    let repoUrl = info.stdout.match(/<root>(.*?)<\/root>/)[1];
+    const match = info.stdout.match(/<url>(.*?)\/(trunk|branches|tags).*?<\/url>/);
 
-    const result = await this.svn.list(branchUrl);
-
-    if (result.exitCode !== 0) {
-      throw new Error(result.stderr);
+    if (match[1]) {
+      repoUrl = match[1];
     }
 
-    const branches = result.stdout
-      .trim()
-      .replace(/\/|\\/g, "")
-      .split("\n");
-
-    return ["trunk", ...branches];
+    return repoUrl;
   }
 
-  async branch(name: string) {
-    const info = await this.svn.info(this.root);
+  async getBranches() {
+    const repoUrl = await this.getRepoUrl();
 
-    if (info.exitCode !== 0) {
-      throw new Error(info.stderr);
+    const branches = [];
+
+    let trunkExists = await this.svn.exec("", ["ls", repoUrl + "/trunk", "--depth", "empty"]);
+
+    if (trunkExists.exitCode === 0) {
+      branches.push("trunk");
     }
 
-    const repoUrl = info.stdout.match(/<root>(.*?)<\/root>/)[1];
+    const trees = ["branches", "tags"];
+
+    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);
+      
+    }
+
+
+    return branches;
+  }
+
+  async branch(name: string) {
+    const repoUrl = await this.getRepoUrl();
     const newBranch = repoUrl + "/branches/" + name;
     const rootUrl = repoUrl + "/trunk";
 
@@ -237,19 +261,9 @@ export class Repository {
   }
 
   async switchBranch(ref: string) {
-    const info = await this.svn.info(this.root);
-
-    if (info.exitCode !== 0) {
-      throw new Error(info.stderr);
-    }
-
-    const repoUrl = info.stdout.match(/<root>(.*?)<\/root>/)[1];
-
-    if (ref === "trunk") {
-      var branchUrl = repoUrl + "/trunk";
-    } else {
-      var branchUrl = repoUrl + "/branches/" + ref;
-    }
+    const repoUrl = await this.getRepoUrl();
+    
+    var branchUrl = repoUrl + "/" + ref;
 
     const switchBranch = await this.svn.switchBranch(this.root, branchUrl);