Jens/ForgeFlow
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 24 Wiki Activity

Update to 4.4

Browse Source
This commit is contained in:
NuklearRabbit
2026-07-24 20:44:26 +02:00
parent 66060348da
commit b4f0be3d77
9 changed files with 144 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/git-service.cjs
+24 -7
View File
@@ -73,21 +73,36 @@ class GitService {
return result.stdout;
}
async expandSelectedPaths(root, files) {
const selected = assertRepositoryRelativePaths(files);
if (!selected.length) return [];
const status = await this.status(root);
const expanded = new Set(selected);
for (const file of status.files) {
if (selected.includes(file.path) || (file.originalPath && selected.includes(file.originalPath))) {
expanded.add(file.path);
if (file.originalPath) expanded.add(file.originalPath);
}
}
return [...expanded];
}
async stage(repoPath, files) {
const root = await this.ensureRepository(repoPath);
const selected = assertRepositoryRelativePaths(files);
await run('git', selected.length ? ['add', '--', ...selected] : ['add', '--all'], { cwd: root, timeout: 60_000 });
const selected = await this.expandSelectedPaths(root, files);
// -A is required for deleted files and for the old side of renames.
await run('git', selected.length ? ['add', '-A', '--', ...selected] : ['add', '--all'], { cwd: root, timeout: 60_000 });
return this.status(root);
}
async unstage(repoPath, files) {
const root = await this.ensureRepository(repoPath);
const selected = assertRepositoryRelativePaths(files);
const selected = await this.expandSelectedPaths(root, files);
const hasHead = await run('git', ['rev-parse', '--verify', 'HEAD'], { cwd: root, allowExitCodes: [128] });
if (hasHead.exitCode === 0) {
await run('git', selected.length ? ['restore', '--staged', '--', ...selected] : ['restore', '--staged', '.'], { cwd: root });
} else {
await run('git', selected.length ? ['rm', '--cached', '--', ...selected] : ['rm', '--cached', '-r', '.'], { cwd: root, allowExitCodes: [1] });
await run('git', selected.length ? ['rm', '--cached', '--ignore-unmatch', '--', ...selected] : ['rm', '--cached', '-r', '.'], { cwd: root, allowExitCodes: [1] });
}
return this.status(root);
}
@@ -95,9 +110,11 @@ class GitService {
async prepareSelectedStage(root, files) {
const selected = assertRepositoryRelativePaths(files);
if (selected.length) {
const stagedBefore = await run('git', ['diff', '--cached', '--name-only', '-z'], { cwd: root });
const alreadyStaged = stagedBefore.stdout.split('\0').filter(Boolean);
const excludedStaged = alreadyStaged.filter((file) => !selected.includes(file));
const current = await this.status(root);
const excludedStaged = current.files
.filter((file) => file.staged)
.filter((file) => !selected.includes(file.path) && !(file.originalPath && selected.includes(file.originalPath)))
.map((file) => file.path);
if (excludedStaged.length) {
throw new Error(`Some staged files are not selected (${excludedStaged.slice(0, 3).join(', ')}${excludedStaged.length > 3 ? ', …' : ''}). Select them or unstage them first.`);
}