Refactors Git provider into sub-providers

 - Remote operations
 - Tag operations

Author: eamodio

src/annotations/lineAnnotationController.ts

@@ -157,7 +157,7 @@ export class LineAnnotationController implements Disposable {
 		const prs = new Map<string, Promise<PullRequest | undefined>>();
 		if (lines.size === 0) return prs;
 
-		const remotePromise = this.container.git.getBestRemoteWithIntegration(repoPath);
+		const remotePromise = this.container.git.remotes(repoPath).getBestRemoteWithIntegration();
 
 		for (const [, state] of lines) {
 			if (state.commit.isUncommitted) continue;

src/avatars.ts

@@ -227,7 +227,9 @@ async function getAvatarUriFromRemoteProvider(
 		// 	account = await remote?.provider.getAccountForEmail(email, { avatarSize: size });
 		// } else {
 		if (typeof repoPathOrCommit !== 'string') {
-			const remote = await Container.instance.git.getBestRemoteWithIntegration(repoPathOrCommit.repoPath);
+			const remote = await Container.instance.git
+				.remotes(repoPathOrCommit.repoPath)
+				.getBestRemoteWithIntegration();
 			if (remote?.hasIntegration()) {
 				account = await (
 					await remote.getIntegration()

src/commands/copyDeepLink.ts

@@ -128,7 +128,7 @@ export class CopyDeepLinkCommand extends ActiveEditorCommand {
 
 		try {
 			let chosenRemote;
-			const remotes = await this.container.git.getRemotes(repoPath, { sort: true });
+			const remotes = await this.container.git.remotes(repoPath).getRemotes({ sort: true });
 			const defaultRemote = remotes.find(r => r.default);
 			if (args.remote && !args.prePickRemote) {
 				chosenRemote = remotes.find(r => r.name === args?.remote);
@@ -291,7 +291,7 @@ export class CopyFileDeepLinkCommand extends ActiveEditorCommand {
 
 		try {
 			let chosenRemote;
-			const remotes = await this.container.git.getRemotes(repoPath, { sort: true });
+			const remotes = await this.container.git.remotes(repoPath).getRemotes({ sort: true });
 			const defaultRemote = remotes.find(r => r.default);
 			if (args.remote && !args.prePickRemote) {
 				chosenRemote = remotes.find(r => r.name === args?.remote);

src/commands/createPullRequestOnRemote.ts

@@ -51,11 +51,11 @@ export class CreatePullRequestOnRemoteCommand extends GlCommandBase {
 			};
 		}
 
-		const compareRemote = await repo.git.getRemote(args.remote);
+		const compareRemote = await repo.git.remotes().getRemote(args.remote);
 		if (compareRemote?.provider == null) return;
 
 		const providerId = compareRemote.provider.id;
-		const remotes = (await repo.git.getRemotes({
+		const remotes = (await repo.git.remotes().getRemotes({
 			filter: r => r.provider?.id === providerId,
 			sort: true,
 		})) as GitRemote<RemoteProvider>[];

src/commands/ghpr/openOrCreateWorktree.ts

@@ -86,7 +86,7 @@ export class OpenOrCreateWorktreeCommand extends GlCommandBase {
 		const remoteUrl = remoteUri.toString();
 		const [, remoteDomain, remotePath] = parseGitRemoteUrl(remoteUrl);
 
-		const remotes = await repo.git.getRemotes({ filter: r => r.matches(remoteDomain, remotePath) });
+		const remotes = await repo.git.remotes().getRemotes({ filter: r => r.matches(remoteDomain, remotePath) });
 		const remote = remotes[0] as GitRemote | undefined;
 
 		let addRemote: { name: string; url: string } | undefined;

src/commands/git/push.ts

@@ -200,7 +200,7 @@ export class PushGitCommand extends QuickCommand<State> {
 					const branch = await repo.git.branches().getBranch(state.reference.name);
 
 					if (branch != null && branch?.upstream == null) {
-						for (const remote of await repo.git.getRemotes()) {
+						for (const remote of await repo.git.remotes().getRemotes()) {
 							items.push(
 								createFlagsQuickPickItem<Flags>(
 									state.flags,
@@ -317,7 +317,7 @@ export class PushGitCommand extends QuickCommand<State> {
 							pushDetails = '';
 						}
 
-						for (const remote of await repo.git.getRemotes()) {
+						for (const remote of await repo.git.remotes().getRemotes()) {
 							items.push(
 								createFlagsQuickPickItem<Flags>(
 									state.flags,

src/commands/git/remote.ts

@@ -288,7 +288,8 @@ export class RemoteGitCommand extends QuickCommand<State> {
 			state.flags = ['-f'];
 		}
 
-		let alreadyExists = (await state.repo.git.getRemotes({ filter: r => r.name === state.name })).length !== 0;
+		let alreadyExists =
+			(await state.repo.git.remotes().getRemotes({ filter: r => r.name === state.name })).length !== 0;
 
 		while (this.canStepsContinue(state)) {
 			if (state.counter < 3 || state.name == null || alreadyExists) {
@@ -298,7 +299,8 @@ export class RemoteGitCommand extends QuickCommand<State> {
 				});
 				if (result === StepResultBreak) continue;
 
-				alreadyExists = (await state.repo.git.getRemotes({ filter: r => r.name === result })).length !== 0;
+				alreadyExists =
+					(await state.repo.git.remotes().getRemotes({ filter: r => r.name === result })).length !== 0;
 				if (alreadyExists) {
 					state.counter--;
 					continue;
@@ -364,7 +366,9 @@ export class RemoteGitCommand extends QuickCommand<State> {
 		while (this.canStepsContinue(state)) {
 			if (state.remote != null) {
 				if (typeof state.remote === 'string') {
-					const [remote] = await state.repo.git.getRemotes({ filter: r => r.name === state.remote });
+					const [remote] = await state.repo.git
+						.remotes()
+						.getRemotes({ filter: r => r.name === state.remote });
 					if (remote != null) {
 						state.remote = remote;
 					} else {
@@ -390,7 +394,7 @@ export class RemoteGitCommand extends QuickCommand<State> {
 
 			endSteps(state);
 			try {
-				await state.repo.git.removeRemote(state.remote.name);
+				await state.repo.git.remotes().removeRemote?.(state.remote.name);
 			} catch (ex) {
 				Logger.error(ex);
 				void showGenericErrorMessage('Unable to remove remote');
@@ -420,7 +424,9 @@ export class RemoteGitCommand extends QuickCommand<State> {
 		while (this.canStepsContinue(state)) {
 			if (state.remote != null) {
 				if (typeof state.remote === 'string') {
-					const [remote] = await state.repo.git.getRemotes({ filter: r => r.name === state.remote });
+					const [remote] = await state.repo.git
+						.remotes()
+						.getRemotes({ filter: r => r.name === state.remote });
 					if (remote != null) {
 						state.remote = remote;
 					} else {
@@ -445,7 +451,7 @@ export class RemoteGitCommand extends QuickCommand<State> {
 			if (result === StepResultBreak) continue;
 
 			endSteps(state);
-			void state.repo.git.pruneRemote(state.remote.name);
+			void state.repo.git.remotes().pruneRemote?.(state.remote.name);
 		}
 	}
 

src/commands/git/tag.ts

@@ -292,7 +292,7 @@ export class TagGitCommand extends QuickCommand<State> {
 
 			endSteps(state);
 			try {
-				await state.repo.git.createTag(state.name, state.reference.ref, state.message);
+				await state.repo.git.tags().createTag?.(state.name, state.reference.ref, state.message);
 			} catch (ex) {
 				Logger.error(ex, context.title);
 				void showGenericErrorMessage(ex);
@@ -381,7 +381,7 @@ export class TagGitCommand extends QuickCommand<State> {
 			endSteps(state);
 			for (const { ref } of state.references) {
 				try {
-					await state.repo.git.deleteTag(ref);
+					await state.repo.git.tags().deleteTag?.(ref);
 				} catch (ex) {
 					Logger.error(ex, context.title);
 					void showGenericErrorMessage(ex);

src/commands/openAssociatedPullRequestOnRemote.ts

@@ -36,7 +36,7 @@ export class OpenAssociatedPullRequestOnRemoteCommand extends ActiveEditorComman
 		} else {
 			try {
 				const repo = await getRepositoryOrShowPicker('Open Associated Pull Request', undefined, undefined, {
-					filter: async r => (await this.container.git.getBestRemoteWithIntegration(r.uri)) != null,
+					filter: async r => (await this.container.git.remotes(r.uri).getBestRemoteWithIntegration()) != null,
 				});
 				if (repo == null) return;
 

src/commands/openFileOnRemote.ts

@@ -121,7 +121,7 @@ export class OpenFileOnRemoteCommand extends ActiveEditorCommand {
 		args = { range: true, ...args };
 
 		try {
-			let remotes = await this.container.git.getRemotesWithProviders(gitUri.repoPath, { sort: true });
+			let remotes = await this.container.git.remotes(gitUri.repoPath).getRemotesWithProviders({ sort: true });
 
 			let range: Range | undefined;
 			if (args.range) {