Merge pull request #306 from edgardmessias/old_working_copy

Added check for old working copy

Author: JohnstonCode

package.json

@@ -546,6 +546,11 @@
           "description": "Ignores the warning when SVN is missing",
           "default": false
         },
+        "svn.ignoreWorkingCopyIsTooOld": {
+          "type": "boolean",
+          "description": "Ignores the warning when working copy is too old",
+          "default": false
+        },
         "svn.diff.withHead": {
           "type": "boolean",
           "description":

src/commands.ts

@@ -1198,6 +1198,46 @@ export class SvnCommands implements IDisposable {
     await repository.rename(oldFile, newName);
   }
 
+  @command("svn.upgrade")
+  public async upgrade(folderPath: string): Promise<void> {
+    if (!folderPath) {
+      return;
+    }
+
+    if (configuration.get("ignoreWorkingCopyIsTooOld", false)) {
+      return;
+    }
+
+    folderPath = fixPathSeparator(folderPath);
+
+    const yes = "Yes";
+    const no = "No";
+    const neverShowAgain = "Don't Show Again";
+    const choice = await window.showWarningMessage(
+      "You want upgrade the working copy (svn upgrade)?",
+      yes,
+      no,
+      neverShowAgain
+    );
+
+    if (choice === yes) {
+      const upgraded = await this.model.upgradeWorkingCopy(folderPath);
+
+      if (upgraded) {
+        window.showInformationMessage(`Working copy "${folderPath}" upgraded`);
+        this.model.tryOpenRepository(folderPath);
+      } else {
+        window.showErrorMessage(
+          `Error on upgrading working copy "${folderPath}". See log for more detail`
+        );
+      }
+    } else if (choice === neverShowAgain) {
+      return configuration.update("ignoreWorkingCopyIsTooOld", true);
+    }
+
+    return;
+  }
+
   private getSCMResource(uri?: Uri): Resource | undefined {
     uri = uri
       ? uri

src/model.ts

@@ -20,7 +20,8 @@ import {
 import { debounce, sequentialize } from "./decorators";
 import { configuration } from "./helpers/configuration";
 import { Repository } from "./repository";
-import { Svn } from "./svn";
+import { Svn, svnErrorCodes } from "./svn";
+import SvnError from "./svnError";
 import {
   anyEvent,
   dispose,
@@ -283,6 +284,12 @@ export class Model implements IDisposable {
 
         this.open(repository);
       } catch (err) {
+        if (err instanceof SvnError) {
+          if (err.svnErrorCode === svnErrorCodes.WorkingCopyIsTooOld) {
+            await commands.executeCommand("svn.upgrade", path);
+            return;
+          }
+        }
         console.error(err);
       }
       return;
@@ -424,6 +431,16 @@ export class Model implements IDisposable {
     return pick && pick.repository;
   }
 
+  public async upgradeWorkingCopy(folderPath: string): Promise<boolean> {
+    try {
+      const result = await this.svn.exec(folderPath, ["upgrade"]);
+      return result.exitCode === 0;
+    } catch (e) {
+      console.log(e);
+    }
+    return false;
+  }
+
   public dispose(): void {
     this.disable();
     this.configurationChangeDisposable.dispose();

src/svn.ts

@@ -15,7 +15,8 @@ export const svnErrorCodes: { [key: string]: string } = {
   AuthorizationFailed: "E170001",
   RepositoryIsLocked: "E155004",
   NotASvnRepository: "E155007",
-  NotShareCommonAncestry: "E195012"
+  NotShareCommonAncestry: "E195012",
+  WorkingCopyIsTooOld: "E155036"
 };
 
 function getSvnErrorCode(stderr: string): string | undefined {
@@ -206,6 +207,9 @@ export class Svn {
       // SVN 1.6 not has "wcroot-abspath"
       return path;
     } catch (error) {
+      if (error instanceof SvnError) {
+        throw error;
+      }
       console.error(error);
       throw new Error("Unable to find repository root path");
     }