Fixes #4078 deadlock on paused operation detection

eamodio · eamodio · commit 73e07c27500d · 2025-03-13T01:51:32.000-04:00
- Adds operation priority ordering for proper detection
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,7 +25,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Fixed
 
-- Fixes [#3218](https://github.com/gitkraken/vscode-gitlens/issues/3218) - Bitbucket Server remote - "scm/" path prefix not removed (regression)
+- Fixes GitLens gets stuck after rebase ([#4078](https://github.com/gitkraken/vscode-gitlens/issues/4078))
+- Fixes Bitbucket Server remote - "scm/" path prefix not removed (regression) ([#3218](https://github.com/gitkraken/vscode-gitlens/issues/3218))
 - Fixes avoid eagerly getting "full" commit details for inline blame ([#4115])(https://github.com/gitkraken/vscode-gitlens/issues/4115))
 - Fixes large commit messages work poorly on Commit Graph ([#4100](https://github.com/gitkraken/vscode-gitlens/issues/4100))
 - Fixes _Show \* View_ commands fail intermittently ([#4127](https://github.com/gitkraken/vscode-gitlens/issues/4127))
diff --git a/src/env/node/git/sub-providers/branches.ts b/src/env/node/git/sub-providers/branches.ts
@@ -18,15 +18,17 @@ import { getReferenceFromBranch } from '../../../../git/utils/-webview/reference
 import type { BranchSortOptions } from '../../../../git/utils/-webview/sorting';
 import { sortBranches, sortContributors } from '../../../../git/utils/-webview/sorting';
 import {
+	formatDetachedHeadName,
+	getBranchId,
 	getLocalBranchByUpstream,
 	isDetachedHead,
 	isRemoteHEAD,
 	parseUpstream,
 } from '../../../../git/utils/branch.utils';
+import { createReference } from '../../../../git/utils/reference.utils';
 import { createRevisionRange } from '../../../../git/utils/revision.utils';
 import { configuration } from '../../../../system/-webview/configuration';
 import { filterMap } from '../../../../system/array';
-import { gate } from '../../../../system/decorators/-webview/gate';
 import { log } from '../../../../system/decorators/log';
 import { Logger } from '../../../../system/logger';
 import { getLogScope } from '../../../../system/logger.scope';
@@ -49,7 +51,6 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 		private readonly provider: LocalGitProvider,
 	) {}
 
-	@gate()
 	@log()
 	async getBranch(repoPath: string, name?: string): Promise<GitBranch | undefined> {
 		if (name != null) {
@@ -76,15 +77,13 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 	}
 
 	private async getCurrentBranch(repoPath: string): Promise<GitBranch | undefined> {
-		const commitOrdering = configuration.get('advanced.commitOrdering');
+		const ref = await this.getCurrentBranchReferenceCore(repoPath);
+		if (ref == null) return undefined;
 
-		const data = await this.git.rev_parse__currentBranch(repoPath, commitOrdering);
-		if (data == null) return undefined;
-
-		const [name, upstream] = data[0].split('\n');
+		const commitOrdering = configuration.get('advanced.commitOrdering');
 
 		const [pausedOpStatusResult, committerDateResult, defaultWorktreePathResult] = await Promise.allSettled([
-			isDetachedHead(name) ? this.provider.status?.getPausedOperationStatus(repoPath) : undefined,
+			isDetachedHead(ref.name) ? this.provider.status?.getPausedOperationStatus(repoPath) : undefined,
 			this.git
 				.exec(
 					{ cwd: repoPath, configs: gitLogDefaultConfigs, errors: GitErrorHandling.Ignore },
@@ -106,11 +105,11 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 		return new GitBranch(
 			this.container,
 			repoPath,
-			rebaseStatus?.incoming.name ?? `refs/heads/${name}`,
+			rebaseStatus?.incoming.name ?? `refs/heads/${ref.name}`,
 			true,
 			committerDate != null ? new Date(Number(committerDate) * 1000) : undefined,
-			data[1],
-			upstream ? { name: upstream, missing: false, state: { ahead: 0, behind: 0 } } : undefined,
+			ref.sha,
+			ref.upstream ? { ...ref.upstream, state: { ahead: 0, behind: 0 } } : undefined,
 			{ path: repoPath, isDefault: repoPath === defaultWorktreePath },
 			undefined,
 			rebaseStatus != null,
@@ -338,6 +337,40 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 		return filterMap(data.split('\n'), b => b.trim() || undefined);
 	}
 
+	@log()
+	async getCurrentBranchReference(repoPath: string): Promise<GitBranchReference | undefined> {
+		let ref = await this.getCurrentBranchReferenceCore(repoPath);
+		if (ref != null && isDetachedHead(ref.name)) {
+			ref = createReference(ref.sha!, repoPath, {
+				refType: 'branch',
+				name: formatDetachedHeadName(ref.sha!),
+				id: getBranchId(repoPath, ref.remote, ref.sha!),
+				remote: ref.remote,
+				upstream: ref.upstream,
+				sha: ref.sha,
+			});
+		}
+		return ref;
+	}
+
+	private async getCurrentBranchReferenceCore(repoPath: string): Promise<GitBranchReference | undefined> {
+		const commitOrdering = configuration.get('advanced.commitOrdering');
+
+		const data = await this.git.rev_parse__currentBranch(repoPath, commitOrdering);
+		if (data == null) return undefined;
+
+		const [name, upstream] = data[0].split('\n');
+
+		return createReference(name, repoPath, {
+			refType: 'branch',
+			name: name,
+			id: getBranchId(repoPath, false, name),
+			remote: false,
+			upstream: upstream ? { name: upstream, missing: false } : undefined,
+			sha: data[1],
+		});
+	}
+
 	@log({ exit: true })
 	async getDefaultBranchName(repoPath: string | undefined, remote?: string): Promise<string | undefined> {
 		if (repoPath == null) return undefined;
diff --git a/src/env/node/git/sub-providers/status.ts b/src/env/node/git/sub-providers/status.ts
@@ -21,7 +21,6 @@ import type { GitBranchReference, GitTagReference } from '../../../../git/models
 import { GitStatus } from '../../../../git/models/status';
 import type { GitStatusFile } from '../../../../git/models/statusFile';
 import { parseGitStatus } from '../../../../git/parsers/statusParser';
-import { getReferenceFromBranch } from '../../../../git/utils/-webview/reference.utils';
 import { createReference } from '../../../../git/utils/reference.utils';
 import { configuration } from '../../../../system/-webview/configuration';
 import { splitPath } from '../../../../system/-webview/path';
@@ -33,6 +32,10 @@ import type { Git } from '../git';
 import { GitErrors } from '../git';
 import type { LocalGitProvider } from '../localGitProvider';
 
+type Operation = 'cherry-pick' | 'merge' | 'rebase-apply' | 'rebase-merge' | 'revert';
+
+const orderedOperations: Operation[] = ['rebase-apply', 'rebase-merge', 'merge', 'cherry-pick', 'revert'];
+
 export class StatusGitSubProvider implements GitStatusSubProvider {
 	constructor(
 		private readonly container: Container,
@@ -49,16 +52,16 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 			async function getCore(this: StatusGitSubProvider): Promise<GitPausedOperationStatus | undefined> {
 				const gitDir = await this.provider.config.getGitDir(repoPath);
 
-				type Operation = 'cherry-pick' | 'merge' | 'rebase-apply' | 'rebase-merge' | 'revert';
-				const operation = await new Promise<Operation | undefined>((resolve, _) => {
+				const operations = await new Promise<Set<Operation>>((resolve, _) => {
 					readdir(gitDir.uri.fsPath, { withFileTypes: true }, (err, entries) => {
+						const operations = new Set<Operation>();
 						if (err != null) {
-							resolve(undefined);
+							resolve(operations);
 							return;
 						}
 
 						if (entries.length === 0) {
-							resolve(undefined);
+							resolve(operations);
 							return;
 						}
 
@@ -67,32 +70,36 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 							if (entry.isFile()) {
 								switch (entry.name) {
 									case 'CHERRY_PICK_HEAD':
-										resolve('cherry-pick');
-										return;
+										operations.add('cherry-pick');
+										break;
 									case 'MERGE_HEAD':
-										resolve('merge');
-										return;
+										operations.add('merge');
+										break;
 									case 'REVERT_HEAD':
-										resolve('revert');
-										return;
+										operations.add('revert');
+										break;
 								}
 							} else if (entry.isDirectory()) {
 								switch (entry.name) {
 									case 'rebase-apply':
-										resolve('rebase-apply');
-										return;
+										operations.add('rebase-apply');
+										break;
 									case 'rebase-merge':
-										resolve('rebase-merge');
-										return;
+										operations.add('rebase-merge');
+										break;
 								}
 							}
 						}
 
-						resolve(undefined);
+						resolve(operations);
 					});
 				});
 
-				if (operation == null) return undefined;
+				if (!operations.size) return undefined;
+
+				const operation = [...operations].sort(
+					(a, b) => orderedOperations.indexOf(a) - orderedOperations.indexOf(b),
+				)[0];
 
 				switch (operation) {
 					case 'cherry-pick': {
@@ -107,14 +114,14 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 						)?.trim();
 						if (!cherryPickHead) return undefined;
 
-						const branch = (await this.provider.branches.getBranch(repoPath))!;
+						const current = (await this.provider.branches.getCurrentBranchReference(repoPath))!;
 
 						return {
 							type: 'cherry-pick',
 							repoPath: repoPath,
 							// TODO: Validate that these are correct
 							HEAD: createReference(cherryPickHead, repoPath, { refType: 'revision' }),
-							current: getReferenceFromBranch(branch),
+							current: current,
 							incoming: createReference(cherryPickHead, repoPath, { refType: 'revision' }),
 						} satisfies GitCherryPickStatus;
 					}
@@ -131,15 +138,15 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 						if (!mergeHead) return undefined;
 
 						const [branchResult, mergeBaseResult, possibleSourceBranchesResult] = await Promise.allSettled([
-							this.provider.branches.getBranch(repoPath),
+							this.provider.branches.getCurrentBranchReference(repoPath),
 							this.provider.refs.getMergeBase(repoPath, 'MERGE_HEAD', 'HEAD'),
 							this.provider.branches.getBranchesWithCommits(repoPath, ['MERGE_HEAD'], undefined, {
 								all: true,
 								mode: 'pointsAt',
 							}),
 						]);
 
-						const branch = getSettledValue(branchResult)!;
+						const current = getSettledValue(branchResult)!;
 						const mergeBase = getSettledValue(mergeBaseResult);
 						const possibleSourceBranches = getSettledValue(possibleSourceBranchesResult);
 
@@ -148,7 +155,7 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 							repoPath: repoPath,
 							mergeBase: mergeBase,
 							HEAD: createReference(mergeHead, repoPath, { refType: 'revision' }),
-							current: getReferenceFromBranch(branch),
+							current: current,
 							incoming:
 								possibleSourceBranches?.length === 1
 									? createReference(possibleSourceBranches[0], repoPath, {
@@ -171,13 +178,13 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 						)?.trim();
 						if (!revertHead) return undefined;
 
-						const branch = (await this.provider.branches.getBranch(repoPath))!;
+						const current = (await this.provider.branches.getCurrentBranchReference(repoPath))!;
 
 						return {
 							type: 'revert',
 							repoPath: repoPath,
 							HEAD: createReference(revertHead, repoPath, { refType: 'revision' }),
-							current: getReferenceFromBranch(branch),
+							current: current,
 							incoming: createReference(revertHead, repoPath, { refType: 'revision' }),
 						} satisfies GitRevertStatus;
 					}
diff --git a/src/git/gitProvider.ts b/src/git/gitProvider.ts
@@ -232,6 +232,8 @@ export interface GitBranchesSubProvider {
 		branch: GitBranchReference,
 		into: GitBranchReference,
 	): Promise<GitBranchMergedStatus>;
+	/** @internal not intended to be used outside of the sub-providers */
+	getCurrentBranchReference?(repoPath: string): Promise<GitBranchReference | undefined>;
 	getLocalBranchByUpstream?(repoPath: string, remoteBranchName: string): Promise<GitBranch | undefined>;
 	getPotentialMergeOrRebaseConflict?(
 		repoPath: string,
diff --git a/src/git/models/branch.ts b/src/git/models/branch.ts
@@ -54,11 +54,12 @@ export class GitBranch implements GitBranchReference {
 	) {
 		({ name: this._name, remote: this._remote } = parseRefName(refName));
 
-		this.id = getBranchId(repoPath, this._remote, this._name);
-
 		this.detached = detached || (this.current ? isDetachedHead(this._name) : false);
 		if (this.detached) {
+			this.id = getBranchId(repoPath, this._remote, this.sha!);
 			this._name = formatDetachedHeadName(this.sha!);
+		} else {
+			this.id = getBranchId(repoPath, this._remote, this._name);
 		}
 
 		this.upstream = upstream?.name ? upstream : undefined;
diff --git a/src/git/utils/-webview/reference.utils.ts b/src/git/utils/-webview/reference.utils.ts
@@ -11,6 +11,7 @@ export function getReferenceFromBranch(branch: GitBranch): GitBranchReference {
 		name: branch.name,
 		remote: branch.remote,
 		upstream: branch.upstream,
+		sha: branch.sha,
 	});
 }
 
@@ -39,5 +40,6 @@ export function getReferenceFromTag(tag: GitTag): GitTagReference {
 		id: tag.id,
 		refType: tag.refType,
 		name: tag.name,
+		sha: tag.sha,
 	});
 }
diff --git a/src/git/utils/reference.utils.ts b/src/git/utils/reference.utils.ts
diff --git a/src/system/decorators/-webview/gate.ts b/src/system/decorators/-webview/gate.ts

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ export function getReferenceFromBranch(branch: GitBranch): GitBranchReference {`
`11`	`11`	`name: branch.name,`
`12`	`12`	`remote: branch.remote,`
`13`	`13`	`upstream: branch.upstream,`
	`14`	`+ sha: branch.sha,`
`14`	`15`	`});`
`15`	`16`	`}`
`16`	`17`
`@@ -39,5 +40,6 @@ export function getReferenceFromTag(tag: GitTag): GitTagReference {`
`39`	`40`	`id: tag.id,`
`40`	`41`	`refType: tag.refType,`
`41`	`42`	`name: tag.name,`
	`43`	`+ sha: tag.sha,`
`42`	`44`	`});`
`43`	`45`	`}`