Error handling of create worktree and fix create worktree... command from command palette (microsoft#257172)

* esc when creating worktree name cancels create operation

* Find main repo for createworktree command palette to prevent repo picker

* error handling of creating worktree

* add back repo picker for create worktree... command

Author: nguyenchristy

extensions/git/src/api/git.d.ts

@@ -441,5 +441,6 @@ export const enum GitErrorCodes {
 	TagConflict = 'TagConflict',
 	CherryPickEmpty = 'CherryPickEmpty',
 	CherryPickConflict = 'CherryPickConflict',
-	WorktreeContainsChanges = 'WorktreeContainsChanges'
+	WorktreeContainsChanges = 'WorktreeContainsChanges',
+	WorktreeAlreadyExists = 'WorktreeAlreadyExists'
 }

extensions/git/src/commands.ts

@@ -3430,6 +3430,10 @@ export class CommandCenter {
 		dispose(disposables);
 		inputBox.dispose();
 
+		if (!worktreeName) {
+			return;
+		}
+
 		// Default to view parent directory of repository root
 		const defaultUri = Uri.file(path.dirname(repository.root));
 
@@ -3451,10 +3455,40 @@ export class CommandCenter {
 
 		worktreePath = path.join(uris[0].fsPath, worktreeName);
 
-		await repository.worktree({
-			name: name,
-			path: worktreePath,
-		});
+		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;
+			}
+
+			throw err;
+		}
 	}
 
 	@command('git.deleteWorktree', { repository: true })

extensions/git/src/git.ts

@@ -351,6 +351,8 @@ function getGitErrorCode(stderr: string): string | undefined {
 		return GitErrorCodes.NotASafeGitRepository;
 	} else if (/contains modified or untracked files|use --force to delete it/.test(stderr)) {
 		return GitErrorCodes.WorktreeContainsChanges;
+	} else if (/is already used by worktree at|already exists/.test(stderr)) {
+		return GitErrorCodes.WorktreeAlreadyExists;
 	}
 
 	return undefined;