diff --git a/src/__tests__/extension.test.ts b/src/__tests__/extension.test.ts index 2b07dd6..e5cdd70 100644 --- a/src/__tests__/extension.test.ts +++ b/src/__tests__/extension.test.ts @@ -6,9 +6,11 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'; // resolver. Everything it imports is stubbed so activate() runs to completion. const H = vi.hoisted(() => ({ registeredCommands: [] as string[], + commandHandlers: {} as Record unknown>, treeViewsCreated: [] as string[], workspaceFolders: undefined as Array<{ uri: { fsPath: string } }> | undefined, gitPathConfig: null as string | string[] | null, + worktreeList: [] as Array<{ path: string; isMain: boolean }>, })); vi.mock('vscode', () => ({ @@ -35,7 +37,7 @@ vi.mock('vscode', () => ({ activeTextEditor: undefined, }, commands: { - registerCommand: (id: string) => { H.registeredCommands.push(id); return { dispose() {} }; }, + registerCommand: (id: string, cb: (...args: unknown[]) => unknown) => { H.registeredCommands.push(id); H.commandHandlers[id] = cb; return { dispose() {} }; }, executeCommand: vi.fn(), }, extensions: { getExtension: () => undefined }, @@ -57,7 +59,7 @@ vi.mock('../panels/MainPanel', () => ({ }, })); vi.mock('../services/git-content-provider', () => ({ GitContentProvider: class {} })); -vi.mock('../git/git-service', () => ({ GitService: class { setExtraEnv() {} get rootPath() { return '/repo'; } } })); +vi.mock('../git/git-service', () => ({ GitService: class { setExtraEnv() {} get rootPath() { return '/repo'; } worktreeList() { return Promise.resolve(H.worktreeList); } } })); vi.mock('../services/file-watcher', () => ({ FileWatcher: class { enabled = true; suppress() {} dispose() {} } })); const viewStub = () => ({ ViewProvider: undefined }); vi.mock('../views/branches-view', () => ({ BranchesViewProvider: class { refresh() {} dispose() {} setGitService() {} prefetch() { return Promise.resolve(); } getCurrentItem() { return null; } } })); @@ -78,9 +80,11 @@ function makeContext() { beforeEach(() => { H.registeredCommands = []; + H.commandHandlers = {}; H.treeViewsCreated = []; H.workspaceFolders = undefined; H.gitPathConfig = null; + H.worktreeList = []; vi.mocked(existsSync).mockReturnValue(true); }); @@ -137,4 +141,22 @@ describe('activate', () => { 'gitGraphPlus.worktrees', ]); }); + + it('addWorktree defaults beside the main worktree even when active repo is linked worktree', async () => { + H.workspaceFolders = [{ uri: { fsPath: '/repos/project.worktrees/custom.worktrees' } }]; + H.worktreeList = [ + { path: '/repos/project', isMain: true }, + { path: '/repos/project.worktrees/custom.worktrees', isMain: false }, + ]; + const ctx = makeContext(); + activate(ctx); + + await H.commandHandlers['gitGraphPlus.addWorktree'](); + + const { MainPanel } = await import('../panels/MainPanel'); + expect(MainPanel.showModalWithPanel).toHaveBeenCalledWith(ctx.extensionUri, { + modal: 'addWorktree', + defaultPath: '/repos/project.worktrees', + }); + }); }); diff --git a/src/extension.ts b/src/extension.ts index 6e909d5..e359c6a 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -476,8 +476,17 @@ export function activate(context: vscode.ExtensionContext) { const index = stashItem?.index ?? 0; MainPanel.showModalWithPanel(context.extensionUri, { modal: 'stashDrop', index, message: stashItem?.stash?.message ?? `stash@{${index}}` }); }), - vscode.commands.registerCommand('gitGraphPlus.addWorktree', () => { - const defaultPath = path.join(path.dirname(activeRepoPath), `${path.basename(activeRepoPath)}-worktree`); + vscode.commands.registerCommand('gitGraphPlus.addWorktree', async () => { + let baseRepoPath = activeRepoPath; + try { + const mainWorktree = (await activeGitService.worktreeList()).find(w => w.isMain); + if (mainWorktree?.path) { + baseRepoPath = mainWorktree.path; + } + } catch (err) { + console.warn('Git Graph+: failed to resolve main worktree path:', err instanceof Error ? err.message : err); + } + const defaultPath = path.join(path.dirname(baseRepoPath), `${path.basename(baseRepoPath)}.worktrees`); MainPanel.showModalWithPanel(context.extensionUri, { modal: 'addWorktree', defaultPath }); }), vscode.commands.registerCommand('gitGraphPlus.pruneWorktrees', () => { diff --git a/webview-ui/src/components/modals/AddWorktreeModal.svelte b/webview-ui/src/components/modals/AddWorktreeModal.svelte index b8f4b73..b0ddf74 100644 --- a/webview-ui/src/components/modals/AddWorktreeModal.svelte +++ b/webview-ui/src/components/modals/AddWorktreeModal.svelte @@ -12,54 +12,115 @@ onAdd: (path: string, branch?: string, newBranch?: string) => void; } + type WorktreeMode = 'existing' | 'new'; + let { defaultPath = '', onClose, onAdd }: Props = $props(); const localBranches = $derived(branchStore.localBranches.map(b => b.name)); + const checkedOutBranches = $derived(new Set(branchStore.worktrees.map(w => w.branch).filter(Boolean))); + const availableExistingBranches = $derived(localBranches.filter(b => !checkedOutBranches.has(b))); + const startAtOptions = $derived(localBranches.length > 0 ? localBranches : ['HEAD']); + let existingBranch = $state(''); // svelte-ignore state_referenced_locally let startAt = $state(branchStore.currentBranch?.name ?? 'HEAD'); + let mode = $state('existing'); let branchName = $state(''); // svelte-ignore state_referenced_locally let location = $state(defaultPath); let branchInput: HTMLInputElement | undefined = $state(); + const sourceRef = $derived(startAt || 'HEAD'); + const folderName = $derived(mode === 'new' ? branchName.trim() : existingBranch); + + function worktreeFolder(basePath: string, name: string): string { + const sanitized = name.replace(/[\\/]+/g, '-'); + if (!basePath) return sanitized; + return basePath.replace(/[\\/]+$/, '') + '/' + sanitized; + } + + $effect(() => { + if (!startAtOptions.includes(startAt)) { + startAt = startAtOptions[0] ?? 'HEAD'; + } + if (!existingBranch || !availableExistingBranches.includes(existingBranch)) { + existingBranch = availableExistingBranches[0] ?? ''; + } + if (mode === 'existing' && availableExistingBranches.length === 0) { + mode = 'new'; + } + }); + $effect(() => { - if (defaultPath && branchName) { - location = defaultPath + branchName.replace(/\//g, '-'); + if (defaultPath && folderName) { + location = worktreeFolder(defaultPath, folderName); } else if (defaultPath) { location = defaultPath; } }); - onMount(() => { branchInput?.focus(); }); - - const refError = $derived(branchName.trim() !== '' ? validateGitRefName(branchName.trim()) : null); - const canSubmit = $derived(branchName.trim() !== '' && location.trim() !== '' && !refError); + onMount(() => { if (mode === 'new') branchInput?.focus(); }); + const refError = $derived(mode === 'new' && branchName.trim() !== '' ? validateGitRefName(branchName.trim()) : null); + const canSubmit = $derived( + location.trim() !== '' + && (mode === 'new' + ? branchName.trim() !== '' && !refError + : existingBranch !== '') + ); function handleSubmit() { if (!canSubmit) return; - onAdd(location.trim(), startAt, branchName.trim()); + if (mode === 'new') { + onAdd(location.trim(), sourceRef, branchName.trim()); + } else { + onAdd(location.trim(), existingBranch); + } } -
-
-
{t('worktree.startAt')}
- ({ value: b, label: b, color: '' }))} - value={startAt} - onChange={(v) => { startAt = v; }} - showDot={false} - /> -
+
+ +
-
-
- - { if (e.key === 'Enter' && canSubmit) handleSubmit(); }} /> + {#if mode === 'existing'} +
+
+
{t('worktree.existingBranch')}
+ ({ value: b, label: b, color: '' }))} + value={existingBranch} + onChange={(v) => { existingBranch = v; }} + showDot={false} + /> +
-
+ {:else} +
+
+
{t('worktree.startAt')}
+ ({ value: b, label: b, color: '' }))} + value={startAt} + onChange={(v) => { startAt = v; }} + showDot={false} + /> +
+
+ +
+
+ + { if (e.key === 'Enter' && canSubmit) handleSubmit(); }} /> +
+
+ {/if}
@@ -83,4 +144,10 @@ font-size: 11px; color: var(--text-secondary); } + + .mode-options { + display: flex; + flex-direction: column; + gap: 8px; + } diff --git a/webview-ui/src/components/modals/__tests__/AddWorktreeModal.test.ts b/webview-ui/src/components/modals/__tests__/AddWorktreeModal.test.ts index b403e29..a3274e5 100644 --- a/webview-ui/src/components/modals/__tests__/AddWorktreeModal.test.ts +++ b/webview-ui/src/components/modals/__tests__/AddWorktreeModal.test.ts @@ -4,10 +4,10 @@ import { tick } from 'svelte'; import AddWorktreeModal from '../AddWorktreeModal.svelte'; import { branchStore } from '../../../lib/stores/branches.svelte'; import { i18n } from '../../../lib/i18n/index.svelte'; -import type { BranchInfo } from '../../../lib/types'; +import type { BranchInfo, WorktreeInfo } from '../../../lib/types'; -function setBranches(branches: BranchInfo[]) { - branchStore.setData({ branches, tags: [], remotes: [], stashes: [], worktrees: [] }); +function setBranches(branches: BranchInfo[], worktrees: WorktreeInfo[] = []) { + branchStore.setData({ branches, tags: [], remotes: [], stashes: [], worktrees }); } beforeEach(() => { @@ -25,6 +25,9 @@ describe('AddWorktreeModal', () => { onClose: vi.fn(), onAdd: vi.fn(), }); + const newBranchRadio = container.querySelector('input[type="radio"][value="new"]')!; + await fireEvent.click(newBranchRadio); + await tick(); const submit = container.querySelector('button.primary')!; expect(submit.disabled).toBe(true); @@ -36,12 +39,15 @@ describe('AddWorktreeModal', () => { expect(submit.disabled).toBe(false); }); - it('auto-fills location = defaultPath + branchName (slashes replaced with dashes)', async () => { + it('auto-fills location as a child folder under defaultPath (slashes replaced with dashes)', async () => { const { container } = render(AddWorktreeModal, { defaultPath: '/Users/me/worktrees/', onClose: vi.fn(), onAdd: vi.fn(), }); + const newBranchRadio = container.querySelector('input[type="radio"][value="new"]')!; + await fireEvent.click(newBranchRadio); + await tick(); const branchInput = container.querySelector('#wt-branch')!; const locationInput = container.querySelector('#wt-location')!; await fireEvent.input(branchInput, { target: { value: 'feature/login' } }); @@ -49,12 +55,31 @@ describe('AddWorktreeModal', () => { expect(locationInput.value).toBe('/Users/me/worktrees/feature-login'); }); + it('inserts a path separator when defaultPath has no trailing slash', async () => { + const { container } = render(AddWorktreeModal, { + defaultPath: '/Users/me/project.worktrees', + onClose: vi.fn(), + onAdd: vi.fn(), + }); + const newBranchRadio = container.querySelector('input[type="radio"][value="new"]')!; + await fireEvent.click(newBranchRadio); + await tick(); + const branchInput = container.querySelector('#wt-branch')!; + const locationInput = container.querySelector('#wt-location')!; + await fireEvent.input(branchInput, { target: { value: 'test' } }); + await tick(); + expect(locationInput.value).toBe('/Users/me/project.worktrees/test'); + }); + it('keeps location at defaultPath when branch name is cleared', async () => { const { container } = render(AddWorktreeModal, { defaultPath: '/Users/me/wt/', onClose: vi.fn(), onAdd: vi.fn(), }); + const newBranchRadio = container.querySelector('input[type="radio"][value="new"]')!; + await fireEvent.click(newBranchRadio); + await tick(); const branchInput = container.querySelector('#wt-branch')!; const locationInput = container.querySelector('#wt-location')!; await fireEvent.input(branchInput, { target: { value: 'feat' } }); @@ -72,6 +97,9 @@ describe('AddWorktreeModal', () => { onClose: vi.fn(), onAdd: vi.fn(), }); + const newBranchRadio = container.querySelector('input[type="radio"][value="new"]')!; + await fireEvent.click(newBranchRadio); + await tick(); const branchInput = container.querySelector('#wt-branch')!; const locationInput = container.querySelector('#wt-location')!; await fireEvent.input(locationInput, { target: { value: '/my/custom/path' } }); @@ -88,6 +116,9 @@ describe('AddWorktreeModal', () => { onClose: vi.fn(), onAdd, }); + const newBranchRadio = container.querySelector('input[type="radio"][value="new"]')!; + await fireEvent.click(newBranchRadio); + await tick(); const branchInput = container.querySelector('#wt-branch')!; await fireEvent.input(branchInput, { target: { value: 'feat' } }); await tick(); @@ -102,6 +133,9 @@ describe('AddWorktreeModal', () => { onClose: vi.fn(), onAdd, }); + const newBranchRadio = container.querySelector('input[type="radio"][value="new"]')!; + await fireEvent.click(newBranchRadio); + await tick(); // Open the startAt ColorSelect and pick "develop" await fireEvent.click(container.querySelector('.color-select-btn')!); const opts = container.querySelectorAll('.color-select-option'); @@ -120,6 +154,9 @@ describe('AddWorktreeModal', () => { onClose: vi.fn(), onAdd: vi.fn(), }); + const newBranchRadio = container.querySelector('input[type="radio"][value="new"]')!; + await fireEvent.click(newBranchRadio); + await tick(); const submit = container.querySelector('button.primary')!; const branchInput = container.querySelector('#wt-branch')!; // Leading dash would otherwise reach git as an option-style positional arg. @@ -145,6 +182,9 @@ describe('AddWorktreeModal', () => { onClose: vi.fn(), onAdd, }); + const newBranchRadio = container.querySelector('input[type="radio"][value="new"]')!; + await fireEvent.click(newBranchRadio); + await tick(); const branchInput = container.querySelector('#wt-branch')!; const locationInput = container.querySelector('#wt-location')!; await fireEvent.input(branchInput, { target: { value: ' feature/x ' } }); @@ -155,4 +195,55 @@ describe('AddWorktreeModal', () => { // startAt defaults to currentBranch.name = 'main'. expect(onAdd).toHaveBeenCalledWith('/tmp/wt', 'main', 'feature/x'); }); + + it('defaults to the first existing branch not already checked out in a worktree', async () => { + const onAdd = vi.fn(); + setBranches([ + { name: 'main', current: true, hash: 'abc', ahead: 0, behind: 0 }, + { name: 'develop', current: false, hash: 'def', ahead: 0, behind: 0 }, + ], [ + { path: '/repo', hash: 'abc', branch: 'main', detached: false, locked: false, prunable: false, isMain: true }, + ]); + + const { container } = render(AddWorktreeModal, { + defaultPath: '/wt/', + onClose: vi.fn(), + onAdd, + }); + await tick(); + await tick(); + await fireEvent.click(container.querySelector('button.primary')!); + + expect(onAdd).toHaveBeenCalledWith('/wt/develop', 'develop'); + }); + + it('filters branches that are already checked out in worktrees from existing branch mode', async () => { + const onAdd = vi.fn(); + setBranches([ + { name: 'main', current: true, hash: 'abc', ahead: 0, behind: 0 }, + { name: 'develop', current: false, hash: 'def', ahead: 0, behind: 0 }, + { name: 'feature/free', current: false, hash: 'fed', ahead: 0, behind: 0 }, + ], [ + { path: '/repo', hash: 'abc', branch: 'main', detached: false, locked: false, prunable: false, isMain: true }, + { path: '/repo-wt-develop', hash: 'def', branch: 'develop', detached: false, locked: false, prunable: false, isMain: false }, + ]); + + const { container } = render(AddWorktreeModal, { + defaultPath: '/wt/', + onClose: vi.fn(), + onAdd, + }); + await tick(); + await tick(); + + await fireEvent.click(container.querySelector('.color-select-btn')!); + const options = Array.from(container.querySelectorAll('.color-select-option')) + .map(o => o.textContent ?? ''); + expect(options.some(text => text.includes('main'))).toBe(false); + expect(options.some(text => text.includes('develop'))).toBe(false); + expect(options.some(text => text.includes('feature/free'))).toBe(true); + + await fireEvent.click(container.querySelector('button.primary')!); + expect(onAdd).toHaveBeenCalledWith('/wt/feature-free', 'feature/free'); + }); }); diff --git a/webview-ui/src/lib/i18n/en.ts b/webview-ui/src/lib/i18n/en.ts index 465d591..b268583 100644 --- a/webview-ui/src/lib/i18n/en.ts +++ b/webview-ui/src/lib/i18n/en.ts @@ -468,7 +468,11 @@ export const en: Record = { // Worktree modals 'worktree.addTitle': 'Add Worktree', + 'worktree.mode': 'Worktree mode', 'worktree.startAt': 'Start at:', + 'worktree.useExisting': 'Use existing branch', + 'worktree.existingBranch': 'Branch:', + 'worktree.createNewBranch': 'Create a new branch', 'worktree.branchName': 'Branch name:', 'worktree.branchPlaceholder': 'Enter Branch Name', 'worktree.location': 'Location:', diff --git a/webview-ui/src/lib/i18n/ko.ts b/webview-ui/src/lib/i18n/ko.ts index d58173b..65df855 100644 --- a/webview-ui/src/lib/i18n/ko.ts +++ b/webview-ui/src/lib/i18n/ko.ts @@ -468,7 +468,11 @@ export const ko: Record = { // Worktree modals 'worktree.addTitle': 'Worktree 추가', + 'worktree.mode': 'Worktree 모드', 'worktree.startAt': '시작점:', + 'worktree.useExisting': '기존 브랜치 사용', + 'worktree.existingBranch': '브랜치:', + 'worktree.createNewBranch': '새 브랜치 만들기', 'worktree.branchName': '브랜치 이름:', 'worktree.branchPlaceholder': '브랜치 이름 입력', 'worktree.location': '위치:', diff --git a/webview-ui/src/lib/i18n/zh.ts b/webview-ui/src/lib/i18n/zh.ts index f69b44f..8a246d9 100644 --- a/webview-ui/src/lib/i18n/zh.ts +++ b/webview-ui/src/lib/i18n/zh.ts @@ -468,7 +468,11 @@ export const zh: Record = { // Worktree modals 'worktree.addTitle': '添加工作树', + 'worktree.mode': '工作树模式', 'worktree.startAt': '基于：', + 'worktree.useExisting': '使用现有分支', + 'worktree.existingBranch': '分支：', + 'worktree.createNewBranch': '创建新分支', 'worktree.branchName': '分支名：', 'worktree.branchPlaceholder': '输入分支名', 'worktree.location': '位置：',