change branch create and branch rename into normal commands

Author: sergiolms

src/commands/git/branch.ts

@@ -393,7 +393,12 @@ 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.branch({
+					create: {
+						name: state.name,
+						startRef: state.reference.ref,
+					},
+				});
 			}
 		}
 	}
@@ -614,7 +619,12 @@ export class BranchGitCommand extends QuickCommand {
 			state.flags = result;
 
 			endSteps(state);
-			state.repo.branch(...state.flags, state.reference.ref, state.name);
+			await state.repo.branch({
+				rename: {
+					old: state.reference.ref,
+					new: 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

@@ -1225,6 +1225,16 @@ export class LocalGitProvider implements GitProvider, Disposable {
 		}
 	}
 
+	@log()
+	async branch(repoPath: string, ...args: string[]): Promise<void> {
+		try {
+			await this.git.branch(repoPath, ...args);
+		} catch (ex) {
+			Logger.error(ex, getLogScope());
+			void showGenericErrorMessage(`Unable to create branch`);
+		}
+	}
+
 	@log()
 	async checkout(
 		repoPath: string,

src/git/gitProvider.ts

@@ -167,6 +167,7 @@ export interface GitProvider extends Disposable {
 			stash?: boolean | 'prompt';
 		},
 	): Promise<void>;
+	branch(repoPath: string, ...args: string[]): Promise<void>;
 	checkout(
 		repoPath: string,
 		ref: string,

src/git/gitProviderService.ts

@@ -1325,6 +1325,12 @@ export class GitProviderService implements Disposable {
 		return provider.applyUnreachableCommitForPatch?.(path, ref, options);
 	}
 
+	@log()
+	branch(repoPath: string | Uri, ...args: string[]): Promise<void> {
+		const { provider, path } = this.getProvider(repoPath);
+		return provider.branch(path, ...args);
+	}
+
 	@log()
 	checkout(
 		repoPath: string | Uri,

src/git/models/repository.ts

@@ -47,6 +47,17 @@ export interface RepositoriesSortOptions {
 	orderBy?: RepositoriesSorting;
 }
 
+type GitBranchOptions = {
+	rename?: {
+		old: string;
+		new: string;
+	};
+	create?: {
+		name: string;
+		startRef: string;
+	};
+};
+
 const emptyArray = Object.freeze([]) as unknown as any[];
 
 const millisecondsPerMinute = 60 * 1000;
@@ -568,8 +579,17 @@ export class Repository implements Disposable {
 	}
 
 	@log()
-	branch(...args: string[]) {
-		void this.runTerminalCommand('branch', ...args);
+	branch(options: GitBranchOptions) {
+		const { rename, create } = options;
+		if (rename != null) {
+			return this.container.git.branch(this.uri, '-m', rename.old, rename.new);
+		}
+
+		if (create != null) {
+			return this.container.git.branch(this.uri, create.name, create.startRef);
+		}
+
+		throw new Error('Invalid branch options');
 	}
 
 	@log()

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

@@ -452,6 +452,9 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 	@log()
 	async applyChangesToWorkingFile(_uri: GitUri, _ref1?: string, _ref2?: string): Promise<void> {}
 
+	@log()
+	async branch(_repoPath: string, ..._args: string[]): Promise<void> {}
+
 	@log()
 	async branchContainsCommit(_repoPath: string, _name: string, _ref: string): Promise<boolean> {
 		return false;