Refactors Git provider into sub-providers

 - Branch operations

Author: eamodio

src/commands/copyCurrentBranch.ts

@@ -24,7 +24,7 @@ export class CopyCurrentBranchCommand extends ActiveEditorCommand {
 		if (repository == null) return;
 
 		try {
-			const branch = await repository.git.getBranch();
+			const branch = await repository.git.branches().getBranch();
 			if (branch?.name) {
 				await env.clipboard.writeText(branch.name);
 			}

src/commands/createPullRequestOnRemote.ts

@@ -35,7 +35,7 @@ export class CreatePullRequestOnRemoteCommand extends GlCommandBase {
 		if (repo == null) return;
 
 		if (args == null) {
-			const branch = await repo.git.getBranch();
+			const branch = await repo.git.branches().getBranch();
 			if (branch?.upstream == null) {
 				void window.showErrorMessage(
 					`Unable to create a pull request for branch \`${branch?.name}\` because it has no upstream branch`,

src/commands/git/branch.ts

@@ -362,7 +362,7 @@ export class BranchGitCommand extends QuickCommand {
 			if (state.counter < 3 || state.reference == null) {
 				const result = yield* pickBranchOrTagStep(state, context, {
 					placeholder: `Choose a base to create the new branch from`,
-					picked: state.reference?.ref ?? (await state.repo.git.getBranch())?.ref,
+					picked: state.reference?.ref ?? (await state.repo.git.branches().getBranch())?.ref,
 					title: 'Select Base to Create Branch From',
 					value: isRevisionReference(state.reference) ? state.reference.ref : undefined,
 				});
@@ -423,7 +423,7 @@ export class BranchGitCommand extends QuickCommand {
 				await state.repo.switch(state.reference.ref, { createBranch: state.name });
 			} else {
 				try {
-					await state.repo.git.createBranch(state.name, state.reference.ref);
+					await state.repo.git.branches().createBranch?.(state.name, state.reference.ref);
 				} catch (ex) {
 					Logger.error(ex);
 					// TODO likely need some better error handling here
@@ -433,7 +433,7 @@ export class BranchGitCommand extends QuickCommand {
 
 			if (state.associateWithIssue != null) {
 				const issue = state.associateWithIssue;
-				const branch = await state.repo.git.getBranch(state.name);
+				const branch = await state.repo.git.branches().getBranch(state.name);
 				// TODO: These descriptors are hacked in. Use an integration function to get the right resource for the issue.
 				const owner = getIssueOwner(issue);
 				if (branch != null && owner != null) {
@@ -675,7 +675,7 @@ export class BranchGitCommand extends QuickCommand {
 
 			endSteps(state);
 			try {
-				await state.repo.git.renameBranch(state.reference.ref, state.name);
+				await state.repo.git.branches().renameBranch?.(state.reference.ref, state.name);
 			} catch (ex) {
 				Logger.error(ex);
 				// TODO likely need some better error handling here

src/commands/git/cherry-pick.ts

@@ -132,7 +132,7 @@ export class CherryPickGitCommand extends QuickCommand<State> {
 			}
 
 			if (context.destination == null) {
-				const branch = await state.repo.git.getBranch();
+				const branch = await state.repo.git.branches().getBranch();
 				if (branch == null) break;
 
 				context.destination = branch;
@@ -173,14 +173,13 @@ export class CherryPickGitCommand extends QuickCommand<State> {
 			}
 
 			if (context.selectedBranchOrTag == null && state.references?.length) {
-				const branches = await this.container.git.getCommitBranches(
-					state.repo.path,
+				const branches = await state.repo.git.branches().getBranchesForCommit(
 					state.references.map(r => r.ref),
 					undefined,
 					{ mode: 'contains' },
 				);
 				if (branches.length) {
-					const branch = await state.repo.git.getBranch(branches[0]);
+					const branch = await state.repo.git.branches().getBranch(branches[0]);
 					if (branch != null) {
 						context.selectedBranchOrTag = branch;
 					}

src/commands/git/log.ts

@@ -118,7 +118,7 @@ export class LogGitCommand extends QuickCommand<State> {
 			assertStateStepRepository(state);
 
 			if (state.reference === 'HEAD') {
-				const branch = await state.repo.git.getBranch();
+				const branch = await state.repo.git.branches().getBranch();
 				state.reference = branch;
 			}
 

src/commands/git/merge.ts

@@ -125,7 +125,7 @@ export class MergeGitCommand extends QuickCommand<State> {
 			}
 
 			if (context.destination == null) {
-				const branch = await state.repo.git.getBranch();
+				const branch = await state.repo.git.branches().getBranch();
 				if (branch == null) break;
 
 				context.destination = branch;

src/commands/git/pull.ts

@@ -67,7 +67,7 @@ export class PullGitCommand extends QuickCommand<State> {
 		if (isBranchReference(state.reference)) {
 			// Only resort to a branch fetch if the branch isn't the current one
 			if (!isBranch(state.reference) || !state.reference.current) {
-				const currentBranch = await state.repos[0].git.getBranch();
+				const currentBranch = await state.repos[0].git.branches().getBranch();
 				if (currentBranch?.name !== state.reference.name) {
 					return state.repos[0].fetch({ branch: state.reference, pull: true });
 				}
@@ -167,7 +167,7 @@ export class PullGitCommand extends QuickCommand<State> {
 				);
 			} else {
 				const [repo] = state.repos;
-				const branch = await repo.git.getBranch(state.reference.name);
+				const branch = await repo.git.branches().getBranch(state.reference.name);
 
 				if (branch?.upstream == null) {
 					step = this.createConfirmStep(

src/commands/git/push.ts

@@ -197,7 +197,7 @@ export class PushGitCommand extends QuickCommand<State> {
 						{ placeholder: 'Cannot push a remote branch' },
 					);
 				} else {
-					const branch = await repo.git.getBranch(state.reference.name);
+					const branch = await repo.git.branches().getBranch(state.reference.name);
 
 					if (branch != null && branch?.upstream == null) {
 						for (const remote of await repo.git.getRemotes()) {

src/commands/git/rebase.ts

@@ -135,7 +135,7 @@ export class RebaseGitCommand extends QuickCommand<State> {
 			}
 
 			if (context.branch == null) {
-				const branch = await state.repo.git.getBranch();
+				const branch = await state.repo.git.branches().getBranch();
 				if (branch == null) break;
 
 				context.branch = branch;

src/commands/git/reset.ts

@@ -110,7 +110,7 @@ export class ResetGitCommand extends QuickCommand<State> {
 			}
 
 			if (context.destination == null) {
-				const branch = await state.repo.git.getBranch();
+				const branch = await state.repo.git.branches().getBranch();
 				if (branch == null) break;
 
 				context.destination = branch;