Skip to content

Fixes #1328 - Adds support for reading file history for files which o… #1330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+13 −0
Open

Fixes #1328 - Adds support for reading file history for files which o… #1330

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a4179e
Fixes #1328 - Adds support for reading file history for files which o…
shaharw3 Jan 17, 2021
ce46a28
Merge branch 'main' into main
sweiss3 Jan 2, 2022
f1cdbdc
Merge branch 'main' into main
sweiss3 Feb 14, 2022
1c07449
Merge branch 'main' into main
sweiss3 Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/git/gitUri.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
'use strict';
import * as fs from 'fs';
import * as paths from 'path';
import { Uri } from 'vscode';
import { decodeUtf8Hex, encodeUtf8Hex } from '@env/hex';
import { UriComparer } from '../comparers';
Expand Down Expand Up @@ -248,6 +251,16 @@ export class GitUri extends (Uri as any as UriEx) {
})
static async fromUri(uri: Uri): Promise<GitUri> {
if (GitUri.is(uri)) return uri;

const uriPath = uri.fsPath;
const realPath = fs.realpathSync(uriPath);
if (uriPath !== realPath) {
// If we got here, it means the original URI is to a symbolic link, so we create a new one using the real location.
const newUri = Uri.file(realPath);

return this.fromUri(newUri);
}

if (!Container.instance.git.isTrackable(uri)) return new GitUri(uri);
if (uri.scheme === Schemes.GitLens) return new GitUri(uri);

Expand Down