Merge pull request #60 from edgardmessias/multiple_svn_folders

Added support to multiple svn folders (Close #30)

Author: JohnstonCode

CHANGELOG.md

@@ -17,6 +17,12 @@
 * @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
+* @edgardmessias Added support for multiple svn folders. To configure,
+  edit the options:
+  * "svn.multipleFolders.enabled" : Allow to find subfolders using SVN
+  * "svn.layout.depth" : Maximum depth to find subfolders using SVN
+  * "svn.multipleFolders.ignore" : Folders to ignore using SVN
+    (Ex.: '\*\*/vendor', '\*\*/node_modules')
 
 ## Bug Fixes
 

package.json

@@ -163,6 +163,23 @@
           "description":
             "Relative path for 'tags' in SVN URL, 'null' to disable. (Ex.: 'tags', 'stamps')",
           "default": "tags"
+        },
+        "svn.multipleFolders.enabled": {
+          "type": "boolean",
+          "description": "Allow to find subfolders using SVN",
+          "default": false
+        },
+        "svn.multipleFolders.depth": {
+          "type": "number",
+          "minimum": 0,
+          "description": "Maximum depth to find subfolders using SVN",
+          "default": 4
+        },
+        "svn.multipleFolders.ignore": {
+          "type": "array",
+          "minimum": 4,
+          "description": "Folders to ignore using SVN",
+          "default": ["**/vendor", "**/node_modules"]
         }
       }
     }

src/model.ts

@@ -20,6 +20,8 @@ export class Model {
   private disposables: Disposable[] = [];
   private enabled = false;
   private possibleSvnRepositoryPaths = new Set<string>();
+  private ignorePattern: RegExp = /^$/;
+  private maxDepth: number = 0;
 
   get repositories(): Repository[] {
     return this.openRepositories.map(r => r.repository);
@@ -31,6 +33,31 @@ export class Model {
 
     if (this.enabled) {
       this.init();
+
+      const multipleFolders = config.get<boolean>(
+        "multipleFolders.enabled",
+        false
+      );
+
+      if (multipleFolders) {
+        this.maxDepth = config.get<number>("multipleFolders.depth", 0);
+
+        const ignoreList = config.get("multipleFolders.ignore", []);
+
+        // Base on https://github.com/aleclarson/glob-regex/blob/master/index.js
+        const pattern = ignoreList
+          .join("|")
+          .replace(/\./g, "\\.")
+          .replace(/\*\*\//g, "(.+[\\\\\/])?")
+          .replace(/\*\*/g, "(.+[\\\\\/])?*")
+          .replace(/\*/g, "[^\\\\\/]+");
+
+        try {
+          this.ignorePattern = new RegExp("^(" + pattern + ")$");
+        } catch (error) {
+          window.showErrorMessage("Invalid pattern for: " + pattern);
+        }
+      }
     } else {
       this.disable();
     }
@@ -119,7 +146,7 @@ export class Model {
     }
   }
 
-  async tryOpenRepository(path: string): Promise<void> {
+  async tryOpenRepository(path: string, level = 0): Promise<void> {
     if (this.getRepository(path)) {
       return;
     }
@@ -135,7 +162,17 @@ export class Model {
 
       this.open(repository);
     } catch (err) {
-      console.error(err);
+      const newLevel = level + 1;
+
+      if (newLevel <= this.maxDepth) {
+        fs.readdirSync(path).forEach(file => {
+          const dir = path + "/" + file;
+          if (fs.statSync(dir).isDirectory() && !this.ignorePattern.test(dir)) {
+            this.tryOpenRepository(dir, newLevel);
+          }
+        });
+      }
+
       return;
     }
   }

src/svn.ts

@@ -95,7 +95,8 @@ export class SvnError {
 export class Svn {
   private svnPath: string;
   private version: string;
-
+  private lastCwd: string = "";
+  
   private _onOutput = new EventEmitter();
   get onOutput(): EventEmitter {
     return this._onOutput;
@@ -112,11 +113,12 @@ export class Svn {
 
   async exec(cwd: string, args: any[], options: CpOptions = {}) {
     if (cwd) {
+      this.lastCwd = cwd;
       options.cwd = cwd;
     }
 
     if (options.log !== false) {
-      this.log(`svn ${args.join(" ")}\n`);
+      this.log(`[${this.lastCwd.split(/[\\\/]+/).pop()}]$ svn ${args.join(" ")}\n`);
     }
 
     let process = cp.spawn(this.svnPath, args, options);
@@ -222,7 +224,7 @@ export class Svn {
   }
 
   switchBranch(root: string, path: string) {
-    return this.exec(root, ["switch", path]);
+    return this.exec(root, ["switch", path, "--ignore-ancestry"]);
   }
 
   revert(files: any[]) {