Moves merge conflict check into branch provider

Author: eamodio

src/commands/git/merge.ts

@@ -290,11 +290,9 @@ export class MergeGitCommand extends QuickCommand<State> {
 		let potentialConflict;
 		const subscription = await this.container.subscription.getSubscription();
 		if (isSubscriptionStatePaidOrTrial(subscription?.state)) {
-			potentialConflict = this.container.git.getPotentialMergeOrRebaseConflict(
-				state.repo.path,
-				context.destination.name,
-				state.reference.ref,
-			);
+			potentialConflict = state.repo.git
+				.branches()
+				.getPotentialMergeOrRebaseConflict?.(context.destination.name, state.reference.ref);
 		}
 
 		let step: QuickPickStep<DirectiveQuickPickItem | FlagsQuickPickItem<Flags>>;

src/commands/git/rebase.ts

@@ -282,11 +282,9 @@ export class RebaseGitCommand extends QuickCommand<State> {
 		let potentialConflict;
 		const subscription = await this.container.subscription.getSubscription();
 		if (isSubscriptionStatePaidOrTrial(subscription?.state)) {
-			potentialConflict = this.container.git.getPotentialMergeOrRebaseConflict(
-				state.repo.path,
-				context.branch.name,
-				state.destination.ref,
-			);
+			potentialConflict = state.repo.git
+				.branches()
+				.getPotentialMergeOrRebaseConflict?.(context.branch.name, state.destination.ref);
 		}
 
 		let step: QuickPickStep<DirectiveQuickPickItem | FlagsQuickPickItem<Flags>>;

src/env/node/git/localGitProvider.ts

@@ -78,7 +78,6 @@ import type {
 	GitGraphRowTag,
 } from '../../../git/models/graph';
 import type { GitLog } from '../../../git/models/log';
-import type { MergeConflict } from '../../../git/models/mergeConflict';
 import type { GitBranchReference, GitReference } from '../../../git/models/reference';
 import { createReference, isBranchReference } from '../../../git/models/reference.utils';
 import type { GitReflog } from '../../../git/models/reflog';
@@ -128,7 +127,6 @@ import {
 	parseGitLogSimpleFormat,
 	parseGitLogSimpleRenamed,
 } from '../../../git/parsers/logParser';
-import { parseMergeTreeConflict } from '../../../git/parsers/mergeTreeParser';
 import { parseGitRefLog, parseGitRefLogDefaultFormat } from '../../../git/parsers/reflogParser';
 import { parseGitLsFiles, parseGitTree } from '../../../git/parsers/treeParser';
 import type { GitSearch, GitSearchResultData, GitSearchResults } from '../../../git/search';
@@ -4971,43 +4969,6 @@ export class LocalGitProvider implements GitProvider, Disposable {
 			return undefined;
 		}
 	}
-
-	@log()
-	async getPotentialMergeOrRebaseConflict(
-		repoPath: string,
-		branch: string,
-		targetBranch: string,
-	): Promise<MergeConflict | undefined> {
-		const scope = getLogScope();
-
-		try {
-			// If we have don't have Git v2.33+, just return
-			if (!(await this.git.isAtLeastVersion('2.33'))) {
-				return undefined;
-			}
-
-			let data;
-			try {
-				data = await this.git.merge_tree(repoPath, branch, targetBranch, '-z', '--name-only', '--no-messages');
-			} catch (ex) {
-				Logger.error(ex, scope);
-			}
-			if (!data) return undefined;
-
-			const mergeConflict = parseMergeTreeConflict(data);
-			if (!mergeConflict.conflicts.length) return undefined;
-
-			return {
-				repoPath: repoPath,
-				branch: branch,
-				target: targetBranch,
-				files: mergeConflict.conflicts,
-			};
-		} catch (ex) {
-			Logger.error(ex, scope);
-			throw ex;
-		}
-	}
 }
 
 async function getEncoding(uri: Uri): Promise<string> {

src/env/node/git/operations/branches.ts

@@ -9,8 +9,10 @@ import type {
 } from '../../../../git/gitProvider';
 import { GitBranch } from '../../../../git/models/branch';
 import { isDetachedHead } from '../../../../git/models/branch.utils';
+import type { MergeConflict } from '../../../../git/models/mergeConflict';
 import { createRevisionRange } from '../../../../git/models/revision.utils';
 import { parseGitBranches } from '../../../../git/parsers/branchParser';
+import { parseMergeTreeConflict } from '../../../../git/parsers/mergeTreeParser';
 import type { BranchSortOptions } from '../../../../git/utils/vscode/sorting';
 import { sortBranches, sortContributors } from '../../../../git/utils/vscode/sorting';
 import { filterMap } from '../../../../system/array';
@@ -306,6 +308,43 @@ export class BranchesGitProvider implements GitProviderBranches {
 		await this.git.branch(repoPath, name, ref);
 	}
 
+	@log()
+	async getPotentialMergeOrRebaseConflict(
+		repoPath: string,
+		branch: string,
+		targetBranch: string,
+	): Promise<MergeConflict | undefined> {
+		const scope = getLogScope();
+
+		try {
+			// If we have don't have Git v2.33+, just return
+			if (!(await this.git.isAtLeastVersion('2.33'))) {
+				return undefined;
+			}
+
+			let data;
+			try {
+				data = await this.git.merge_tree(repoPath, branch, targetBranch, '-z', '--name-only', '--no-messages');
+			} catch (ex) {
+				Logger.error(ex, scope);
+			}
+			if (!data) return undefined;
+
+			const mergeConflict = parseMergeTreeConflict(data);
+			if (!mergeConflict.conflicts.length) return undefined;
+
+			return {
+				repoPath: repoPath,
+				branch: branch,
+				target: targetBranch,
+				files: mergeConflict.conflicts,
+			};
+		} catch (ex) {
+			Logger.error(ex, scope);
+			throw ex;
+		}
+	}
+
 	@log({ exit: true })
 	async getBaseBranchName(repoPath: string, ref: string): Promise<string | undefined> {
 		try {

src/git/gitProvider.ts

@@ -309,11 +309,6 @@ export interface GitProviderRepository {
 			skip?: number | undefined;
 		},
 	): Promise<GitReflog | undefined>;
-	getPotentialMergeOrRebaseConflict?(
-		repoPath: string,
-		branch: string,
-		targetBranch: string,
-	): Promise<MergeConflict | undefined>;
 	getRevisionContent(repoPath: string, path: string, ref: string): Promise<Uint8Array | undefined>;
 	getTreeEntryForRevision(repoPath: string, path: string, ref: string): Promise<GitTreeEntry | undefined>;
 	getTreeForRevision(repoPath: string, ref: string): Promise<GitTreeEntry[]>;
@@ -415,6 +410,11 @@ export interface GitProviderBranches {
 	): Promise<string | undefined>;
 
 	createBranch?(repoPath: string, name: string, ref: string): Promise<void>;
+	getPotentialMergeOrRebaseConflict?(
+		repoPath: string,
+		branch: string,
+		targetBranch: string,
+	): Promise<MergeConflict | undefined>;
 	getBaseBranchName?(repoPath: string, ref: string): Promise<string | undefined>;
 	setBaseBranchName?(repoPath: string, ref: string, base: string): Promise<void>;
 	getTargetBranchName?(repoPath: string, ref: string): Promise<string | undefined>;

src/git/gitProviderService.ts

@@ -74,7 +74,6 @@ import type { GitDiff, GitDiffFile, GitDiffFiles, GitDiffFilter, GitDiffLine, Gi
 import type { GitFile, GitFileChange } from './models/file';
 import type { GitGraph } from './models/graph';
 import type { GitLog } from './models/log';
-import type { MergeConflict } from './models/mergeConflict';
 import type { GitBranchReference, GitReference } from './models/reference';
 import type { GitReflog } from './models/reflog';
 import type { GitRemote } from './models/remote';
@@ -2018,16 +2017,6 @@ export class GitProviderService implements Disposable {
 		return provider.getIncomingActivity(path, options);
 	}
 
-	@log()
-	async getPotentialMergeOrRebaseConflict(
-		repoPath: string | Uri,
-		branch: string,
-		targetBranch: string,
-	): Promise<MergeConflict | undefined> {
-		const { provider, path } = this.getProvider(repoPath);
-		return provider.getPotentialMergeOrRebaseConflict?.(path, branch, targetBranch);
-	}
-
 	getBestRepository(): Repository | undefined;
 	// eslint-disable-next-line @typescript-eslint/unified-signatures
 	getBestRepository(uri?: Uri, editor?: TextEditor): Repository | undefined;

src/webviews/home/homeWebview.ts

@@ -1399,7 +1399,7 @@ async function getBranchMergeTargetStatusInfo(
 		container.git.getLeftRightCommitCount(branch.repoPath, createRevisionRange(target, branch.ref, '...'), {
 			excludeMerges: true,
 		}),
-		container.git.getPotentialMergeOrRebaseConflict(branch.repoPath, branch.name, target),
+		container.git.branches(branch.repoPath).getPotentialMergeOrRebaseConflict?.(branch.name, target),
 	]);
 
 	const counts = getSettledValue(countsResult);