Removed all "exitCode !== 0 throw Error" (See #140)

Author: edgardmessias

src/svn.ts

@@ -32,6 +32,23 @@ export enum PropStatus {
   NORMAL = "normal"
 }
 
+export const SvnErrorCodes: { [key: string]: string } = {
+  RepositoryIsLocked: "E155004",
+  NotASvnRepository: "E155007"
+};
+
+function getSvnErrorCode(stderr: string): string | undefined {
+  for (const name in SvnErrorCodes) {
+    const code = SvnErrorCodes[name];
+    const regex = new RegExp(`svn: ${code}`);
+    if (regex.test(stderr)) {
+      return code;
+    }
+  }
+
+  return void 0;
+}
+
 export interface CpOptions {
   cwd?: string;
   encoding?: string;
@@ -53,6 +70,12 @@ export interface ISvnOptions {
   version: string;
 }
 
+export interface IExecutionResult {
+  exitCode: number;
+  stdout: string;
+  stderr: string;
+}
+
 export function cpErrorHandler(
   cb: (reason?: any) => void
 ): (reason?: any) => void {
@@ -137,7 +160,11 @@ export class Svn {
     this._onOutput.emit("log", output);
   }
 
-  async exec(cwd: string, args: any[], options: CpOptions = {}) {
+  async exec(
+    cwd: string,
+    args: any[],
+    options: CpOptions = {}
+  ): Promise<IExecutionResult> {
     if (cwd) {
       this.lastCwd = cwd;
       options.cwd = cwd;
@@ -192,6 +219,19 @@ export class Svn {
       this.logOutput(`${stderr}\n`);
     }
 
+    if (exitCode) {
+      return Promise.reject<IExecutionResult>(
+        new SvnError({
+          message: "Failed to execute git",
+          stdout: stdout,
+          stderr: stderr,
+          exitCode: exitCode,
+          svnErrorCode: getSvnErrorCode(stderr),
+          svnCommand: args[0]
+        })
+      );
+    }
+
     return { exitCode, stdout, stderr };
   }
 

src/svnRepository.ts

@@ -53,23 +53,18 @@ export class Repository {
   ): Promise<string> {
     const result = await this.svn.show(path, revision, options);
 
-    if (result.exitCode !== 0) {
-      throw new Error(result.stderr);
-    }
-
     return result.stdout;
   }
 
   async commitFiles(message: string, files: any[]) {
     const result = await this.svn.commit(message, files);
 
-    if (result.exitCode !== 0) {
-      throw new Error(result.stderr);
+    const matches = result.stdout.match(/Committed revision (.*)\./i);
+    if (matches && matches[0]) {
+      return matches[0];
     }
 
-    const outputMessage = result.stdout.match(/Committed revision (.*)\./i)[0];
-
-    return outputMessage;
+    return result.stdout;
   }
 
   addFile(filePath: string) {
@@ -149,18 +144,18 @@ export class Repository {
     if (trunkLayout) {
       promises.push(
         new Promise<string[]>(async resolve => {
-          let trunkExists = await this.svn.exec("", [
-            "ls",
-            repoUrl + "/" + trunkLayout,
-            "--depth",
-            "empty"
-          ]);
-
-          if (trunkExists.exitCode === 0) {
+          try {
+            let trunkExists = await this.svn.exec("", [
+              "ls",
+              repoUrl + "/" + trunkLayout,
+              "--depth",
+              "empty"
+            ]);
+
             resolve([trunkLayout]);
-            return;
+          } catch (error) {
+            resolve([]);
           }
-          resolve([]);
         })
       );
     }
@@ -180,21 +175,20 @@ export class Repository {
         new Promise<string[]>(async resolve => {
           const branchUrl = repoUrl + "/" + tree;
 
-          const result = await this.svn.list(branchUrl);
+          try {
+            const result = await this.svn.list(branchUrl);
 
-          if (result.exitCode !== 0) {
+            const list = result.stdout
+              .trim()
+              .replace(/\/|\\/g, "")
+              .split(/[\r\n]+/)
+              .filter((x: string) => !!x)
+              .map((i: string) => tree + "/" + i);
+
+            resolve(list);
+          } catch (error) {
             resolve([]);
-            return;
           }
-
-          const list = result.stdout
-            .trim()
-            .replace(/\/|\\/g, "")
-            .split(/[\r\n]+/)
-            .filter((x: string) => !!x)
-            .map((i: string) => tree + "/" + i);
-
-          resolve(list);
         })
       );
     }
@@ -226,10 +220,6 @@ export class Repository {
       newBranch
     );
 
-    if (switchBranch.exitCode !== 0) {
-      throw new Error(switchBranch.stderr);
-    }
-
     this.resetInfo();
 
     return true;
@@ -245,10 +235,6 @@ export class Repository {
       branchUrl
     );
 
-    if (switchBranch.exitCode !== 0) {
-      throw new Error(switchBranch.stderr);
-    }
-
     this.resetInfo();
 
     return true;
@@ -257,35 +243,27 @@ export class Repository {
   async revert(files: any[]) {
     const result = await this.svn.revert(files);
 
-    if (result.exitCode !== 0) {
-      throw new Error(result.stderr);
-    }
-
     return result.stdout;
   }
 
-  async update() {
+  async update(): Promise<string> {
     const result = await this.svn.update(this.workspaceRoot);
 
-    if (result.exitCode !== 0) {
-      throw new Error(result.stderr);
-    }
-
     this.resetInfo();
 
     const message = result.stdout
       .trim()
       .split(/\r?\n/)
       .pop();
 
-    return message;
+    if (message) {
+      return message;
+    }
+    return result.stdout;
   }
 
   async patch() {
     const result = await this.svn.patch(this.workspaceRoot);
-    if (result.exitCode !== 0) {
-      throw new Error(result.stderr);
-    }
 
     const message = result.stdout;
     return message;
@@ -294,20 +272,12 @@ export class Repository {
   async removeFiles(files: any[], keepLocal: boolean) {
     const result = await this.svn.remove(files, keepLocal);
 
-    if (result.exitCode !== 0) {
-      throw new Error(result.stderr);
-    }
-
     return result.stdout;
   }
 
   async resolve(file: string, action: string) {
     const result = await this.svn.resolve(file, action);
 
-    if (result.exitCode !== 0) {
-      throw new Error(result.stderr);
-    }
-
     return result.stdout;
   }
 
@@ -316,10 +286,6 @@ export class Repository {
     const logLength = config.get<string>("log.length") || "50";
     const result = await this.svn.log(this.workspaceRoot, logLength);
 
-    if (result.exitCode !== 0) {
-      throw new Error(result.stderr);
-    }
-
     return result.stdout;
   }
 
@@ -332,10 +298,6 @@ export class Repository {
       "--xml"
     ]);
 
-    if (result.exitCode !== 0) {
-      return 0;
-    }
-
     const matches = result.stdout.match(/<logentry/g);
 
     if (matches && matches.length > 0) {

src/test/repository.test.ts

@@ -17,6 +17,7 @@ import { Svn } from "../svn";
 import { Model } from "../model";
 import { SvnFinder, ISvn } from "../svnFinder";
 import { Repository } from "../repository";
+import { timeout } from "../util";
 
 // Defines a Mocha test suite to group tests of similar kind together
 suite("Repository Tests", () => {
@@ -104,7 +105,7 @@ suite("Repository Tests", () => {
     await repository.addFile(file);
 
     await repository.update();
-    await testUtil.delay(1500); // Wait the debounce time
+    await timeout(1500); // Wait the debounce time
     assert.equal(repository.changes.resourceStates.length, 1);
 
     const message = await repository.repository.commitFiles("First Commit", [
@@ -113,7 +114,7 @@ suite("Repository Tests", () => {
     assert.ok(/Committed revision (.*)\./i.test(message));
 
     await repository.update();
-    await testUtil.delay(1500); // Wait the debounce time
+    await timeout(1500); // Wait the debounce time
     assert.equal(repository.changes.resourceStates.length, 0);
 
     const remoteContent = await repository.show(file, "HEAD");

src/test/testUtil.ts

@@ -4,6 +4,7 @@ import * as fs from "fs";
 import * as os from "os";
 import { Uri } from "vscode";
 import { SpawnOptions, ChildProcess } from "child_process";
+import { timeout } from "../util";
 
 const tempDir = os.tmpdir();
 let tempDirList: string[] = [];
@@ -14,10 +15,6 @@ export function getSvnUrl(uri: Uri) {
   return url.replace(/%3A/g, ":");
 }
 
-export function delay(ms: number) {
-  return new Promise(resolve => setTimeout(resolve, ms));
-}
-
 export function spawn(
   command: string,
   args?: string[],
@@ -151,7 +148,7 @@ export async function destroyPath(fullPath: string) {
       fs.rmdirSync(fullPath);
       break;
     } catch (error) {
-      await delay(3000);
+      await timeout(3000);
       console.error(error);
     }
   }

src/util.ts

@@ -97,3 +97,7 @@ export function camelcase(name: string) {
 export function hasSupportToDecorationProvider() {
   return typeof window.registerDecorationProvider === "function";
 }
+
+export function timeout(ms: number) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}