ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-27 09:35:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes more issues with paths :(

Browse Source
This commit is contained in:
Eric Amodio
2017-03-22 03:04:52 -04:00
parent 671f1ca6c1
commit 43e4337358
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/git/parsers/blameParser.ts
View File

@@ -116,7 +116,7 @@ export class GitBlameParser {
return entries;
}
static parse(data: string, fileName: string): IGitBlame {
static parse(data: string, repoPath: string, fileName: string): IGitBlame {
const entries = this._parseEntries(data);
if (!entries) return undefined;
@@ -124,16 +124,15 @@ export class GitBlameParser {
const commits: Map<string, GitCommit> = new Map();
const lines: Array<IGitCommitLine> = [];
let repoPath: string;
let relativeFileName: string;
let relativeFileName = repoPath && fileName;
for (let i = 0, len = entries.length; i < len; i++) {
const entry = entries[i];
if (i === 0) {
if (i === 0 && !repoPath) {
// Try to get the repoPath from the most recent commit
repoPath = Git.normalizePath(fileName.replace(`/${entry.fileName}`, ''));
relativeFileName = path.relative(repoPath, fileName).replace(/\\/g, '/');
relativeFileName = Git.normalizePath(path.relative(repoPath, fileName));
}
let commit = commits.get(entry.sha);