rework deletion flow (microsoft#256415)

* rework deletion flow

* change delete label

* Revise deletion of worktree

* reopen correct repo

* clean up

* Refactor deleteWorkspace command

* Do not show deleteWorktree command in the command palette

---------

Co-authored-by: Ladislau Szomoru <[email protected]>

Author: nguyenchristy

extensions/git/package.json

@@ -1307,7 +1307,7 @@
         },
         {
           "command": "git.deleteWorktree",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
+          "when": "false"
         },
         {
           "command": "git.deleteRemoteTag",
@@ -2571,6 +2571,7 @@
           "group": "worktrees@1"
         },
         {
+          "when": "scmProviderContext == worktree",
           "command": "git.deleteWorktree",
           "group": "worktrees@2"
         }

extensions/git/package.nls.json

@@ -76,7 +76,7 @@
 	"command.createTag": "Create Tag...",
 	"command.deleteTag": "Delete Tag...",
 	"command.createWorktree": "Create Worktree...",
-	"command.deleteWorktree": "Delete Worktree...",
+	"command.deleteWorktree": "Delete Worktree",
 	"command.deleteRemoteTag": "Delete Remote Tag...",
 	"command.fetch": "Fetch",
 	"command.fetchPrune": "Fetch (Prune)",

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

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

extensions/git/src/commands.ts

@@ -9,7 +9,7 @@ import { Command, commands, Disposable, MessageOptions, Position, ProgressLocati
 import TelemetryReporter from '@vscode/extension-telemetry';
 import { uniqueNamesGenerator, adjectives, animals, colors, NumberDictionary } from '@joaomoreno/unique-names-generator';
 import { ForcePushMode, GitErrorCodes, RefType, Status, CommitOptions, RemoteSourcePublisher, Remote, Branch, Ref } from './api/git';
-import { Git, Stash, Worktree } from './git';
+import { Git, Stash } from './git';
 import { Model } from './model';
 import { GitResourceGroup, Repository, Resource, ResourceGroupType } from './repository';
 import { DiffEditorSelectionHunkToolbarContext, LineChange, applyLineChanges, getIndexDiffInformation, getModifiedRange, getWorkingTreeDiffInformation, intersectDiffWithRange, invertLineChange, toLineChanges, toLineRanges, compareLineChanges } from './staging';
@@ -57,19 +57,6 @@ class RefItemSeparator implements QuickPickItem {
 	constructor(private readonly refType: RefType) { }
 }
 
-class WorktreeItem implements QuickPickItem {
-
-	get label(): string {
-		return `$(list-tree) ${this.worktree.name}`;
-	}
-
-	get description(): string {
-		return this.worktree.path;
-	}
-
-	constructor(readonly worktree: Worktree) { }
-}
-
 class RefItem implements QuickPickItem {
 
 	get label(): string {
@@ -228,14 +215,6 @@ class RemoteTagDeleteItem extends RefItem {
 	}
 }
 
-class WorktreeDeleteItem extends WorktreeItem {
-	async run(repository: Repository): Promise<void> {
-		if (this.worktree.path) {
-			await repository.deleteWorktree(this.worktree.path);
-		}
-	}
-}
-
 class MergeItem extends BranchItem {
 
 	async run(repository: Repository): Promise<void> {
@@ -3409,18 +3388,35 @@ export class CommandCenter {
 
 	@command('git.deleteWorktree', { repository: true })
 	async deleteWorktree(repository: Repository): Promise<void> {
-		const worktreePicks = async (): Promise<WorktreeDeleteItem[] | QuickPickItem[]> => {
-			const worktrees = await repository.getWorktrees();
-			return worktrees.length === 0
-				? [{ label: l10n.t('$(info) This repository has no worktrees.') }]
-				: worktrees.map(worktree => new WorktreeDeleteItem(worktree));
-		};
+		if (!repository.dotGit.commonPath) {
+			return;
+		}
+
+		const mainRepository = this.model.getRepository(path.dirname(repository.dotGit.commonPath));
+		if (!mainRepository) {
+			return;
+		}
 
-		const placeHolder = l10n.t('Select a worktree to delete');
-		const choice = await this.pickRef<WorktreeDeleteItem | QuickPickItem>(worktreePicks(), placeHolder);
+		// Dispose worktree repository
+		this.model.disposeRepository(repository);
 
-		if (choice instanceof WorktreeDeleteItem) {
-			await choice.run(repository);
+		try {
+			await mainRepository.deleteWorktree(repository.root);
+		} catch (err) {
+			if (err.gitErrorCode === GitErrorCodes.WorktreeContainsChanges) {
+				const forceDelete = l10n.t('Force Delete');
+				const message = l10n.t('The worktree contains modified or untracked files. Do you want to force delete?');
+				const choice = await window.showWarningMessage(message, { modal: true }, forceDelete);
+				if (choice === forceDelete) {
+					await mainRepository.deleteWorktree(repository.root, { force: true });
+				} else {
+					await this.model.openRepository(repository.root);
+				}
+
+				return;
+			}
+
+			throw err;
 		}
 	}
 

extensions/git/src/git.ts

@@ -349,6 +349,8 @@ function getGitErrorCode(stderr: string): string | undefined {
 		return GitErrorCodes.DirtyWorkTree;
 	} else if (/detected dubious ownership in repository at/.test(stderr)) {
 		return GitErrorCodes.NotASafeGitRepository;
+	} else if (/contains modified or untracked files|use --force to delete it/.test(stderr)) {
+		return GitErrorCodes.WorktreeContainsChanges;
 	}
 
 	return undefined;
@@ -2038,8 +2040,14 @@ export class Repository {
 		await this.exec(args);
 	}
 
-	async deleteWorktree(path: string): Promise<void> {
-		const args = ['worktree', 'remove', path];
+	async deleteWorktree(path: string, options?: { force?: boolean }): Promise<void> {
+		const args = ['worktree', 'remove'];
+
+		if (options?.force) {
+			args.push('--force');
+		}
+
+		args.push(path);
 		await this.exec(args);
 	}
 

extensions/git/src/model.ts

@@ -1140,6 +1140,16 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 		}
 	}
 
+	disposeRepository(repository: Repository): void {
+		const openRepository = this.getOpenRepository(repository);
+		if (!openRepository) {
+			return;
+		}
+
+		this.logger.info(`[Model][disposeRepository] Repository: ${repository.root}`);
+		openRepository.dispose();
+	}
+
 	dispose(): void {
 		const openRepositories = [...this.openRepositories];
 		openRepositories.forEach(r => r.dispose());

extensions/git/src/repository.ts

@@ -1721,8 +1721,8 @@ export class Repository implements Disposable {
 		await this.run(Operation.Worktree, () => this.repository.worktree(options));
 	}
 
-	async deleteWorktree(path: string): Promise<void> {
-		await this.run(Operation.DeleteWorktree, () => this.repository.deleteWorktree(path));
+	async deleteWorktree(path: string, options?: { force?: boolean }): Promise<void> {
+		await this.run(Operation.DeleteWorktree, () => this.repository.deleteWorktree(path, options));
 	}
 
 	async deleteRemoteRef(remoteName: string, refName: string, options?: { force?: boolean }): Promise<void> {