add deleteBranch

Author: sergiolms

src/commands/git/branch.ts

@@ -543,10 +543,17 @@ export class BranchGitCommand extends QuickCommand {
 			state.flags = result;
 
 			endSteps(state);
-			state.repo.branchDelete(state.references, {
-				force: state.flags.includes('--force'),
-				remote: state.flags.includes('--remotes'),
-			});
+
+			try {
+				await state.repo.git.deleteBranch(state.references, {
+					force: state.flags.includes('--force'),
+					remote: state.flags.includes('--remotes'),
+				});
+			} catch (ex) {
+				Logger.error(ex);
+				// TODO likely need some better error handling here
+				return showGenericErrorMessage('Unable to delete branch');
+			}
 		}
 	}
 

src/env/node/git/git.ts

@@ -12,6 +12,8 @@ import { GitErrorHandling } from '../../../git/commandOptions';
 import {
 	BlameIgnoreRevsFileBadRevisionError,
 	BlameIgnoreRevsFileError,
+	BranchError,
+	BranchErrorReason,
 	CherryPickError,
 	CherryPickErrorReason,
 	FetchError,
@@ -520,7 +522,7 @@ export class Git {
 		}
 	}
 
-	branch(repoPath: string, ...args: string[]) {
+	async branch(repoPath: string, ...args: string[]): Promise<void> {
 		return this.git<string>({ cwd: repoPath }, 'branch', ...args);
 	}
 
@@ -976,6 +978,10 @@ export class Git {
 			publish?: boolean;
 			remote?: string;
 			upstream?: string;
+			delete?: {
+				remote: string;
+				branches: string[];
+			};
 		},
 	): Promise<void> {
 		const params = ['push'];
@@ -1001,8 +1007,10 @@ export class Git {
 			} else {
 				params.push(options.remote, options.branch);
 			}
-		} else if (options.remote) {
+		} else if (options.remote != null) {
 			params.push(options.remote);
+		} else if (options.delete != null) {
+			params.push('-d', options.delete.remote, ...options.delete.branches);
 		}
 
 		try {

src/env/node/git/localGitProvider.ts

@@ -188,7 +188,17 @@ import { countStringLength, filterMap } from '../../../system/array';
 import { gate } from '../../../system/decorators/gate';
 import { debug, log } from '../../../system/decorators/log';
 import { debounce } from '../../../system/function';
-import { filterMap as filterMapIterable, find, first, join, last, map, skip, some } from '../../../system/iterable';
+import {
+	filterMap as filterMapIterable,
+	find,
+	first,
+	groupByMap,
+	join,
+	last,
+	map,
+	skip,
+	some,
+} from '../../../system/iterable';
 import { Logger } from '../../../system/logger';
 import type { LogScope } from '../../../system/logger.scope';
 import { getLogScope, setLogScopeExit } from '../../../system/logger.scope';
@@ -1264,6 +1274,57 @@ export class LocalGitProvider implements GitProvider, Disposable {
 		await this.git.branch(repoPath, '-m', oldName, newName);
 	}
 
+	@log()
+	async deleteBranch(
+		repoPath: string,
+		branches: GitBranchReference[],
+		options: { force?: boolean; remote?: boolean },
+	): Promise<void> {
+		const localBranches = branches.filter((b: GitBranchReference) => !b.remote);
+		if (localBranches.length !== 0) {
+			const args = ['--delete'];
+			if (options.force) {
+				args.push('--force');
+			}
+
+			await this.git.branch(repoPath, ...args, ...branches.map((b: GitBranchReference) => b.ref));
+
+			if (options.remote) {
+				const trackingBranches = localBranches.filter(b => b.upstream != null);
+				if (trackingBranches.length !== 0) {
+					const branchesByOrigin = groupByMap(trackingBranches, b =>
+						getRemoteNameFromBranchName(b.upstream!.name),
+					);
+
+					for (const [remote, branches] of branchesByOrigin.entries()) {
+						await this.git.push(repoPath, {
+							delete: {
+								remote: remote,
+								branches: branches.map(b => getBranchNameWithoutRemote(b.upstream!.name)),
+							},
+						});
+					}
+				}
+			}
+		}
+
+		const remoteBranches = branches.filter((b: GitBranchReference) => b.remote);
+		if (remoteBranches.length !== 0) {
+			const branchesByOrigin = groupByMap(remoteBranches, b => getRemoteNameFromBranchName(b.name));
+
+			for (const [remote, branches] of branchesByOrigin.entries()) {
+				await this.git.push(repoPath, {
+					delete: {
+						remote: remote,
+						branches: branches.map((b: GitBranchReference) =>
+							b.remote ? getBranchNameWithoutRemote(b.name) : b.name,
+						),
+					},
+				});
+			}
+		}
+	}
+
 	@log()
 	async createTag(repoPath: string, name: string, ref: string, message?: string): Promise<void> {
 		try {

src/git/gitProvider.ts

@@ -120,6 +120,11 @@ export interface BranchContributorOverview {
 export interface GitProviderRepository {
 	createBranch?(repoPath: string, name: string, ref: string): Promise<void>;
 	renameBranch?(repoPath: string, oldName: string, newName: string): Promise<void>;
+	deleteBranch?(
+		repoPath: string,
+		branches: GitBranchReference | GitBranchReference[],
+		options?: { force?: boolean; remote?: boolean },
+	): Promise<void>;
 	createTag?(repoPath: string, name: string, ref: string, message?: string): Promise<void>;
 	deleteTag?(repoPath: string, name: string): Promise<void>;
 	addRemote?(repoPath: string, name: string, url: string, options?: { fetch?: boolean }): Promise<void>;

src/git/gitProviderService.ts

@@ -1377,6 +1377,25 @@ export class GitProviderService implements Disposable {
 		return provider.renameBranch(path, oldName, newName);
 	}
 
+	@log()
+	deleteBranch(
+		repoPath: string,
+		branches: GitBranchReference | GitBranchReference[],
+		options?: { force?: boolean; remote?: boolean },
+	): Promise<void> {
+		const { provider, path } = this.getProvider(repoPath);
+		if (provider.deleteBranch == null) throw new ProviderNotSupportedError(provider.descriptor.name);
+
+		if (!Array.isArray(branches)) {
+			branches = [branches];
+		}
+
+		return provider.deleteBranch(path, branches, {
+			force: options?.force,
+			remote: options?.remote,
+		});
+	}
+
 	@log()
 	createTag(repoPath: string | Uri, name: string, ref: string, message?: string): Promise<void> {
 		const { provider, path } = this.getProvider(repoPath);

src/git/models/repository.ts

@@ -15,7 +15,7 @@ import { debug, log, logName } from '../../system/decorators/log';
 import { memoize } from '../../system/decorators/memoize';
 import type { Deferrable } from '../../system/function';
 import { debounce } from '../../system/function';
-import { filter, groupByMap, join, map, min, some } from '../../system/iterable';
+import { filter, join, map, min, some } from '../../system/iterable';
 import { getLoggableName, Logger } from '../../system/logger';
 import { getLogScope } from '../../system/logger.scope';
 import { updateRecordValue } from '../../system/object';
@@ -26,9 +26,9 @@ import { configuration } from '../../system/vscode/configuration';
 import type { GitProviderDescriptor, GitProviderRepository } from '../gitProvider';
 import type { GitProviderService } from '../gitProviderService';
 import type { GitBranch } from './branch';
-import { getBranchNameWithoutRemote, getRemoteNameFromBranchName } from './branch';
-import type { GitBranchReference, GitReference } from './reference';
+import type { GitBranchReference, GitReference, GitTagReference } from './reference';
 import { getNameWithoutRemote, isBranchReference } from './reference';
+import { getBranchNameWithoutRemote, getRemoteNameFromBranchName } from './branch';
 import type { GitRemote } from './remote';
 import type { GitWorktree } from './worktree';
 
@@ -590,49 +590,6 @@ export class Repository implements Disposable {
 		return remote;
 	}
 
-	@log()
-	branchDelete(branches: GitBranchReference | GitBranchReference[], options?: { force?: boolean; remote?: boolean }) {
-		if (!Array.isArray(branches)) {
-			branches = [branches];
-		}
-
-		const localBranches = branches.filter(b => !b.remote);
-		if (localBranches.length !== 0) {
-			const args = ['--delete'];
-			if (options?.force) {
-				args.push('--force');
-			}
-			void this.runTerminalCommand('branch', ...args, ...branches.map(b => b.ref));
-
-			if (options?.remote) {
-				const trackingBranches = localBranches.filter(b => b.upstream != null);
-				if (trackingBranches.length !== 0) {
-					const branchesByOrigin = groupByMap(trackingBranches, b =>
-						getRemoteNameFromBranchName(b.upstream!.name),
-					);
-
-					for (const [remote, branches] of branchesByOrigin.entries()) {
-						void this.runTerminalCommand(
-							'push',
-							'-d',
-							remote,
-							...branches.map(b => getBranchNameWithoutRemote(b.upstream!.name)),
-						);
-					}
-				}
-			}
-		}
-
-		const remoteBranches = branches.filter(b => b.remote);
-		if (remoteBranches.length !== 0) {
-			const branchesByOrigin = groupByMap(remoteBranches, b => getRemoteNameFromBranchName(b.name));
-
-			for (const [remote, branches] of branchesByOrigin.entries()) {
-				void this.runTerminalCommand('push', '-d', remote, ...branches.map(b => getNameWithoutRemote(b)));
-			}
-		}
-	}
-
 	@log()
 	cherryPick(...args: string[]) {
 		void this.runTerminalCommand('cherry-pick', ...args);