Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-22 19:29:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Git - improve logic to pick a worktree to migrate changes from (#276048)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-11-07 11:38:52 +00:00
committed by GitHub
parent 426a6a56f3
commit 7bdbccd240
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
extensions/git/src/commands.ts
View File

@@ -3397,23 +3397,33 @@ export class CommandCenter {
}
@command('git.migrateWorktreeChanges', { repository: true, repositoryFilter: ['repository', 'submodule'] })
async migrateWorktreeChanges(repository: Repository): Promise<void> {
const worktreePicks = async (): Promise<WorktreeItem[] | QuickPickItem[]> => {
async migrateWorktreeChanges(repository: Repository, worktreeUri?: Uri): Promise<void> {
let worktreeRepository: Repository | undefined;
if (worktreeUri !== undefined) {
worktreeRepository = this.model.getRepository(worktreeUri);
} else {
const worktrees = await repository.getWorktrees();
return worktrees.length === 0
? [{ label: l10n.t('$(info) This repository has no worktrees.') }]
: worktrees.map(worktree => new WorktreeItem(worktree));
};
if (worktrees.length === 1) {
worktreeRepository = this.model.getRepository(worktrees[0].path);
} else {
const worktreePicks = async (): Promise<WorktreeItem[] | QuickPickItem[]> => {
return worktrees.length === 0
? [{ label: l10n.t('$(info) This repository has no worktrees.') }]
: worktrees.map(worktree => new WorktreeItem(worktree));
};
const placeHolder = l10n.t('Select a worktree to migrate changes from');
const choice = await this.pickRef<WorktreeItem | QuickPickItem>(worktreePicks(), placeHolder);
const placeHolder = l10n.t('Select a worktree to migrate changes from');
const choice = await this.pickRef<WorktreeItem | QuickPickItem>(worktreePicks(), placeHolder);
if (!choice || !(choice instanceof WorktreeItem)) {
return;
if (!choice || !(choice instanceof WorktreeItem)) {
return;
}
worktreeRepository = this.model.getRepository(choice.worktree.path);
}
}
const worktreeRepository = this.model.getRepository(choice.worktree.path);
if (!worktreeRepository) {
if (!worktreeRepository || worktreeRepository.kind !== 'worktree') {
return;
}