Removed usage of repository.repository (Close #143)

Author: edgardmessias

src/commands.ts

@@ -243,13 +243,9 @@ export class SvnCommands {
     });
 
     try {
-      const result = await repository.repository.commitFiles(
-        message,
-        filePaths
-      );
+      const result = await repository.commitFiles(message, filePaths);
       window.showInformationMessage(result);
       repository.inputBox.value = "";
-      repository.updateModelState();
     } catch (error) {
       console.error(error);
       window.showErrorMessage(error);
@@ -367,9 +363,8 @@ export class SvnCommands {
         return;
       }
 
-      const result = await repository.repository.commitFiles(message, paths);
+      const result = await repository.commitFiles(message, paths);
       window.showInformationMessage(result);
-      repository.updateModelState();
     } catch (error) {
       console.error(error);
       window.showErrorMessage("Unable to commit");
@@ -711,7 +706,7 @@ export class SvnCommands {
       });
 
       await this.runByRepository(paths, async (repository, paths) =>
-        repository.repository.revert(paths)
+        repository.revert(paths)
       );
     } catch (error) {
       console.error(error);
@@ -733,7 +728,7 @@ export class SvnCommands {
   @command("svn.patch", { repository: true })
   async patch(repository: Repository) {
     try {
-      const result = await repository.repository.patch();
+      const result = await repository.patch();
       // send the patch results to a new tab
       workspace
         .openTextDocument({ language: "diff", content: result })
@@ -774,8 +769,7 @@ export class SvnCommands {
         return state.resourceUri.fsPath;
       });
 
-      const result = await repository.repository.removeFiles(paths, keepLocal);
-      repository.updateModelState();
+      const result = await repository.removeFiles(paths, keepLocal);
     } catch (error) {
       console.error(error);
       window.showErrorMessage("Unable to remove files");
@@ -817,7 +811,7 @@ export class SvnCommands {
   @command("svn.log", { repository: true })
   async log(repository: Repository) {
     try {
-      const result = await repository.repository.log();
+      const result = await repository.log();
       // send the log results to a new tab
       workspace.openTextDocument({ content: result }).then(doc => {
         window.showTextDocument(doc);

src/model.ts

@@ -308,10 +308,10 @@ export class Model {
       throw new Error("There are no available repositories");
     }
 
-    const picks: any[] = this.openRepositories.map(repository => {
+    const picks: any[] = this.repositories.map(repository => {
       return {
-        label: path.basename(repository.repository.root),
-        repository: repository.repository
+        label: path.basename(repository.root),
+        repository: repository
       };
     });
     const placeHolder = "Choose a repository";

src/repository.ts

@@ -39,9 +39,14 @@ export enum RepositoryState {
 export enum Operation {
   Add = "Add",
   AddChangelist = "AddChangelist",
+  Commit = "Commit",
+  Log = "Log",
   NewBranch = "NewBranch",
+  Patch = "Patch",
+  Remove = "Remove",
   RemoveChangelist = "RemoveChangelist",
   Resolve = "Resolve",
+  Revert = "Revert",
   Show = "Show",
   Status = "Status",
   SwitchBranch = "SwitchBranch",
@@ -50,6 +55,7 @@ export enum Operation {
 
 function isReadOnly(operation: Operation): boolean {
   switch (operation) {
+    case Operation.Log:
     case Operation.Show:
       return true;
     default:
@@ -550,6 +556,32 @@ export class Repository {
     );
   }
 
+  async commitFiles(message: string, files: any[]) {
+    return await this.run(Operation.Commit, () =>
+      this.repository.commitFiles(message, files)
+    );
+  }
+
+  async revert(files: Uri[] | string[]) {
+    return await this.run(Operation.Revert, () =>
+      this.repository.revert(files)
+    );
+  }
+
+  async patch() {
+    return await this.run(Operation.Patch, () => this.repository.patch());
+  }
+
+  async removeFiles(files: any[], keepLocal: boolean) {
+    return await this.run(Operation.Remove, () =>
+      this.repository.removeFiles(files, keepLocal)
+    );
+  }
+
+  async log() {
+    return await this.run(Operation.Log, () => this.repository.log());
+  }
+
   private async run<T>(
     operation: Operation,
     runOperation: () => Promise<T> = () => Promise.resolve<any>(null)

src/svn.ts

@@ -317,7 +317,7 @@ export class Svn {
     return this.exec(root, ["switch", path]);
   }
 
-  revert(files: any[]) {
+  revert(files: Uri[] | string[]) {
     let args = ["revert"];
 
     for (let file of files) {

src/svnRepository.ts

@@ -1,4 +1,4 @@
-import { workspace } from "vscode";
+import { workspace, Uri } from "vscode";
 import { Svn, CpOptions } from "./svn";
 import { IFileStatus, parseStatusXml } from "./statusParser";
 import { parseInfoXml, ISvnInfo } from "./infoParser";
@@ -240,7 +240,7 @@ export class Repository {
     return true;
   }
 
-  async revert(files: any[]) {
+  async revert(files: Uri[] | string[]) {
     const result = await this.svn.revert(files);
 
     return result.stdout;

src/test/repository.test.ts

@@ -99,21 +99,18 @@ suite("Repository Tests", () => {
 
     const file = path.join(checkoutDir.fsPath, "new.txt");
 
-    await repository.updateModelState();
     fs.writeFileSync(file, "test");
 
     await repository.addFile(file);
 
-    await repository.updateModelState();
     await timeout(1500); // Wait the debounce time
     assert.equal(repository.changes.resourceStates.length, 1);
 
-    const message = await repository.repository.commitFiles("First Commit", [
+    const message = await repository.commitFiles("First Commit", [
       file
     ]);
     assert.ok(/Committed revision (.*)\./i.test(message));
 
-    await repository.updateModelState();
     await timeout(1500); // Wait the debounce time
     assert.equal(repository.changes.resourceStates.length, 0);