Ajoute le choix « créer un worktree OU bosser sur la branche principale » au moment de démarrer le travail, sur deux surfaces : - bouton « Démarrer » (claude/bash) sur chaque WorktreeCard, y compris le checkout principal (badge « principal ») — comblait un manque : impossible jusqu'ici de lancer une session sur un worktree existant depuis le dashboard ; - toggle de mode (Worktree / Branche principale) dans le formulaire d'entête de RepoSection. Option git « créer & basculer » : nouvel endpoint POST /api/v1/repos/:id/session qui lance UNE session dans le checkout principal (repo.path), avec création ou bascule de branche optionnelle (git switch[-c]) — refusée en 409 si l'arbre est sale. Pas de hooks ni de pré-trust (c'est le dépôt réel de l'utilisateur). - shared : type additif StartRepoSessionRequest. - server : git.switchBranch + WorktreeManager.startMainSession + route. - web : store worktrees.startMainSession, UI WorktreeCard/RepoSection, i18n fr/en. - tests : +5 unitaires (switchBranch, startMainSession) ; acceptance-p3 étendue.
145 lines
5.3 KiB
TypeScript
145 lines
5.3 KiB
TypeScript
import { describe, expect, it, afterEach } from 'vitest';
|
|
import { execFileSync } from 'node:child_process';
|
|
import { mkdtempSync, writeFileSync, rmSync } from 'node:fs';
|
|
import { tmpdir } from 'node:os';
|
|
import { join, resolve, basename, dirname } from 'node:path';
|
|
import {
|
|
parseWorktreePorcelain,
|
|
isValidBranchName,
|
|
isSafeAbsolutePath,
|
|
isRepo,
|
|
listWorktrees,
|
|
worktreeStatus,
|
|
addWorktree,
|
|
removeWorktree,
|
|
pruneWorktrees,
|
|
switchBranch,
|
|
isDirtyWorktreeError,
|
|
} from '../src/core/git.js';
|
|
|
|
const dirs: string[] = [];
|
|
afterEach(() => {
|
|
for (const d of dirs.splice(0)) rmSync(d, { recursive: true, force: true });
|
|
});
|
|
|
|
function makeTmpRepo(): string {
|
|
const dir = mkdtempSync(join(tmpdir(), 'arb-git-'));
|
|
dirs.push(dir);
|
|
const run = (...args: string[]): void => void execFileSync('git', args, { cwd: dir, stdio: 'pipe' });
|
|
run('init', '-b', 'main');
|
|
run('config', 'user.email', 'test@arboretum.dev');
|
|
run('config', 'user.name', 'Test');
|
|
writeFileSync(join(dir, 'README.md'), '# test\n');
|
|
run('add', '-A');
|
|
run('commit', '-m', 'init');
|
|
return dir;
|
|
}
|
|
|
|
describe('parseWorktreePorcelain', () => {
|
|
it('parse le bloc principal, détaché, locked et prunable', () => {
|
|
const out = [
|
|
'worktree /repo',
|
|
'HEAD abc123',
|
|
'branch refs/heads/main',
|
|
'',
|
|
'worktree /repo-wt-x',
|
|
'HEAD def456',
|
|
'detached',
|
|
'locked reason here',
|
|
'',
|
|
'worktree /repo-wt-gone',
|
|
'HEAD 000',
|
|
'prunable gitdir file points to non-existent location',
|
|
'', // bloc final terminé par une ligne vide
|
|
].join('\n');
|
|
const wts = parseWorktreePorcelain(out);
|
|
expect(wts).toHaveLength(3);
|
|
expect(wts[0]).toMatchObject({ path: '/repo', branch: 'main', detached: false });
|
|
expect(wts[1]).toMatchObject({ path: '/repo-wt-x', detached: true, locked: true, branch: null });
|
|
expect(wts[2]).toMatchObject({ path: '/repo-wt-gone', prunable: true });
|
|
});
|
|
|
|
it('tolère un bloc final sans ligne vide', () => {
|
|
const wts = parseWorktreePorcelain('worktree /a\nHEAD x\nbranch refs/heads/dev');
|
|
expect(wts).toEqual([
|
|
{ path: '/a', head: 'x', branch: 'dev', detached: false, locked: false, prunable: false, bare: false },
|
|
]);
|
|
});
|
|
});
|
|
|
|
describe('validation', () => {
|
|
it('isValidBranchName', () => {
|
|
expect(isValidBranchName('feature/foo-1.2')).toBe(true);
|
|
expect(isValidBranchName('-foo')).toBe(false);
|
|
expect(isValidBranchName('a..b')).toBe(false);
|
|
expect(isValidBranchName('a/')).toBe(false);
|
|
expect(isValidBranchName('x.lock')).toBe(false);
|
|
expect(isValidBranchName('a b')).toBe(false);
|
|
});
|
|
it('isSafeAbsolutePath', () => {
|
|
expect(isSafeAbsolutePath('/home/u/proj-wt-x')).toBe(true);
|
|
expect(isSafeAbsolutePath('relative/x')).toBe(false);
|
|
expect(isSafeAbsolutePath('/home/u/../etc')).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe('opérations git (repo tmp réel)', () => {
|
|
it('isRepo : racine vs non-repo', async () => {
|
|
const repo = makeTmpRepo();
|
|
expect(await isRepo(repo)).toBe(true);
|
|
const notRepo = mkdtempSync(join(tmpdir(), 'arb-nogit-'));
|
|
dirs.push(notRepo);
|
|
expect(await isRepo(notRepo)).toBe(false);
|
|
});
|
|
|
|
it('add → list → status (dirty) → remove (refus dirty puis force)', async () => {
|
|
const repo = makeTmpRepo();
|
|
const wtPath = join(dirname(repo), `${basename(repo)}-wt-feat`);
|
|
dirs.push(wtPath);
|
|
await addWorktree(repo, { path: wtPath, branch: 'feat', newBranch: true });
|
|
|
|
const list = await listWorktrees(repo);
|
|
const wt = list.find((w) => resolve(w.path) === resolve(wtPath));
|
|
expect(wt?.branch).toBe('feat');
|
|
|
|
// worktree propre
|
|
expect((await worktreeStatus(wtPath)).dirtyCount).toBe(0);
|
|
// un fichier non suivi → dirty
|
|
writeFileSync(join(wtPath, 'scratch.txt'), 'wip\n');
|
|
expect((await worktreeStatus(wtPath)).dirtyCount).toBeGreaterThan(0);
|
|
|
|
// remove sans --force refusé (worktree sale)
|
|
let dirtyErr: unknown;
|
|
await removeWorktree(repo, wtPath, false).catch((e) => (dirtyErr = e));
|
|
expect(dirtyErr).toBeDefined();
|
|
expect(isDirtyWorktreeError(dirtyErr)).toBe(true);
|
|
|
|
// remove --force réussit
|
|
await removeWorktree(repo, wtPath, true);
|
|
expect((await listWorktrees(repo)).some((w) => resolve(w.path) === resolve(wtPath))).toBe(false);
|
|
});
|
|
|
|
it('switchBranch : create=true crée une branche, create=false bascule sur une existante', async () => {
|
|
const repo = makeTmpRepo();
|
|
const cur = (): string => execFileSync('git', ['branch', '--show-current'], { cwd: repo }).toString().trim();
|
|
|
|
await switchBranch(repo, { branch: 'feature/new', create: true });
|
|
expect(cur()).toBe('feature/new');
|
|
|
|
await switchBranch(repo, { branch: 'main', create: false });
|
|
expect(cur()).toBe('main');
|
|
|
|
// créer une branche déjà existante échoue (git refuse).
|
|
await expect(switchBranch(repo, { branch: 'feature/new', create: true })).rejects.toBeDefined();
|
|
});
|
|
|
|
it('prune retire un worktree dont le dossier a disparu', async () => {
|
|
const repo = makeTmpRepo();
|
|
const wtPath = join(dirname(repo), `${basename(repo)}-wt-gone`);
|
|
await addWorktree(repo, { path: wtPath, branch: 'gone', newBranch: true });
|
|
rmSync(wtPath, { recursive: true, force: true }); // suppression "à la main"
|
|
await pruneWorktrees(repo);
|
|
expect((await listWorktrees(repo)).some((w) => resolve(w.path) === resolve(wtPath))).toBe(false);
|
|
});
|
|
});
|