recovered FsUri and copy fsPath to path (#479)

* recovered FsUri and copy fsPath to path
* Updated CHANGELOG.md and version

Author: ole

CHANGELOG.md

@@ -1,3 +1,6 @@
+## Version 0.6.1
+- Fixed [#478](https://github.com/DonJayamanne/gitHistoryVSCode/issues/478)
+
 ## Version 0.6.0
 - Replaced express with postMessage [#469](https://github.com/DonJayamanne/gitHistoryVSCode/pull/469) [#451](https://github.com/DonJayamanne/gitHistoryVSCode/issues/451)
 - Updated package dependencies and removed gulp [#471](https://github.com/DonJayamanne/gitHistoryVSCode/pull/471)

package.json

@@ -2,7 +2,7 @@
     "name": "githistory",
     "displayName": "Git History",
     "description": "View git log, file history, compare branches or commits",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "publisher": "donjayamanne",
     "author": {
         "name": "Don Jayamanne",

src/adapter/parsers/fileStat/parser.ts

@@ -2,7 +2,7 @@ import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import { Uri } from 'vscode';
 import { IServiceContainer } from '../../../ioc/types';
-import { CommittedFile, Status } from '../../../types';
+import { CommittedFile, Status, FsUri } from '../../../types';
 import { IFileStatParser, IFileStatStatusParser } from '../types';
 
 @injectable()
@@ -137,18 +137,26 @@ export class FileStatParser implements IFileStatParser {
                 const currentAndOriginalFile = FileStatParser.getNewAndOldFileNameFromNumStatLine(line, status)!;
                 const oldRelativePath = currentAndOriginalFile ? currentAndOriginalFile.original : undefined;
                 const relativePath = currentAndOriginalFile.current;
-                const oldUri = oldRelativePath ? Uri.file(path.join(gitRootPath, oldRelativePath)) : undefined;
+                const oldUri = oldRelativePath
+                    ? (Uri.file(path.join(gitRootPath, oldRelativePath)) as FsUri)
+                    : undefined;
 
                 const fileInfo: CommittedFile = {
                     additions,
                     deletions,
                     status,
                     relativePath,
                     oldRelativePath,
-                    uri: Uri.file(path.join(gitRootPath, relativePath)),
+                    uri: Uri.file(path.join(gitRootPath, relativePath)) as FsUri,
                     oldUri,
                 };
 
+                fileInfo.uri.path = fileInfo.uri.fsPath;
+
+                if (fileInfo.oldUri) {
+                    fileInfo.oldUri.path = fileInfo.oldUri.fsPath;
+                }
+
                 return fileInfo;
             })
             .filter(commitFile => commitFile !== undefined)

src/adapter/repository/git.ts

@@ -6,7 +6,7 @@ import { Uri } from 'vscode';
 import { IWorkspaceService } from '../../application/types/workspace';
 import { cache } from '../../common/cache';
 import { IServiceContainer } from '../../ioc/types';
-import { ActionedUser, Branch, CommittedFile, Hash, IGitService, LogEntries, LogEntry, Ref } from '../../types';
+import { ActionedUser, Branch, CommittedFile, Hash, IGitService, LogEntries, LogEntry, Ref, FsUri } from '../../types';
 import { IGitCommandExecutor } from '../exec';
 import { IFileStatParser, ILogParser } from '../parsers/types';
 import { ITEM_ENTRY_SEPARATOR, LOG_ENTRY_SEPARATOR, LOG_FORMAT_ARGS } from './constants';
@@ -251,7 +251,7 @@ export class Git implements IGitService {
     }
 
     @cache('IGitService')
-    public async getCommitFile(hash: string, file: Uri | string): Promise<Uri> {
+    public async getCommitFile(hash: string, file: FsUri | string): Promise<Uri> {
         //const gitRootPath = await this.getGitRoot();
         const filePath = typeof file === 'string' ? file : file.path.toString();
 
@@ -299,7 +299,7 @@ export class Git implements IGitService {
     }
 
     @cache('IGitService')
-    public async getPreviousCommitHashForFile(hash: string, file: Uri): Promise<Hash> {
+    public async getPreviousCommitHashForFile(hash: string, file: FsUri): Promise<Hash> {
         const gitRootPath = await this.getGitRoot();
         const relativeFilePath = path.relative(gitRootPath, file.path);
         const args = this.gitArgsService.getPreviousCommitHashForFileArgs(hash, relativeFilePath);

src/types.ts

@@ -11,6 +11,15 @@ export enum BranchSelection {
     Detached = 3,
 }
 
+export type FsUri = {
+    scheme: string;
+    authority: string;
+    path: string;
+    query: string;
+    fragment: string;
+    fsPath: string;
+};
+
 export enum RefType {
     Head,
     RemoteHead,
@@ -35,8 +44,8 @@ export type Branch = {
 };
 
 export type CommittedFile = {
-    uri: Uri;
-    oldUri?: Uri;
+    uri: FsUri;
+    oldUri?: FsUri;
     oldRelativePath?: string;
     relativePath: string;
     status: Status;
@@ -138,10 +147,10 @@ export interface IGitService {
         lineNumber?: number,
         author?: string,
     ): Promise<LogEntries>;
-    getPreviousCommitHashForFile(hash: string, file: Uri): Promise<Hash>;
+    getPreviousCommitHashForFile(hash: string, file: FsUri): Promise<Hash>;
     getCommit(hash: string): Promise<LogEntry | undefined>;
     revertCommit(hash: string): Promise<void>;
-    getCommitFile(hash: string, file: Uri | string): Promise<Uri>;
+    getCommitFile(hash: string, file: FsUri | string): Promise<Uri>;
     getDifferences(hash1: string, hash2: string): Promise<CommittedFile[]>;
     cherryPick(hash: string): Promise<void>;
     reset(hash: string, hard?: boolean): Promise<void>;