Git - polish worktree error handling (microsoft#258806)

Author: lszomoru

extensions/git/src/commands.ts

@@ -3563,27 +3563,23 @@ export class CommandCenter {
 	}
 
 	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) {
+		const match = err.stderr.match(/^fatal: '([^']+)' is already used by worktree at '([^']+)'/);
+		if (!match) {
 			return;
 		}
 
-		const worktreeRepository = this.model.getRepository(path) || this.model.getRepository(Uri.file(path));
+		const [, branch, path] = match;
+		const worktreeRepository = this.model.getRepository(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 openWorktree = l10n.t('Open in Current Window');
+		const openWorktreeInNewWindow = l10n.t('Open in New Window');
+		const message = l10n.t('Branch \'{0}\' is already checked out in the worktree at \'{1}\'.', branch, path);
 		const choice = await window.showWarningMessage(message, { modal: true }, openWorktree, openWorktreeInNewWindow);
 
-
-
 		if (choice === openWorktree) {
 			await this.openWorktreeInCurrentWindow(worktreeRepository);
 		} else if (choice === openWorktreeInNewWindow) {