fixed open diff head

Author: JohnstonCode

CHANGELOG.md

@@ -1,3 +1,10 @@
+# **v1.0.2**
+
+## Bug Fixes
+
+* Diff against head should now work.
+* Update debounce was re-added by @edgardmessias
+
 # **v1.0.1**
 
 ## What's New

package.json

@@ -2,7 +2,7 @@
   "name": "svn-scm",
   "displayName": "SVN",
   "description": "Integrated Subversion source control",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "publisher": "johnstoncode",
   "engines": {
     "vscode": "^1.17.0"
@@ -54,7 +54,7 @@
         "category": "SVN"
       },
       {
-        "command": "svn.openChanges",
+        "command": "svn.openDiffHead",
         "title": "Diff Changes HEAD",
         "category": "SVN"
       },
@@ -99,7 +99,7 @@
           "group": "1_modification"
         },
         {
-          "command": "svn.openChanges",
+          "command": "svn.openDiffHead",
           "when": "scmProvider == svn && scmResourceGroup == changes",
           "group": "1_modification"
         }

src/commands.ts

@@ -81,8 +81,8 @@ export class SvnCommands {
         options: { repository: true }
       },
       {
-        commandId: "svn.openChanges",
-        method: this.openChanges,
+        commandId: "svn.openDiffHead",
+        method: this.openDiffHead,
         options: {}
       },
       {
@@ -212,55 +212,40 @@ export class SvnCommands {
     repository.update();
   }
 
-  async openChanges(resource: Resource) {
-    if (resource instanceof Resource) {
-      this.openResource(resource, true);
-    }
-  }
-
-  private async openResource(
-    resource: Resource,
-    preview?: boolean,
-    preserveFocus?: boolean,
-    preserveSelection?: boolean
-  ) {
+  async openDiff(resource: Resource, against: string) {
     const left = this.getLeftResource(resource);
     const right = this.getRightResource(resource);
-    // const title = this.getTitle(resource);
-    const title = "test";
+    const title = this.getDiffTitle(resource, against);
 
     if (!right) {
       return;
     }
 
     if (!left) {
-      window.showErrorMessage("File not found on HEAD");
+      window.showErrorMessage(`No diff available at ${against}`);
       return;
     }
 
-    const options: TextDocumentShowOptions = {
-      preserveFocus,
-      preview
-    };
+    try {
+      await commands.executeCommand("vscode.diff", left, right, title);
+    } catch (error) {
+      console.log(error);
+    }
+  }
 
-    const activeTextEditor = window.activeTextEditor;
+  private getDiffTitle(resource: Resource, ref: string): string {
+    let file = path.basename(resource.relativePath);
 
-    if (
-      preserveSelection &&
-      activeTextEditor &&
-      activeTextEditor.document.uri.path === right.path
-    ) {
-      options.selection = activeTextEditor.selection;
-    }
+    return `${file} (${ref})`;
+  }
 
-    if (!preview) {
-      await commands.executeCommand("vscode.open", right);
-    } else {
-      await commands.executeCommand("vscode.diff", left, right, title);
+  async openDiffHead(resource: Resource) {
+    if (resource instanceof Resource) {
+      this.openDiff(resource, "HEAD");
     }
   }
 
-  private async getURI(uri: Uri, ref: string) {
+  private getURI(uri: Uri, ref: string): Uri {
     return toSvnUri(uri, ref);
   }
 
@@ -273,7 +258,7 @@ export class SvnCommands {
 
     switch (resource.type) {
       case "modified":
-        return this.getURI(resource.resourceUri, "~");
+        return this.getURI(resource.resourceUri, "HEAD");
       default:
         return false;
     }

src/uri.ts

@@ -1,6 +1,6 @@
 import { Uri } from "vscode";
 
-export function toSvnUri(uri: Uri, ref: string) {
+export function toSvnUri(uri: Uri, ref: string): Uri {
   return uri.with({
     scheme: "svn",
     path: uri.path,