Merge pull request #59 from edgardmessias/diif_changes

Added configure diff changes with HEAD (Close #56)

Author: JohnstonCode

CHANGELOG.md

@@ -6,6 +6,8 @@
   * "svn.layout.trunk" : Relative path for 'trunk' in SVN URL, 'null' to disable. (Ex.: 'trunk', 'main')
   * "svn.layout.branches" : Relative path for 'branches' in SVN URL, 'null' to disable. (Ex.: 'branches', 'versions')
   * "svn.layout.tags" : Relative path for 'tags' in SVN URL, 'null' to disable. (Ex.: 'tags', 'stamps')
+* @edgardmessias Added support to configure diff changes. To configure, edit the options:
+  * "svn.diff.withHead" : Show diff changes using latest revision in the repository. Set false to use latest revision in local folder
 
 ## Bug Fixes
 

package.json

@@ -131,6 +131,11 @@
           "default": null,
           "isExecutable": true
         },
+        "svn.diff.withHead": {
+          "type": "boolean",
+          "description": "Show diff changes using latest revision in the repository. Set false to use latest revision in local folder",
+          "default": true
+        },
         "svn.layout.trunk": {
           "type": ["string", "null"],
           "description": "Relative path for 'trunk' in SVN URL, 'null' to disable. (Ex.: 'trunk', 'main')",

src/repository.ts

@@ -166,8 +166,8 @@ export class Repository {
     return uri.with({ scheme: "svn", query: uri.path, path: uri.path });
   }
 
-  show(filePath: string): Promise<string> {
-    return this.repository.show(filePath);
+  show(filePath: string, revision?: string): Promise<string> {
+    return this.repository.show(filePath, revision);
   }
 
   addFile(filePath: string) {

src/svn.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from "events";
-import { window } from "vscode";
+import { window, workspace } from "vscode";
 import * as cp from "child_process";
 import * as iconv from "iconv-lite";
 import * as jschardet from "jschardet";
@@ -175,8 +175,14 @@ export class Svn {
     return this.exec("", ["add", path]);
   }
 
-  show(path: string, options: CpOptions = {}) {
-    return this.exec("", ["cat", "-r", "HEAD", path], options);
+  show(path: string, revision?: string, options: CpOptions = {}) {
+    var args = ["cat", path];
+
+    if (revision) {
+      args.push("-r", revision);
+    }
+
+    return this.exec("", args, options);
   }
 
   list(path: string) {

src/svnContentProvider.ts

@@ -13,8 +13,17 @@ export class SvnContentProvider {
       return "";
     }
 
+    let revision = undefined;
+
+    const config = workspace.getConfiguration("svn");
+    const diffWithHead = config.get<boolean>("diff.withHead");
+
+    if (diffWithHead) {
+      revision = "HEAD";
+    }
+
     try {
-      return repository.show(uri.fsPath);
+      return repository.show(uri.fsPath, revision);
     } catch (error) {
       return "";
     }

src/svnRepository.ts

@@ -24,8 +24,8 @@ export class Repository {
     return status;
   }
 
-  async show(path: string, options: CpOptions = {}): Promise<string> {
-    const result = await this.svn.show(path, options);
+  async show(path: string, revision?: string, options: CpOptions = {}): Promise<string> {
+    const result = await this.svn.show(path, revision, options);
 
     if (result.exitCode !== 0) {
       throw new Error(result.stderr);