Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-19 16:18:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - fix regression with commits that contain addition/deletion/rename (#238349)

Browse Source 
* Git - fix regression with commits that contain addition/deletion/rename

* Fix compilation error
This commit is contained in:
Ladislau Szomoru
2025-01-21 11:44:21 +01:00
committed by GitHub
parent 98f16e88ef
commit 959d01a2a5
8 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/git/src/fileSystemProvider.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { workspace, Uri, Disposable, Event, EventEmitter, window, FileSystemProvider, FileChangeEvent, FileStat, FileType, FileChangeType, FileSystemError } from 'vscode';
import { workspace, Uri, Disposable, Event, EventEmitter, window, FileSystemProvider, FileChangeEvent, FileStat, FileType, FileChangeType, FileSystemError, LogOutputChannel } from 'vscode';
import { debounce, throttle } from './decorators';
import { fromGitUri, toGitUri } from './uri';
import { Model, ModelChangeEvent, OriginalResourceChangeEvent } from './model';
@@ -43,7 +43,7 @@ export class GitFileSystemProvider implements FileSystemProvider {
private mtime = new Date().getTime();
private disposables: Disposable[] = [];
constructor(private model: Model) {
constructor(private readonly model: Model, private readonly logger: LogOutputChannel) {
this.disposables.push(
model.onDidChangeRepository(this.onDidChangeRepository, this),
model.onDidChangeOriginalResource(this.onDidChangeOriginalResource, this),
@@ -136,6 +136,7 @@ export class GitFileSystemProvider implements FileSystemProvider {
const { submoduleOf, path, ref } = fromGitUri(uri);
const repository = submoduleOf ? this.model.getRepository(submoduleOf) : this.model.getRepository(uri);
if (!repository) {
this.logger.warn(`[GitFileSystemProvider][stat] Repository not found - ${uri.toString()}`);
throw FileSystemError.FileNotFound();
}
@@ -181,6 +182,7 @@ export class GitFileSystemProvider implements FileSystemProvider {
const repository = this.model.getRepository(uri);
if (!repository) {
this.logger.warn(`[GitFileSystemProvider][readFile] Repository not found - ${uri.toString()}`);
throw FileSystemError.FileNotFound();
}
@@ -192,6 +194,7 @@ export class GitFileSystemProvider implements FileSystemProvider {
try {
return await repository.buffer(sanitizeRef(ref, path, repository), path);
} catch (err) {
this.logger.warn(`[GitFileSystemProvider][readFile] File not found - ${uri.toString()}`);
// File does not exist in git. This could be
// because the file is untracked or ignored
throw FileSystemError.FileNotFound();