Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 06:21:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - use relative path when running git commands (#242889)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-03-07 15:30:39 +00:00
committed by GitHub
parent 2b3cb53355
commit 04260cb17b
2 changed files with 63 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
extensions/git/src/repository.ts
View File

@@ -1223,7 +1223,6 @@ export class Repository implements Disposable {
}
async stage(resource: Uri, contents: string): Promise<void> {
const path = relativePath(this.repository.root, resource.fsPath).replace(/\\/g, '/');
await this.run(Operation.Stage, async () => {
const configFiles = workspace.getConfiguration('files', Uri.file(resource.fsPath));
let encoding = configFiles.get<string>('encoding') ?? 'utf8';
@@ -1235,7 +1234,7 @@ export class Repository implements Disposable {
}
encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
await this.repository.stage(path, contents, encoding);
await this.repository.stage(resource.fsPath, contents, encoding);
this._onDidChangeOriginalResource.fire(resource);
this.closeDiffEditors([], [...resource.fsPath]);
@@ -1856,18 +1855,12 @@ export class Repository implements Disposable {
await this.run(Operation.Push, () => this._push(remote, undefined, false, false, forcePushMode, true));
}
async blame(filePath: string): Promise<string> {
return await this.run(Operation.Blame(true), () => {
const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
return this.repository.blame(path);
});
async blame(path: string): Promise<string> {
return await this.run(Operation.Blame(true), () => this.repository.blame(path));
}
async blame2(filePath: string, ref?: string): Promise<BlameInformation[] | undefined> {
return await this.run(Operation.Blame(false), () => {
const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
return this.repository.blame2(path, ref);
});
async blame2(path: string, ref?: string): Promise<BlameInformation[] | undefined> {
return await this.run(Operation.Blame(false), () => this.repository.blame2(path, ref));
}
@throttle
@@ -1983,18 +1976,17 @@ export class Repository implements Disposable {
async show(ref: string, filePath: string): Promise<string> {
return await this.run(Operation.Show, async () => {
const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
const configFiles = workspace.getConfiguration('files', Uri.file(filePath));
const defaultEncoding = configFiles.get<string>('encoding');
const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding');
const candidateGuessEncodings = configFiles.get<string[]>('candidateGuessEncodings');
try {
return await this.repository.bufferString(`${ref}:${path}`, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
return await this.repository.bufferString(ref, filePath, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
} catch (err) {
if (err.gitErrorCode === GitErrorCodes.WrongCase) {
const gitRelativePath = await this.repository.getGitRelativePath(ref, path);
return await this.repository.bufferString(`${ref}:${gitRelativePath}`, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
const gitFilePath = await this.repository.getGitFilePath(ref, filePath);
return await this.repository.bufferString(ref, gitFilePath, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
}
throw err;
@@ -2003,21 +1995,15 @@ export class Repository implements Disposable {
}
async buffer(ref: string, filePath: string): Promise<Buffer> {
return this.run(Operation.Show, () => {
const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
return this.repository.buffer(`${ref}:${path}`);
});
return this.run(Operation.Show, () => this.repository.buffer(ref, filePath));
}
getObjectFiles(ref: string): Promise<LsTreeElement[]> {
return this.run(Operation.GetObjectFiles, () => this.repository.lstree(ref));
}
getObjectDetails(ref: string, filePath: string): Promise<{ mode: string; object: string; size: number }> {
return this.run(Operation.GetObjectDetails, () => {
const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
return this.repository.getObjectDetails(ref, path);
});
getObjectDetails(ref: string, path: string): Promise<{ mode: string; object: string; size: number }> {
return this.run(Operation.GetObjectDetails, () => this.repository.getObjectDetails(ref, path));
}
detectObjectType(object: string): Promise<{ mimetype: string; encoding?: string }> {