Rework on repository.ts (Close #141)

* Moved inputs and alerts to commands.ts
* Check repository is locked on run command (retryRun)
* Get branch list only on switch command
* Update status only after commands

Author: edgardmessias

package.json

@@ -317,6 +317,11 @@
           "description": "Whether svn is enabled",
           "default": true
         },
+        "svn.autorefresh": {
+          "type": "boolean",
+          "description": "Whether auto refreshing is enabled",
+          "default": true
+        },
         "svn.decorations.enabled": {
           "type": "boolean",
           "description":
@@ -360,13 +365,6 @@
             "How frequently (in minutes) to check branch changes. Set to `0` to avoid periodic checks.",
           "default": 5
         },
-        "svn.newsCommits.update": {
-          "type": "number",
-          "minimum": 0,
-          "description":
-            "How frequently (in minutes) to check news commits. Set to `0` to avoid periodic checks.",
-          "default": 5
-        },
         "svn.multipleFolders.enabled": {
           "type": "boolean",
           "description": "Allow to find subfolders using SVN",

src/commands.ts

@@ -8,10 +8,11 @@ import {
   workspace,
   SourceControlResourceGroup,
   ViewColumn,
-  SourceControlResourceState
+  SourceControlResourceState,
+  ProgressLocation
 } from "vscode";
 import { inputCommitMessage } from "./messages";
-import { Svn, Status } from "./svn";
+import { Svn, Status, SvnErrorCodes } from "./svn";
 import { Model } from "./model";
 import { Repository } from "./repository";
 import { Resource } from "./resource";
@@ -84,7 +85,20 @@ class SwitchBranchItem implements QuickPickItem {
   }
 
   async run(repository: Repository): Promise<void> {
-    await repository.switchBranch(this.ref);
+    try {
+      await repository.switchBranch(this.ref);
+    } catch (error) {
+      if (error.svnErrorCode === SvnErrorCodes.NotShareCommonAncestry) {
+        window.showErrorMessage(
+          `Path '${
+            repository.workspaceRoot
+          }' does not share common version control ancestry with the requested switch location.`
+        );
+        return;
+      }
+
+      window.showErrorMessage("Unable to switch branch");
+    }
   }
 }
 
@@ -235,7 +249,7 @@ export class SvnCommands {
       );
       window.showInformationMessage(result);
       repository.inputBox.value = "";
-      repository.update();
+      repository.updateModelState();
     } catch (error) {
       console.error(error);
       window.showErrorMessage(error);
@@ -355,7 +369,7 @@ export class SvnCommands {
 
       const result = await repository.repository.commitFiles(message, paths);
       window.showInformationMessage(result);
-      repository.update();
+      repository.updateModelState();
     } catch (error) {
       console.error(error);
       window.showErrorMessage("Unable to commit");
@@ -364,8 +378,7 @@ export class SvnCommands {
 
   @command("svn.refresh", { repository: true })
   async refresh(repository: Repository) {
-    repository.update();
-    repository.updateBranches();
+    await repository.status();
   }
 
   @command("svn.openResourceBase")
@@ -635,12 +648,19 @@ export class SvnCommands {
 
   @command("svn.switchBranch", { repository: true })
   async switchBranch(repository: Repository) {
-    const branches = repository.branches.map(
-      branch => new SwitchBranchItem(branch)
+    const branchesPromise = repository.getBranches();
+
+    window.withProgress(
+      { location: ProgressLocation.Window, title: "Checking remote branches" },
+      () => branchesPromise
     );
+
+    const branches = await branchesPromise;
+
+    const branchPicks = branches.map(branch => new SwitchBranchItem(branch));
     const placeHolder = "Pick a branch to switch to.";
     const createBranch = new CreateBranchItem(this);
-    const picks = [createBranch, ...branches];
+    const picks = [createBranch, ...branchPicks];
 
     const choice = await window.showQuickPick(picks, { placeHolder });
 
@@ -755,7 +775,7 @@ export class SvnCommands {
       });
 
       const result = await repository.repository.removeFiles(paths, keepLocal);
-      repository.update();
+      repository.updateModelState();
     } catch (error) {
       console.error(error);
       window.showErrorMessage("Unable to remove files");
@@ -782,7 +802,15 @@ export class SvnCommands {
         return;
       }
 
-      await repository.resolve(conflict.resourceUri.path, choice.label);
+      try {
+        const response = await repository.resolve(
+          conflict.resourceUri.path,
+          choice.label
+        );
+        window.showInformationMessage(response);
+      } catch (error) {
+        window.showErrorMessage(error.stderr);
+      }
     }
   }
 

src/decorationProvider.ts

@@ -96,8 +96,7 @@ class SvnDecorationProvider implements DecorationProvider {
   constructor(private repository: Repository) {
     this.disposables.push(
       window.registerDecorationProvider(this),
-      // repository.onDidRunOperation(this.onDidRunOperation, this)
-      repository.onDidChangeStatus(this.onDidRunOperation, this)
+      repository.onDidRunOperation(this.onDidRunOperation, this)
     );
   }