fix: Changed how file paths are shown in branch changes (#1162)

JohnstonCode · Nov 21, 2020 · 8784c5e · 8784c5e
1 parent 63b0f49
commit 8784c5e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/common/types.ts b/src/common/types.ts
@@ -62,6 +62,7 @@ export interface ISvnPathChange {
   kind: SvnKindType;
   item: Status;
   repo: Uri;
+  localPath: Uri;
 }
 
 export interface ISvnListItem {

diff --git a/src/historyView/branchChangesProvider.ts b/src/historyView/branchChangesProvider.ts
@@ -51,14 +51,18 @@ export class BranchChangesProvider
     const iconPath = getIconObject(iconName);
 
     return {
-      label: element.newPath.toString(),
+      label: element.localPath.fsPath,
       command: {
         command: "svn.branchchanges.openDiff",
         title: "Open diff",
         arguments: [element]
       },
       iconPath,
-      tooltip: `${element.oldPath}@r${element.oldRevision} → ${element.newPath}@r${element.newRevision}`
+      tooltip: `${element.oldPath.fsPath.replace(element.repo.fsPath, "")}@r${
+        element.oldRevision
+      } → ${element.newPath.fsPath.replace(element.repo.fsPath, "")}@r${
+        element.newRevision
+      }`
     };
   }
 

diff --git a/src/svnRepository.ts b/src/svnRepository.ts
@@ -271,7 +271,8 @@ export class Repository {
         item: path.item,
         props: path.props,
         kind: path.kind,
-        repo: Uri.parse(this.info.repository.root)
+        repo: Uri.parse(this.info.repository.root),
+        localPath: Uri.parse(path._.replace(copyFromUrl, ""))
       });
     }