Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-17 15:24:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Git - adopt the new package to use copy-on-write for the worktree include files (#299583)" (#300448)

Browse Source 
This reverts commit 950ab0704b.
This commit is contained in:
Ladislau Szomoru
2026-03-10 15:01:11 +01:00
committed by GitHub
parent 526c24b569
commit c56c7bc071
3 changed files with 29 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { cp } from '@vscode/fs-copyfile';
import TelemetryReporter from '@vscode/extension-telemetry';
import { uniqueNamesGenerator, adjectives, animals, colors, NumberDictionary } from '@joaomoreno/unique-names-generator';
import * as fs from 'fs';
@@ -1931,76 +1930,59 @@ export class Repository implements Disposable {
gitIgnoredFiles.delete(uri.fsPath);
}
// Compute the base directory for each glob pattern (the fixed
// prefix before any wildcard characters). This will be used to
// optimize the upward traversal when adding parent directories.
const filePatternBases = new Set<string>();
for (const pattern of worktreeIncludeFiles) {
const segments = pattern.split(/[\/\\]/);
const fixedSegments: string[] = [];
for (const seg of segments) {
if (/[*?{}[\]]/.test(seg)) {
break;
}
fixedSegments.push(seg);
}
filePatternBases.add(path.join(this.root, ...fixedSegments));
}
// Add the folder paths for git ignored files, walking
// up only to the nearest file pattern base directory.
// Add the folder paths for git ignored files
const gitIgnoredPaths = new Set(gitIgnoredFiles);
for (const filePath of gitIgnoredFiles) {
let dir = path.dirname(filePath);
while (dir !== this.root && !gitIgnoredPaths.has(dir)) {
while (dir !== this.root && !gitIgnoredFiles.has(dir)) {
gitIgnoredPaths.add(dir);
if (filePatternBases.has(dir)) {
break;
}
dir = path.dirname(dir);
}
}
// Find minimal set of paths (folders and files) to copy. Keep only topmost
// paths — if a directory is already in the set, all its descendants are
// implicitly included and don't need separate entries.
let lastTopmost: string | undefined;
const pathsToCopy = new Set<string>();
for (const p of Array.from(gitIgnoredPaths).sort()) {
if (lastTopmost && (p === lastTopmost || p.startsWith(lastTopmost + path.sep))) {
continue;
}
pathsToCopy.add(p);
lastTopmost = p;
}
return pathsToCopy;
return gitIgnoredPaths;
}
private async _copyWorktreeIncludeFiles(worktreePath: string): Promise<void> {
const worktreeIncludePaths = await this._getWorktreeIncludePaths();
if (worktreeIncludePaths.size === 0) {
const gitIgnoredPaths = await this._getWorktreeIncludePaths();
if (gitIgnoredPaths.size === 0) {
return;
}
try {
const startTime = performance.now();
// Find minimal set of paths (folders and files) to copy.
// The goal is to reduce the number of copy operations
// needed.
const pathsToCopy = new Set<string>();
for (const filePath of gitIgnoredPaths) {
const relativePath = path.relative(this.root, filePath);
const firstSegment = relativePath.split(path.sep)[0];
pathsToCopy.add(path.join(this.root, firstSegment));
}
const startTime = Date.now();
const limiter = new Limiter<void>(15);
const files = Array.from(worktreeIncludePaths);
const files = Array.from(pathsToCopy);
// Copy files
const results = await Promise.allSettled(files.map(sourceFile => {
return limiter.queue(async () => {
const results = await Promise.allSettled(files.map(sourceFile =>
limiter.queue(async () => {
const targetFile = path.join(worktreePath, relativePath(this.root, sourceFile));
await fsPromises.mkdir(path.dirname(targetFile), { recursive: true });
await cp(sourceFile, targetFile, { force: true, recursive: true, verbatimSymlinks: true });
});
}));
await fsPromises.cp(sourceFile, targetFile, {
filter: src => gitIgnoredPaths.has(src),
force: true,
mode: fs.constants.COPYFILE_FICLONE,
recursive: true,
verbatimSymlinks: true
});
})
));
// Log any failed operations
const failedOperations = results.filter(r => r.status === 'rejected');
this.logger.info(`[Repository][_copyWorktreeIncludeFiles] Copied ${files.length - failedOperations.length}/${files.length} folder(s)/file(s) to worktree. [${(performance.now() - startTime).toFixed(2)}ms]`);
this.logger.info(`[Repository][_copyWorktreeIncludeFiles] Copied ${files.length - failedOperations.length}/${files.length} folder(s)/file(s) to worktree. [${Date.now() - startTime}ms]`);
if (failedOperations.length > 0) {
window.showWarningMessage(l10n.t('Failed to copy {0} folder(s)/file(s) to the worktree.', failedOperations.length));