bug fixes

Author: JohnstonCode

CHANGELOG.md

@@ -1,3 +1,17 @@
+**v0.8.9**
+=============================================
+
+## Bug Fixes
+  - Fixed Missing icons
+  - Fixed all changes showing as untracked
+
+**v0.8.8**
+=============================================
+
+## Bug Fixes
+  - Fixed issue were no changes should show but last change was still present
+  - Removed SVN 1.9 requirement
+
 **v0.8.7**
 =============================================
 

package.json

@@ -2,7 +2,7 @@
   "name": "svn-scm",
   "displayName": "SVN",
   "description": "Integrated Subversion source control",
-  "version": "0.8.7",
+  "version": "0.8.9",
   "publisher": "johnstoncode",
   "engines": {
     "vscode": "^1.16.0"

src/extension.js

@@ -9,7 +9,7 @@ function activate(context) {
   const disposable = [];
   const svn = new Svn();
   const model = new Model(svn);
-  const contentProvider = new SvnContentProvider();
+  const contentProvider = new SvnContentProvider(model);
   const commands = new SvnCommands(model);
 
   console.log("svn-scm is now active!");

src/repository.js

@@ -46,67 +46,55 @@ Repository.prototype.provideOriginalResource = uri => {
   return new Uri().with({ scheme: "svn", query: uri.path, path: uri.path });
 };
 
-Repository.prototype.update = function() {
-  return new Promise((resolve, reject) => {
-    let changes = [];
-    let notTracked = [];
+Repository.prototype.update = async function() {
+  let changes = [];
+  let notTracked = [];
+  let statuses = (await this.repository.getStatus()) || [];
 
-    this.repository
-      .getStatus()
-      .then(result => {
-        result.forEach(item => {
-          switch (item[0]) {
-            case "A":
-              changes.push(
-                new Resource(this.repository.workspaceRoot, item[1], "added")
-              );
-              break;
-            case "D":
-              changes.push(
-                new Resource(this.repository.workspaceRoot, item[1], "deleted")
-              );
-              break;
-            case "M":
-              changes.push(
-                new Resource(this.repository.workspaceRoot, item[1], "modified")
-              );
-              break;
-            case "R":
-              changes.push(
-                new Resource(this.repository.workspaceRoot, item[1], "replaced")
-              );
-              break;
-            case "!":
-              changes.push(
-                new Resource(this.repository.workspaceRoot, item[1], "missing")
-              );
-              break;
-            case "C":
-              changes.push(
-                new Resource(this.repository.workspaceRoot, item[1], "conflict")
-              );
-              break;
-            case "?":
-              notTracked.push(
-                new Resource(
-                  this.repository.workspaceRoot,
-                  item[1],
-                  "unversioned"
-                )
-              );
-              break;
-          }
-        });
+  statuses.forEach(status => {
+    switch (status[0]) {
+      case "A":
+        changes.push(
+          new Resource(this.repository.workspaceRoot, status[1], "Added")
+        );
+        break;
+      case "D":
+        changes.push(
+          new Resource(this.repository.workspaceRoot, status[1], "Deleted")
+        );
+        break;
+      case "M":
+        changes.push(
+          new Resource(this.repository.workspaceRoot, status[1], "Modified")
+        );
+        break;
+      case "R":
+        changes.push(
+          new Resource(this.repository.workspaceRoot, status[1], "Replaced")
+        );
+        break;
+      case "!":
+        changes.push(
+          new Resource(this.repository.workspaceRoot, status[1], "Missing")
+        );
+        break;
+      case "C":
+        changes.push(
+          new Resource(this.repository.workspaceRoot, status[1], "Conflict")
+        );
+        break;
+      case "?":
+        notTracked.push(
+          new Resource(this.repository.workspaceRoot, status[1], "Unversioned")
+        );
+        break;
+    }
+  });
 
-        this.changes.resourceStates = changes;
-        this.notTracked.resourceStates = notTracked;
+  this.changes.resourceStates = changes;
+  this.notTracked.resourceStates = notTracked;
 
-        resolve();
-      })
-      .catch(() => {
-        reject();
-      });
-  });
+  return Promise.resolve();
 };
 
 module.exports = Repository;

src/resource.js

@@ -58,19 +58,19 @@ Resource.prototype.getIconPath = function(theme) {
   };
 
   switch (this.type) {
-    case "added":
+    case "Added":
       return Icons[theme].Added;
-    case "conflicted":
+    case "Conflicted":
       return Icons[theme].Conflicted;
-    case "deleted":
+    case "Deleted":
       return Icons[theme].Deleted;
-    case "modified":
+    case "Modified":
       return Icons[theme].Modified;
-    case "replaced":
+    case "Replaced":
       return Icons[theme].Replaced;
-    case "missing":
+    case "Missing":
       return Icons[theme].Missing;
-    case "unversioned":
+    case "Unversioned":
       return Icons[theme].Unversioned;
     default:
       return 0;

src/svn.js

@@ -52,7 +52,7 @@ svn.prototype.getRepositoryRoot = async function(path) {
     let rootPath = result.match(/<wcroot-abspath>(.*)<\/wcroot-abspath>/i)[1];
     return rootPath;
   } catch (error) {
-    throw new Error("not a SVN repo");
+    throw new Error("Unable to find repository root path");
   }
 };
 
@@ -126,3 +126,7 @@ Repository.prototype.commit = async function(message) {
     throw new Error("unable to commit files");
   }
 };
+
+Repository.prototype.show = function(path) {
+  return this.svn.show(path);
+};

src/svnContentProvider.js

@@ -1,19 +1,22 @@
 var vscode = require("vscode");
-var svn = require("./svn");
-var path = require("path");
 
-function SvnContentProvider() {
-  this.svn = new svn();
+function SvnContentProvider(model) {
+  this.model = model;
   vscode.workspace.registerTextDocumentContentProvider("svn", this);
 }
 
-SvnContentProvider.prototype.provideTextDocumentContent = function(uri) {
-  return new Promise((resolve, reject) => {
-    this.svn
-      .show(uri.fsPath)
-      .then(result => resolve(result))
-      .catch(error => reject(error));
-  });
+SvnContentProvider.prototype.provideTextDocumentContent = async function(uri) {
+  const repository = this.model.getRepository(uri.fsPath);
+
+  if (!repository) {
+    return "";
+  }
+
+  try {
+    return await repository.show(uri.fsPath);
+  } catch (error) {
+    return "";
+  }
 };
 
 module.exports = SvnContentProvider;