Fixed document title for: file head, log and patch

Author: edgardmessias

src/commands.ts

@@ -22,7 +22,7 @@ import { Svn, Status, SvnErrorCodes } from "./svn";
 import { Model } from "./model";
 import { Repository } from "./repository";
 import { Resource } from "./resource";
-import { toSvnUri, fromSvnUri } from "./uri";
+import { toSvnUri, fromSvnUri, SvnUriAction } from "./uri";
 import * as fs from "fs";
 import * as path from "path";
 import { start } from "repl";
@@ -377,7 +377,7 @@ export class SvnCommands implements IDisposable {
 
     if (arg instanceof Uri) {
       if (arg.scheme === "svn") {
-        uris = [Uri.file(fromSvnUri(arg).path)];
+        uris = [Uri.file(fromSvnUri(arg).fsPath)];
       } else if (arg.scheme === "file") {
         uris = [arg];
       }
@@ -444,15 +444,23 @@ export class SvnCommands implements IDisposable {
 
     const HEAD = this.getLeftResource(resource, "HEAD");
 
+    const basename = path.basename(resource.resourceUri.fsPath);
     if (!HEAD) {
-      const basename = path.basename(resource.resourceUri.fsPath);
       window.showWarningMessage(
         `"HEAD version of '${basename}' is not available."`
       );
       return;
     }
 
-    return await commands.executeCommand<void>("vscode.open", HEAD);
+    const basedir = path.dirname(resource.resourceUri.fsPath);
+
+    const uri = HEAD.with({
+      path: path.join(basedir, `(HEAD) ${basename}`) // change document title
+    });
+
+    return await commands.executeCommand<void>("vscode.open", uri, {
+      preview: true
+    });
   }
 
   @command("svn.openChangeBase")
@@ -572,13 +580,17 @@ export class SvnCommands implements IDisposable {
     against: string = ""
   ): Uri | undefined {
     if (resource.type === Status.ADDED && resource.renameResourceUri) {
-      return toSvnUri(resource.renameResourceUri, against);
+      return toSvnUri(resource.renameResourceUri, SvnUriAction.SHOW, {
+        ref: against
+      });
     }
 
     switch (resource.type) {
       case Status.MODIFIED:
       case Status.REPLACED:
-        return toSvnUri(resource.resourceUri, against);
+        return toSvnUri(resource.resourceUri, SvnUriAction.SHOW, {
+          ref: against
+        });
     }
   }
 
@@ -595,7 +607,9 @@ export class SvnCommands implements IDisposable {
         return resource.resourceUri;
       case Status.DELETED:
       case Status.MISSING:
-        return toSvnUri(resource.resourceUri, against);
+        return toSvnUri(resource.resourceUri, SvnUriAction.SHOW, {
+          ref: against
+        });
     }
   }
 
@@ -714,14 +728,17 @@ export class SvnCommands implements IDisposable {
   @command("svn.patch", { repository: true })
   async patch(repository: Repository) {
     try {
-      const result = await repository.patch();
-      // send the patch results to a new tab
-      workspace
-        .openTextDocument({ language: "diff", content: result })
-        .then(doc => {
-          window.showTextDocument(doc);
-        });
-      window.showInformationMessage("Files Patched");
+      const resource = toSvnUri(
+        Uri.file(repository.workspaceRoot),
+        SvnUriAction.PATCH
+      );
+      const uri = resource.with({
+        path: path.join(resource.path, "svn.patch") // change document title
+      });
+
+      await commands.executeCommand<void>("vscode.open", uri, {
+        preview: true
+      });
     } catch (error) {
       console.error(error);
       window.showErrorMessage("Unable to patch");
@@ -806,15 +823,16 @@ export class SvnCommands implements IDisposable {
   @command("svn.log", { repository: true })
   async log(repository: Repository) {
     try {
-      const logPromise = repository.log();
-      window.withProgress(
-        { location: ProgressLocation.Window, title: "Fetching logs" },
-        () => logPromise
+      const resource = toSvnUri(
+        Uri.file(repository.workspaceRoot),
+        SvnUriAction.LOG
       );
-      const result = await logPromise;
-      // send the log results to a new tab
-      workspace.openTextDocument({ content: result }).then(doc => {
-        window.showTextDocument(doc);
+      const uri = resource.with({
+        path: path.join(resource.path, "svn.log") // change document title
+      });
+
+      await commands.executeCommand<void>("vscode.open", uri, {
+        preview: true
       });
     } catch (error) {
       console.error(error);
@@ -833,7 +851,9 @@ export class SvnCommands implements IDisposable {
       return;
     }
 
-    const originalUri = toSvnUri(modifiedUri, "BASE");
+    const originalUri = toSvnUri(modifiedUri, SvnUriAction.SHOW, {
+      ref: "BASE"
+    });
     const originalDocument = await workspace.openTextDocument(originalUri);
     const basename = path.basename(modifiedUri.fsPath);
     const message = `Are you sure you want to revert the selected changes in ${basename}?`;
@@ -934,8 +954,8 @@ export class SvnCommands implements IDisposable {
     }
 
     if (uri.scheme === "svn") {
-      const { path } = fromSvnUri(uri);
-      uri = Uri.file(path);
+      const { fsPath } = fromSvnUri(uri);
+      uri = Uri.file(fsPath);
     }
 
     if (uri.scheme === "file") {

src/repository.ts

@@ -27,7 +27,7 @@ import {
 import * as path from "path";
 import * as micromatch from "micromatch";
 import { setInterval, clearInterval } from "timers";
-import { toSvnUri } from "./uri";
+import { toSvnUri, SvnUriAction } from "./uri";
 import { Status, PropStatus, SvnErrorCodes } from "./svn";
 import { IFileStatus } from "./statusParser";
 
@@ -492,7 +492,7 @@ export class Repository {
       return;
     }
 
-    return toSvnUri(uri, "");
+    return toSvnUri(uri, SvnUriAction.SHOW);
   }
 
   async getBranches() {

src/svnContentProvider.ts

@@ -8,7 +8,7 @@ import {
   window
 } from "vscode";
 import { Model, ModelChangeEvent, OriginalResourceChangeEvent } from "./model";
-import { toSvnUri, fromSvnUri } from "./uri";
+import { toSvnUri, fromSvnUri, SvnUriAction } from "./uri";
 import { throttle, debounce } from "./decorators";
 import {
   filterEvent,
@@ -100,12 +100,20 @@ export class SvnContentProvider
     this.cache[cacheKey] = cacheValue;
 
     try {
-      const { path, ref } = fromSvnUri(uri);
+      const { fsPath, action, extra } = fromSvnUri(uri);
 
-      return await repository.show(path, ref);
-    } catch (error) {
-      return "";
-    }
+      if (action === SvnUriAction.SHOW) {
+        const ref = extra.ref;
+        return await repository.show(fsPath, ref);
+      }
+      if (action === SvnUriAction.LOG) {
+        return await repository.log();
+      }
+      if (action === SvnUriAction.PATCH) {
+        return await repository.patch();
+      }
+    } catch (error) {}
+    return "";
   }
 
   private cleanup(): void {
@@ -114,10 +122,10 @@ export class SvnContentProvider
 
     Object.keys(this.cache).forEach(key => {
       const row = this.cache[key];
-      const { path } = fromSvnUri(row.uri);
+      const { fsPath } = fromSvnUri(row.uri);
       const isOpen = workspace.textDocuments
         .filter(d => d.uri.scheme === "file")
-        .some(d => d.uri.fsPath === path);
+        .some(d => d.uri.fsPath === fsPath);
 
       if (isOpen || now - row.timestamp < THREE_MINUTES) {
         cache[row.uri.toString()] = row;

src/uri.ts

@@ -1,21 +1,37 @@
 import { Uri } from "vscode";
 
+export enum SvnUriAction {
+  LOG = "LOG",
+  PATCH = "PATCH",
+  SHOW = "SHOW"
+}
+
+export interface SvnUriExtraParams {
+  ref?: string;
+  limit?: string;
+  [key: string]: any;
+}
+
 export interface SvnUriParams {
-  path: string;
-  ref: string;
+  action: SvnUriAction;
+  fsPath: string;
+  extra: SvnUriExtraParams;
 }
 
 export function fromSvnUri(uri: Uri): SvnUriParams {
   return JSON.parse(uri.query);
 }
 
-export function toSvnUri(uri: Uri, ref: string): Uri {
+export function toSvnUri(uri: Uri, action: SvnUriAction, extra: SvnUriExtraParams = {}): Uri {
+  const params: SvnUriParams = {
+    action: action,
+    fsPath: uri.fsPath,
+    extra: extra
+  };
+
   return uri.with({
     scheme: "svn",
     path: uri.path,
-    query: JSON.stringify({
-      path: uri.fsPath,
-      ref
-    })
+    query: JSON.stringify(params)
   });
 }

src/util.ts

@@ -74,8 +74,8 @@ export function isDescendant(parent: string, descendant: string): boolean {
 
   // IF Windows
   if (sep === "\\") {
-    parent = parent.toLowerCase();
-    descendant = descendant.toLowerCase();
+    parent = parent.replace(/^\\/, "").toLowerCase();
+    descendant = descendant.replace(/^\\/, "").toLowerCase();
   }
 
   if (parent === descendant) {