Refactors Git provider into sub-providers

 - Config operations
 - Diff operations
 - Ref operations

Author: eamodio

src/ai/aiProviderService.ts

@@ -559,9 +559,10 @@ export class AIProviderService implements Disposable {
 		} else if (Array.isArray(changesOrRepo)) {
 			changes = changesOrRepo.join('\n');
 		} else {
-			let diff = await this.container.git.getDiff(changesOrRepo.uri, uncommittedStaged);
+			const diffProvider = this.container.git.diff(changesOrRepo.uri);
+			let diff = await diffProvider.getDiff?.(uncommittedStaged);
 			if (!diff?.contents) {
-				diff = await this.container.git.getDiff(changesOrRepo.uri, uncommitted);
+				diff = await diffProvider.getDiff?.(uncommitted);
 				if (!diff?.contents) throw new Error('No changes to generate a commit message from.');
 			}
 			if (options?.cancellation?.isCancellationRequested) return undefined;
@@ -577,7 +578,7 @@ export class AIProviderService implements Disposable {
 		sourceContext: { source: Sources; type: TelemetryEvents['ai/explain']['changeType'] },
 		options?: { cancellation?: CancellationToken; progress?: ProgressOptions },
 	): Promise<AIResult | undefined> {
-		const diff = await this.container.git.getDiff(commitOrRevision.repoPath, commitOrRevision.ref);
+		const diff = await this.container.git.diff(commitOrRevision.repoPath).getDiff?.(commitOrRevision.ref);
 		if (!diff?.contents) throw new Error('No changes found to explain.');
 
 		const { confirmed, model } = await getModelAndConfirmAIProviderToS('diff', this, this.container.storage);

src/annotations/gutterChangesAnnotationProvider.ts

@@ -131,7 +131,7 @@ export class GutterChangesAnnotationProvider extends AnnotationProviderBase<Chan
 					.getStatusForFile?.(this.trackedDocument.uri);
 				const commits = status?.getPseudoCommits(
 					this.container,
-					await this.container.git.getCurrentUser(this.trackedDocument.uri.repoPath!),
+					await this.container.git.config(this.trackedDocument.uri.repoPath!).getCurrentUser(),
 				);
 				if (commits?.length) {
 					commit = await commitsProvider.getCommitForFile(this.trackedDocument.uri);

src/commands/browseRepoAtRevision.ts

@@ -60,7 +60,7 @@ export class BrowseRepoAtRevisionCommand extends ActiveEditorCommand {
 			if (gitUri.sha == null) return;
 
 			const sha = args?.before
-				? await this.container.git.resolveReference(gitUri.repoPath!, `${gitUri.sha}^`)
+				? await this.container.git.refs(gitUri.repoPath!).resolveReference(`${gitUri.sha}^`)
 				: gitUri.sha;
 			uri = this.container.git.getRevisionUri(sha, gitUri.repoPath!, gitUri.repoPath!);
 			gitUri = GitUri.fromRevisionUri(uri);

src/commands/diffLineWithPrevious.ts

@@ -44,12 +44,9 @@ export class DiffLineWithPreviousCommand extends ActiveEditorCommand {
 		const gitUri = args.commit?.getGitUri() ?? (await GitUri.fromUri(uri));
 
 		try {
-			const diffUris = await this.container.git.getPreviousComparisonUrisForLine(
-				gitUri.repoPath!,
-				gitUri,
-				args.line,
-				gitUri.sha,
-			);
+			const diffUris = await this.container.git
+				.diff(gitUri.repoPath!)
+				.getPreviousComparisonUrisForLine(gitUri, args.line, gitUri.sha);
 
 			if (diffUris?.previous == null) {
 				void showCommitHasNoPreviousCommitWarningMessage();

src/commands/diffWith.ts

@@ -99,11 +99,11 @@ export class DiffWithCommand extends GlCommandBase {
 			let rhsSha = args.rhs.sha;
 
 			[args.lhs.sha, args.rhs.sha] = await Promise.all([
-				await this.container.git.resolveReference(args.repoPath, args.lhs.sha, args.lhs.uri, {
+				await this.container.git.refs(args.repoPath).resolveReference(args.lhs.sha, args.lhs.uri, {
 					// If the ref looks like a sha, don't wait too long, since it should work
 					timeout: isShaLike(args.lhs.sha) ? 100 : undefined,
 				}),
-				await this.container.git.resolveReference(args.repoPath, args.rhs.sha, args.rhs.uri, {
+				await this.container.git.refs(args.repoPath).resolveReference(args.rhs.sha, args.rhs.uri, {
 					// If the ref looks like a sha, don't wait too long, since it should work
 					timeout: isShaLike(args.rhs.sha) ? 100 : undefined,
 				}),

src/commands/diffWithNext.ts

@@ -45,8 +45,7 @@ export class DiffWithNextCommand extends ActiveEditorCommand {
 
 		const gitUri = args.commit?.getGitUri() ?? (await GitUri.fromUri(uri));
 		try {
-			const diffUris = await this.container.git.getNextComparisonUris(
-				gitUri.repoPath!,
+			const diffUris = await this.container.git.diff(gitUri.repoPath!).getNextComparisonUris(
 				gitUri,
 				gitUri.sha,
 				// If we are in the left-side of the diff editor, we need to skip forward 1 more revision

src/commands/diffWithPrevious.ts

@@ -85,8 +85,7 @@ export class DiffWithPreviousCommand extends ActiveEditorCommand {
 		// }
 
 		try {
-			const diffUris = await this.container.git.getPreviousComparisonUris(
-				gitUri.repoPath!,
+			const diffUris = await this.container.git.diff(gitUri.repoPath!).getPreviousComparisonUris(
 				gitUri,
 				gitUri.sha,
 				// If we are in the right-side of the diff editor, we need to skip back 1 more revision

src/commands/diffWithRevisionFrom.ts

@@ -85,7 +85,9 @@ export class DiffWithRevisionFromCommand extends ActiveEditorCommand {
 		let renamedTitle: string | undefined;
 
 		// Check to see if this file has been renamed
-		const files = await this.container.git.getDiffStatus(gitUri.repoPath, 'HEAD', ref, { filters: ['R', 'C'] });
+		const files = await this.container.git
+			.diff(gitUri.repoPath)
+			.getDiffStatus('HEAD', ref, { filters: ['R', 'C'] });
 		if (files != null) {
 			const rename = files.find(s => s.path === path);
 			if (rename?.originalPath != null) {

src/commands/diffWithWorking.ts

@@ -45,11 +45,9 @@ export class DiffWithWorkingCommand extends ActiveEditorCommand {
 
 		if (args.inDiffRightEditor) {
 			try {
-				const diffUris = await this.container.git.getPreviousComparisonUris(
-					gitUri.repoPath!,
-					gitUri,
-					gitUri.sha,
-				);
+				const diffUris = await this.container.git
+					.diff(gitUri.repoPath!)
+					.getPreviousComparisonUris(gitUri, gitUri.sha);
 				gitUri = diffUris?.previous ?? gitUri;
 			} catch (ex) {
 				Logger.error(

src/commands/externalDiff.ts

@@ -151,7 +151,8 @@ export class ExternalDiffCommand extends GlCommandBase {
 			}
 
 			const tool =
-				configuration.get('advanced.externalDiffTool') || (await this.container.git.getDiffTool(repoPath));
+				configuration.get('advanced.externalDiffTool') ||
+				(await this.container.git.diff(repoPath).getDiffTool?.());
 			if (!tool) {
 				const viewDocs = 'View Git Docs';
 				const result = await window.showWarningMessage(
@@ -168,7 +169,7 @@ export class ExternalDiffCommand extends GlCommandBase {
 			}
 
 			for (const file of args.files) {
-				void this.container.git.openDiffTool(repoPath, file.uri, {
+				void this.container.git.diff(repoPath).openDiffTool?.(file.uri, {
 					ref1: file.ref1,
 					ref2: file.ref2,
 					staged: file.staged,