Fixes #3548 changes branch icon if in a worktree

Author: eamodio

CHANGELOG.md

@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Fixed
 
+- Fixes [#3548](https://github.com/gitkraken/vscode-gitlens/issues/3548) - Change the current branch icon on the Commit Graph to a worktree icon if its on a worktree
 - Fixes [#3592](https://github.com/gitkraken/vscode-gitlens/issues/3592) - Connecting to an integration via Remotes view (but likely others) doesn't work
 - Fixes [#3571](https://github.com/gitkraken/vscode-gitlens/issues/3571) - Gitlens fails to register buttons on top-right corner — thanks to [PR #3605](https://github.com/gitkraken/vscode-gitlens/pull/3605) by Jean Pierre ([@jeanp413](https://github.com/jeanp413))
 - Fixes an issue where virtual repositories for GitHub PRs from forks wouldn't load properly

src/plus/webviews/graph/graphWebview.ts

@@ -2361,6 +2361,9 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 		if (branch != null) {
 			branchState = { ...branch.state };
 
+			const worktreesByBranch = data?.worktreesByBranch ?? (await getWorktreesByBranch(this.repository));
+			branchState.worktree = worktreesByBranch?.has(branch.id) ?? false;
+
 			if (branch.upstream != null) {
 				branchState.upstream = branch.upstream.name;
 

src/plus/webviews/graph/protocol.ts

@@ -137,6 +137,7 @@ export interface BranchState extends GitTrackingState {
 		url?: string;
 	};
 	pr?: PullRequestShape;
+	worktree?: boolean;
 }
 
 export type GraphWorkingTreeStats = WorkDirStats;

src/views/nodes/branchNode.ts

@@ -422,16 +422,23 @@ export class BranchNode
 		const worktree = this.worktree;
 		const status = this.branch.status;
 
+		const suffixes = [];
+		if (this.current) {
+			if (this.branch.rebasing) {
+				suffixes.push('rebasing');
+			}
+			suffixes.push('current branch');
+		}
+		if (worktree) {
+			if (worktree.opened && !this.current) {
+				suffixes.push('in an opened worktree');
+			} else {
+				suffixes.push('in a worktree');
+			}
+		}
+
 		let tooltip: string | MarkdownString = `$(git-branch) \`${this.branch.getNameWithoutRemote()}\`${
-			this.current
-				? this.branch.rebasing
-					? ' \u00a0(_current, rebasing_)'
-					: ' \u00a0(_current_)'
-				: worktree?.opened
-				  ? ' \u00a0(_worktree, opened_)'
-				  : worktree
-				    ? ' \u00a0(_worktree_)'
-				    : ''
+			suffixes.length ? ` \u00a0(_${suffixes.join(', ')}_)` : ''
 		}`;
 
 		let contextValue: string = ContextValues.Branch;

src/webviews/apps/plus/graph/GraphWrapper.tsx

@@ -1236,7 +1236,14 @@ export function GraphWrapper({
 										aria-label="Switch to Another Branch..."
 									>
 										{!branchState?.pr ? (
-											<span className="codicon codicon-git-branch" aria-hidden="true"></span>
+											branchState?.worktree ? (
+												<span
+													className="glicon glicon-repositories-view"
+													aria-hidden="true"
+												></span>
+											) : (
+												<span className="codicon codicon-git-branch" aria-hidden="true"></span>
+											)
 										) : (
 											''
 										)}
@@ -1252,6 +1259,7 @@ export function GraphWrapper({
 											<hr />
 											<span className="codicon codicon-git-branch" aria-hidden="true"></span>{' '}
 											<span className="md-code">{branchName}</span>
+											{branchState?.worktree ? <i> (in a worktree)</i> : ''}
 										</span>
 									</div>
 								</GlPopover>