Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-15 07:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

worktree error handling in creation of worktrees and checking out branches (#257328)

Browse Source 
* worktree error handling in creation of worktrees  and checking out branches

* code clean up
This commit is contained in:
Christy 😺
2025-07-22 15:10:03 -07:00
committed by GitHub
parent 90072b47cf
commit b78acaed0e
1 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2917,10 +2917,15 @@ export class CommandCenter {
try {
await item.run(repository, opts);
} catch (err) {
if (err.gitErrorCode !== GitErrorCodes.DirtyWorkTree) {
if (err.gitErrorCode !== GitErrorCodes.DirtyWorkTree && err.gitErrorCode !== GitErrorCodes.WorktreeAlreadyExists) {
throw err;
}
if (err.gitErrorCode === GitErrorCodes.WorktreeAlreadyExists) {
this.handleWorktreeError(err);
return false;
}
const stash = l10n.t('Stash & Checkout');
const migrate = l10n.t('Migrate Changes');
const force = l10n.t('Force Checkout');
@@ -3458,39 +3463,47 @@ export class CommandCenter {
try {
await repository.worktree({ name: name, path: worktreePath });
} catch (err) {
if (err.gitErrorCode === GitErrorCodes.WorktreeAlreadyExists) {
const errorMessage = err.stderr;
const match = errorMessage.match(/worktree at '([^']+)'/) || errorMessage.match(/'([^']+)'/);
const path = match ? match[1] : undefined;
if (!path) {
return;
}
const openWorktree = l10n.t('Open in current window');
const openWorktreeInNewWindow = l10n.t('Open in new window');
const message = l10n.t(errorMessage || 'A worktree for branch \'{0}\' already exists at \'{1}\'.', name, path);
const choice = await window.showWarningMessage(message, { modal: true }, openWorktree, openWorktreeInNewWindow);
const worktreeRepository = this.model.getRepository(path) || this.model.getRepository(Uri.file(path));
if (!worktreeRepository) {
return;
}
if (choice === openWorktree) {
await this.openWorktreeInCurrentWindow(worktreeRepository);
} else if (choice === openWorktreeInNewWindow) {
await this.openWorktreeInNewWindow(worktreeRepository);
}
return;
if (err.gitErrorCode !== GitErrorCodes.WorktreeAlreadyExists) {
throw err;
}
throw err;
this.handleWorktreeError(err);
return;
}
}
private async handleWorktreeError(err: any): Promise<void> {
const errorMessage = err.stderr;
const match = errorMessage.match(/worktree at '([^']+)'/) || errorMessage.match(/'([^']+)'/);
const path = match ? match[1] : undefined;
if (!path) {
return;
}
const worktreeRepository = this.model.getRepository(path) || this.model.getRepository(Uri.file(path));
if (!worktreeRepository) {
return;
}
const openWorktree = l10n.t('Open in current window');
const openWorktreeInNewWindow = l10n.t('Open in new window');
const message = l10n.t(errorMessage);
const choice = await window.showWarningMessage(message, { modal: true }, openWorktree, openWorktreeInNewWindow);
if (choice === openWorktree) {
await this.openWorktreeInCurrentWindow(worktreeRepository);
} else if (choice === openWorktreeInNewWindow) {
await this.openWorktreeInNewWindow(worktreeRepository);
}
return;
}
@command('git.deleteWorktree', { repository: true })
async deleteWorktree(repository: Repository): Promise<void> {
if (!repository.dotGit.commonPath) {