Adds branchCreate and branchRename methods

Author: sergiolms

CHANGELOG.md

@@ -14,6 +14,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Changed
 
+- Change `branch create` and `branch rename` terminal-run commands into normal commands
+
 ### Fixed
 
 - Fixes [#3592](https://github.com/gitkraken/vscode-gitlens/issues/3592) - Connecting to an integration via Remotes view (but likely others) doesn't work

src/commands/git/branch.ts

@@ -393,7 +393,7 @@ export class BranchGitCommand extends QuickCommand {
 			if (state.flags.includes('--switch')) {
 				await state.repo.switch(state.reference.ref, { createBranch: state.name });
 			} else {
-				state.repo.branch(...state.flags, state.name, state.reference.ref);
+				await state.repo.git.branchCreate(state.name, state.reference.ref);
 			}
 		}
 	}
@@ -614,7 +614,7 @@ export class BranchGitCommand extends QuickCommand {
 			state.flags = result;
 
 			endSteps(state);
-			state.repo.branch(...state.flags, state.reference.ref, state.name);
+			await state.repo.git.branchRename(state.reference.ref, state.name);
 		}
 	}
 

src/env/node/git/git.ts

@@ -506,6 +506,10 @@ export class Git {
 		}
 	}
 
+	branch(repoPath: string, ...args: string[]) {
+		return this.git<string>({ cwd: repoPath }, 'branch', ...args);
+	}
+
 	branch__set_upstream(repoPath: string, branch: string, remote: string, remoteBranch: string) {
 		return this.git<string>({ cwd: repoPath }, 'branch', '--set-upstream-to', `${remote}/${remoteBranch}`, branch);
 	}

src/env/node/git/localGitProvider.ts

@@ -39,6 +39,7 @@ import {
 	WorktreeDeleteErrorReason,
 } from '../../../git/errors';
 import type {
+	GitBranchOptions,
 	GitCaches,
 	GitDir,
 	GitProvider,
@@ -1230,6 +1231,19 @@ export class LocalGitProvider implements GitProvider, Disposable {
 		}
 	}
 
+	@log()
+	async branch(repoPath: string, options: GitBranchOptions): Promise<void> {
+		if (options?.create != null) {
+			return this.git.branch(repoPath, options.create.name, options.create.startRef);
+		}
+
+		if (options?.rename != null) {
+			return this.git.branch(repoPath, '-m', options.rename.old, options.rename.new);
+		}
+
+		throw new Error('Invalid branch options');
+	}
+
 	@log()
 	async checkout(
 		repoPath: string,

src/git/gitProvider.ts

@@ -112,6 +112,17 @@ export interface RepositoryVisibilityInfo {
 	remotesHash?: string;
 }
 
+export type GitBranchOptions = {
+	rename?: {
+		old: string;
+		new: string;
+	};
+	create?: {
+		name: string;
+		startRef: string;
+	};
+};
+
 export interface GitProviderRepository {
 	addRemote?(repoPath: string, name: string, url: string, options?: { fetch?: boolean }): Promise<void>;
 	pruneRemote?(repoPath: string, name: string): Promise<void>;
@@ -477,6 +488,7 @@ export interface GitProvider extends GitProviderRepository, Disposable {
 	getWorkingUri(repoPath: string, uri: Uri): Promise<Uri | undefined>;
 
 	applyChangesToWorkingFile?(uri: GitUri, ref1?: string, ref2?: string): Promise<void>;
+	branch(_repoPath: string, _options: GitBranchOptions): Promise<void>;
 	clone?(url: string, parentPath: string): Promise<string | undefined>;
 	/**
 	 * Returns the blame of a file

src/git/gitProviderService.ts

@@ -19,6 +19,7 @@ import { SubscriptionPlanId } from '../constants.subscription';
 import type { Container } from '../container';
 import { AccessDeniedError, CancellationError, ProviderNotFoundError, ProviderNotSupportedError } from '../errors';
 import type { FeatureAccess, Features, PlusFeatures, RepoFeatureAccess } from '../features';
+import { showGenericErrorMessage } from '../messages';
 import { getApplicablePromo } from '../plus/gk/account/promos';
 import type { Subscription } from '../plus/gk/account/subscription';
 import { isSubscriptionPaidPlan } from '../plus/gk/account/subscription';
@@ -44,6 +45,7 @@ import { configuration } from '../system/vscode/configuration';
 import { setContext } from '../system/vscode/context';
 import { getBestPath } from '../system/vscode/path';
 import type {
+	GitBranchOptions,
 	GitCaches,
 	GitDir,
 	GitProvider,
@@ -1338,6 +1340,38 @@ export class GitProviderService implements Disposable {
 		return provider.applyUnreachableCommitForPatch(path, ref, options);
 	}
 
+	@log()
+	branchCreate(repoPath: string, name: string, startRef: string): Promise<void> {
+		const { provider, path } = this.getProvider(repoPath);
+		try {
+			return provider.branch(path, {
+				create: {
+					name: name,
+					startRef: startRef,
+				},
+			});
+		} catch (ex) {
+			Logger.error(ex);
+			return showGenericErrorMessage('Unable to create branch');
+		}
+	}
+
+	@log()
+	branchRename(repoPath: string, oldName: string, newName: string): Promise<void> {
+		const { provider, path } = this.getProvider(repoPath);
+		try {
+			return provider.branch(path, {
+				rename: {
+					old: oldName,
+					new: newName,
+				},
+			});
+		} catch (ex) {
+			Logger.error(ex);
+			return showGenericErrorMessage('Unable to rename branch');
+		}
+	}
+
 	@log()
 	checkout(
 		repoPath: string | Uri,

src/git/models/repository.ts

@@ -39,6 +39,8 @@ export type RepoGitProviderService = Pick<
 		[K in keyof GitProviderService]: RemoveFirstArg<GitProviderService[K]>;
 	},
 	| keyof GitProviderRepository
+	| 'branchCreate'
+	| 'branchRename'
 	| 'getBestRemoteWithIntegration'
 	| 'getBranch'
 	| 'getRemote'
@@ -560,11 +562,6 @@ export class Repository implements Disposable {
 		return remote;
 	}
 
-	@log()
-	branch(...args: string[]) {
-		void this.runTerminalCommand('branch', ...args);
-	}
-
 	@log()
 	branchDelete(branches: GitBranchReference | GitBranchReference[], options?: { force?: boolean; remote?: boolean }) {
 		if (!Array.isArray(branches)) {

src/plus/integrations/providers/github/githubGitProvider.ts

@@ -26,6 +26,7 @@ import {
 import { Features } from '../../../../features';
 import { GitSearchError } from '../../../../git/errors';
 import type {
+	GitBranchOptions,
 	GitCaches,
 	GitProvider,
 	LeftRightCommitCountResult,
@@ -443,6 +444,9 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 		return this.createVirtualUri(repoPath, undefined, uri.path);
 	}
 
+	@log()
+	async branch(_repoPath: string, _options: GitBranchOptions): Promise<void> {}
+
 	@log()
 	async branchContainsCommit(_repoPath: string, _name: string, _ref: string): Promise<boolean> {
 		return false;