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

Uses shortSha in git uris

Browse Source
This commit is contained in:
Eric Amodio
2017-03-29 00:13:10 -04:00
parent dcbf70682e
commit 0dda92cf8d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gitService.ts
View File

@@ -785,9 +785,9 @@ export class GitService extends Disposable {
return Git.isUncommitted(sha); return Git.isUncommitted(sha);
} }
static toGitContentUri(sha: string, fileName: string, repoPath: string, originalFileName: string): Uri; static toGitContentUri(sha: string, shortSha: string, fileName: string, repoPath: string, originalFileName: string): Uri;
static toGitContentUri(commit: GitCommit): Uri; static toGitContentUri(commit: GitCommit): Uri;
static toGitContentUri(shaOrcommit: string | GitCommit, fileName?: string, repoPath?: string, originalFileName?: string): Uri { static toGitContentUri(shaOrcommit: string | GitCommit, shortSha?: string, fileName?: string, repoPath?: string, originalFileName?: string): Uri {
let data: IGitUriData; let data: IGitUriData;
if (typeof shaOrcommit === 'string') { if (typeof shaOrcommit === 'string') {
data = GitService._toGitUriData({ data = GitService._toGitUriData({
@@ -800,10 +800,11 @@ export class GitService extends Disposable {
else { else {
data = GitService._toGitUriData(shaOrcommit, undefined, shaOrcommit.originalFileName); data = GitService._toGitUriData(shaOrcommit, undefined, shaOrcommit.originalFileName);
fileName = shaOrcommit.fileName; fileName = shaOrcommit.fileName;
shortSha = shaOrcommit.shortSha;
} }
const extension = path.extname(fileName); const extension = path.extname(fileName);
return Uri.parse(`${DocumentSchemes.GitLensGit}:${path.basename(fileName, extension)}:${data.sha}${extension}?${JSON.stringify(data)}`); return Uri.parse(`${DocumentSchemes.GitLensGit}:${path.basename(fileName, extension)}:${shortSha}${extension}?${JSON.stringify(data)}`);
} }
static toReferenceGitContentUri(commit: GitCommit, index: number, commitCount: number, originalFileName?: string, decoration?: string): Uri { static toReferenceGitContentUri(commit: GitCommit, index: number, commitCount: number, originalFileName?: string, decoration?: string): Uri {

4
src/quickPicks/commitDetails.ts
View File

@@ -28,7 +28,7 @@ export class CommitWithFileStatusQuickPickItem extends OpenFileCommandQuickPickI
? `${directory || ''} \u00a0\u2190\u00a0 ${status.originalFileName}` ? `${directory || ''} \u00a0\u2190\u00a0 ${status.originalFileName}`
: directory; : directory;
super(GitService.toGitContentUri(commit.sha, status.fileName, commit.repoPath, commit.originalFileName), { super(GitService.toGitContentUri(commit.sha, commit.shortSha, status.fileName, commit.repoPath, commit.originalFileName), {
label: `\u00a0\u00a0\u00a0\u00a0${icon}\u00a0\u00a0 ${path.basename(status.fileName)}`, label: `\u00a0\u00a0\u00a0\u00a0${icon}\u00a0\u00a0 ${path.basename(status.fileName)}`,
description: description description: description
}); });
@@ -45,7 +45,7 @@ export class OpenCommitFilesCommandQuickPickItem extends OpenFilesCommandQuickPi
constructor(commit: GitLogCommit, item?: QuickPickItem) { constructor(commit: GitLogCommit, item?: QuickPickItem) {
const repoPath = commit.repoPath; const repoPath = commit.repoPath;
const uris = commit.fileStatuses.map(_ => GitService.toGitContentUri(commit.sha, _.fileName, repoPath, commit.originalFileName)); const uris = commit.fileStatuses.map(_ => GitService.toGitContentUri(commit.sha, commit.shortSha, _.fileName, repoPath, commit.originalFileName));
super(uris, item || { super(uris, item || {
label: `$(file-symlink-file) Open Changed Files`, label: `$(file-symlink-file) Open Changed Files`,
description: `\u00a0 \u2014 \u00a0\u00a0 in \u00a0$(git-commit) ${commit.shortSha}` description: `\u00a0 \u2014 \u00a0\u00a0 in \u00a0$(git-commit) ${commit.shortSha}`