Slims Repository to use proxied GitProviderService

 - Avoids reimplementing many GitProviderService methods on Repository

Author: eamodio

src/commands/closeUnchangedFiles.ts

@@ -27,7 +27,7 @@ export class CloseUnchangedFilesCommand extends Command {
 				const repository = await getRepositoryOrShowPicker('Close All Unchanged Files');
 				if (repository == null) return;
 
-				const status = await this.container.git.getStatusForRepo(repository.uri);
+				const status = await this.container.git.getStatus(repository.uri);
 				if (status == null) {
 					void window.showWarningMessage('Unable to close unchanged files');
 

src/commands/copyCurrentBranch.ts

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

src/commands/createPullRequestOnRemote.ts

@@ -35,7 +35,7 @@ export class CreatePullRequestOnRemoteCommand extends Command {
 		if (repo == null) return;
 
 		if (args == null) {
-			const branch = await repo.getBranch();
+			const branch = await repo.git.getBranch();
 			if (branch?.upstream == null) {
 				void window.showErrorMessage(
 					`Unable to create a pull request for branch \`${branch?.name}\` because it has no upstream branch`,
@@ -51,11 +51,11 @@ export class CreatePullRequestOnRemoteCommand extends Command {
 			};
 		}
 
-		const compareRemote = await repo.getRemote(args.remote);
+		const compareRemote = await repo.git.getRemote(args.remote);
 		if (compareRemote?.provider == null) return;
 
 		const providerId = compareRemote.provider.id;
-		const remotes = (await repo.getRemotes({
+		const remotes = (await repo.git.getRemotes({
 			filter: r => r.provider?.id === providerId,
 			sort: true,
 		})) as GitRemote<RemoteProvider>[];

src/commands/diffWithRevision.ts

@@ -61,7 +61,7 @@ export class DiffWithRevisionCommand extends ActiveEditorCommand {
 							getState: async () => {
 								const items: (CommandQuickPickItem | DirectiveQuickPickItem)[] = [];
 
-								const status = await this.container.git.getStatusForRepo(gitUri.repoPath);
+								const status = await this.container.git.getStatus(gitUri.repoPath);
 								if (status != null) {
 									for (const f of status.files) {
 										if (f.workingTreeStatus === '?' || f.workingTreeStatus === '!') {

src/commands/externalDiff.ts

@@ -88,7 +88,7 @@ export class ExternalDiffCommand extends Command {
 				const repository = await getRepositoryOrShowPicker('Open All Changes (difftool)');
 				if (repository == null) return undefined;
 
-				const status = await this.container.git.getStatusForRepo(repository.uri);
+				const status = await this.container.git.getStatus(repository.uri);
 				if (status == null) {
 					return window.showInformationMessage("The repository doesn't have any changes");
 				}

src/commands/ghpr/openOrCreateWorktree.ts

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

src/commands/git/branch.ts

@@ -338,7 +338,7 @@ export class BranchGitCommand extends QuickCommand {
 				const result = yield* pickBranchOrTagStep(state, context, {
 					placeholder: context =>
 						`Choose a branch${context.showTags ? ' or tag' : ''} to create the new branch from`,
-					picked: state.reference?.ref ?? (await state.repo.getBranch())?.ref,
+					picked: state.reference?.ref ?? (await state.repo.git.getBranch())?.ref,
 					titleContext: ' from',
 					value: isRevisionReference(state.reference) ? state.reference.ref : undefined,
 				});

src/commands/git/cherry-pick.ts

@@ -131,7 +131,7 @@ export class CherryPickGitCommand extends QuickCommand<State> {
 			}
 
 			if (context.destination == null) {
-				const branch = await state.repo.getBranch();
+				const branch = await state.repo.git.getBranch();
 				if (branch == null) break;
 
 				context.destination = branch;
@@ -179,7 +179,7 @@ export class CherryPickGitCommand extends QuickCommand<State> {
 					{ mode: 'contains' },
 				);
 				if (branches.length) {
-					const branch = await state.repo.getBranch(branches[0]);
+					const branch = await state.repo.git.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.getBranch();
+				const branch = await state.repo.git.getBranch();
 				state.reference = branch;
 			}
 

src/commands/git/merge.ts

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