ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-14 10:03:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Changes GitUri to have the full path (like normal Uris)

Browse Source
This commit is contained in:
Eric Amodio
2017-03-12 01:12:49 -05:00
parent b40ad7eced
commit 89a2471736
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/git/gitEnrichment.ts
View File

@@ -96,11 +96,11 @@ export class GitCommit implements IGitCommit {
}
get previousUri(): Uri {
return this.previousFileName ? Uri.file(path.join(this.repoPath, this.previousFileName)) : this.uri;
return this.previousFileName ? Uri.file(path.resolve(this.repoPath, this.previousFileName)) : this.uri;
}
get uri(): Uri {
return Uri.file(path.join(this.repoPath, this.originalFileName || this.fileName));
return Uri.file(path.resolve(this.repoPath, this.originalFileName || this.fileName));
}
getFormattedPath(separator: string = ' \u00a0\u2022\u00a0 '): string {
@@ -155,7 +155,7 @@ export class GitLogCommit extends GitCommit {
}
get nextUri(): Uri {
return this.nextFileName ? Uri.file(path.join(this.repoPath, this.nextFileName)) : this.uri;
return this.nextFileName ? Uri.file(path.resolve(this.repoPath, this.nextFileName)) : this.uri;
}
}

10
src/git/gitUri.ts
View File

@@ -25,27 +25,21 @@ export class GitUri extends Uri {
this.offset = 0;
if (uri.scheme === DocumentSchemes.GitLensGit) {
const data = GitProvider.fromGitContentUri(uri);
base._fsPath = data.originalFileName || data.fileName;
base._fsPath = path.resolve(data.repoPath, data.originalFileName || data.fileName);
this.offset = (data.decoration && data.decoration.split('\n').length) || 0;
if (!Git.isUncommitted(data.sha)) {
this.sha = data.sha;
this.repoPath = data.repoPath;
}
else {
base._fsPath = path.join(data.repoPath, base._fsPath);
}
}
else if (commit) {
base._fsPath = commit.originalFileName || commit.fileName;
base._fsPath = path.resolve(commit.repoPath, commit.originalFileName || commit.fileName);
if (!Git.isUncommitted(commit.sha)) {
this.sha = commit.sha;
this.repoPath = commit.repoPath;
}
else {
base._fsPath = path.join(commit.repoPath, base._fsPath);
}
}
}