refactor: Refactored function for isSvnFolder (#585)

src/model.ts

@@ -17,7 +17,7 @@ import {
   RepositoryState
 } from "./common/types";
 import { debounce } from "./decorators";
-import { exists, readdir, stat } from "./fs";
+import { readdir, stat } from "./fs";
 import { configuration } from "./helpers/configuration";
 import { RemoteRepository } from "./remoteRepository";
 import { Repository } from "./repository";
@@ -29,6 +29,7 @@ import {
   filterEvent,
   IDisposable,
   isDescendant,
+  isSvnFolder,
   normalizePath
 } from "./util";
 import { matchAll } from "./util/globMatch";
@@ -219,34 +220,9 @@ export class Model implements IDisposable {
       return;
     }
 
-    let isSvnFolder = false;
+    const checkParent = level === 0;
 
-    try {
-      isSvnFolder = await exists(path + "/.svn");
-    } catch (error) {
-      // error
-    }
-
-    // If open only a subpath.
-    if (!isSvnFolder && level === 0) {
-      const pathParts = path.split(/[\\/]/);
-      while (pathParts.length > 0) {
-        pathParts.pop();
-        const topPath = pathParts.join("/") + "/.svn";
-
-        try {
-          isSvnFolder = await exists(topPath);
-        } catch (error) {
-          // error
-        }
-
-        if (isSvnFolder) {
-          break;
-        }
-      }
-    }
-
-    if (isSvnFolder) {
+    if (isSvnFolder(path, checkParent)) {
       // Config based on folder path
       const resourceConfig = workspace.getConfiguration("svn", Uri.file(path));
 

src/util.ts

@@ -198,3 +198,22 @@ export function fixPegRevision(file: string) {
 
   return file;
 }
+
+export async function isSvnFolder(dir: string, checkParent: boolean = true): Promise<boolean> {
+
+  const result = await exists(`${dir}/.svn`);
+
+  if (result || !checkParent) {
+    return result;
+  }
+
+  const parent = path.dirname(dir);
+
+  // For windows: the `path.dirname("c:")` return `c:`
+  // For empty or doted dir, return "."
+  if (parent === dir || parent === ".") {
+    return false;
+  }
+
+  return await isSvnFolder(parent, true);
+}