@gitkraken/core-gitlens 0.15.0 → 0.15.1

package/dist/git-cli/providers/graph.js

@@ -4,7 +4,7 @@ import { getScopedLogger } from "../../utils/logger.scoped.js";
 import { getSettledValue } from "../../utils/promise.js";
 import { debug } from "../../utils/decorators/log.js";
 import { createDisposable } from "../../utils/disposable.js";
-import { getBranchId, getBranchNameWithoutRemote, getRemoteNameFromBranchName } from "../../utils/gitRefs.js";
+import { getBranchId, getBranchNameWithoutRemote } from "../../utils/gitRefs.js";
 import { isUncommitted } from "../../git/utils/revision.utils.js";
 import { splitRemoteBranchName } from "../../git/utils/branch.utils.js";
 import __decorate from "../../_virtual/@oxc-project+runtime/helpers/esm/decorate.js";
@@ -44,15 +44,15 @@ function isMoveableGraphRef(refname) {
 * CREATES stay fast) — keeping the high-frequency events (commits, branch/tag creates, fetches,
 * checkouts) on the fast path. Sorted so map/list iteration order can't produce spurious mismatches.
 */
-function computeDecorationFingerprint(repoPath, defaultBranchName, defaultLocalName, headRefUpstreamName, branches, remotes, worktrees, currentUser) {
-	const localShadowsDefault = defaultLocalName != null && (branches?.some((b) => b.name === defaultLocalName) ?? false);
+function computeDecorationFingerprint(repoPath, defaultBranchName, defaultLocalName, headRefUpstreamName, headRefUpstreamLocal, branches, remotes, worktrees, currentUser) {
+	const localShadowsDefault = defaultLocalName != null && (branches?.some((b) => !b.remote && b.name === defaultLocalName) ?? false);
 	const parts = [
 		`d:${defaultBranchName ?? ""}|${localShadowsDefault ? "s" : ""}`,
-		`h:${headRefUpstreamName ?? ""}`,
+		`h:${headRefUpstreamLocal ? "l:" : ""}${headRefUpstreamName ?? ""}`,
 		`u:${currentUser?.name ?? ""}|${currentUser?.email ?? ""}`
 	];
 	if (branches != null) {
-		for (const b of branches) if (b.starred) parts.push(`s:${b.name}`);
+		for (const b of branches) if (b.starred) parts.push(`s:${b.remote ? "r:" : ""}${b.name}`);
 	}
 	if (remotes != null) for (const r of remotes) parts.push(`r:${r.name}|${r.url}|${r.provider?.gkProviderId ?? ""}`);
 	let defaultWorktreeBranch;
@@ -236,9 +236,20 @@ var GraphGitSubProvider = class {
 			shallowBoundaryPromise
 		]);
 		const branches = getSettledValue(branchesResult)?.values;
-		const branchMap = branches != null ? new Map(branches.map((r) => [r.name, r])) : /* @__PURE__ */ new Map();
+		const branchMap = /* @__PURE__ */ new Map();
+		const localBranchMap = /* @__PURE__ */ new Map();
+		const remoteBranchMap = /* @__PURE__ */ new Map();
+		if (branches != null) for (const b of branches) if (b.remote) {
+			remoteBranchMap.set(b.name, b);
+			if (!localBranchMap.has(b.name)) branchMap.set(b.name, b);
+		} else {
+			localBranchMap.set(b.name, b);
+			branchMap.set(b.name, b);
+		}
 		const headBranch = branches?.find((b) => b.current);
 		const headRefUpstreamName = headBranch?.upstream?.name;
+		const headRefUpstreamLocal = headBranch?.upstream?.local === true;
+		const headRemoteUpstreamName = headRefUpstreamLocal ? void 0 : headRefUpstreamName;
 		const [worktrees, worktreesByBranch] = getSettledValue(worktreesResult) ?? [[], /* @__PURE__ */ new Map()];
 		const remotes = getSettledValue(remotesResult);
 		const remoteMap = remotes != null ? new Map(remotes.map((r) => [r.name, r])) : /* @__PURE__ */ new Map();
@@ -255,7 +266,7 @@ var GraphGitSubProvider = class {
 			}
 		}
 		const currentUser = getSettledValue(currentUserResult);
-		const decorationFingerprint = computeDecorationFingerprint(repoPath, defaultBranchName, defaultLocalName, headRefUpstreamName, branches, remotes, worktrees, currentUser);
+		const decorationFingerprint = computeDecorationFingerprint(repoPath, defaultBranchName, defaultLocalName, headRefUpstreamName, headRefUpstreamLocal, branches, remotes, worktrees, currentUser);
 		const shas = getSettledValue(shaResult)?.stdout;
 		const selectSha = shas != null ? first(shaParser.parse(shas)) : void 0;
 		let refTips;
@@ -282,7 +293,7 @@ var GraphGitSubProvider = class {
 			if (!downstreams.includes(localName)) downstreams.push(localName);
 		};
 		const seedDownstreamMapFromBranches = () => {
-			for (const branch of branchMap.values()) if (!branch.remote && branch.upstream?.name != null) addDownstream(branch.upstream.name, branch.name);
+			for (const branch of localBranchMap.values()) if (branch.upstream?.name != null && !branch.upstream.local) addDownstream(branch.upstream.name, branch.name);
 		};
 		seedDownstreamMapFromBranches();
 		const gitStash = getSettledValue(stashResult);
@@ -332,7 +343,7 @@ var GraphGitSubProvider = class {
 			reachableFromHEAD,
 			rewriteableFromHEAD,
 			tipShasWithChildren,
-			reachableFromHeadUpstream: headRefUpstreamName != null ? reachableFromHeadUpstream : void 0,
+			reachableFromHeadUpstream: headRemoteUpstreamName != null ? reachableFromHeadUpstream : void 0,
 			avatars
 		} : void 0;
 		function buildRowFromCommit(commit) {
@@ -348,9 +359,8 @@ var GraphGitSubProvider = class {
 			let sawHead = false;
 			if (commit.tips) for (let tip of commit.tips.split(", ")) {
 				head = false;
-				if (tip === "refs/stash") continue;
 				if (tip.startsWith("tag: ")) {
-					const tagName = tip.substring(5);
+					const tagName = tip.substring(15);
 					refTags.push({
 						id: getTagId(repoPath, tagName),
 						name: tagName,
@@ -363,28 +373,36 @@ var GraphGitSubProvider = class {
 					sawHead = true;
 					if (tip !== "HEAD") tip = tip.substring(8);
 				}
-				const slashRemote = slashRemoteNames.length ? splitRemoteBranchName(tip, slashRemoteNames) : void 0;
-				const remoteName = slashRemote?.[0] ?? getRemoteNameFromBranchName(tip);
-				if (remoteName) {
-					const remote = remoteMap.get(remoteName);
+				let name;
+				let branch;
+				if (tip.startsWith("refs/heads/")) {
+					name = tip.substring(11);
+					branch = localBranchMap.get(name);
+				} else if (tip.startsWith("refs/remotes/")) {
+					name = tip.substring(13);
+					branch = remoteBranchMap.get(name);
+					const slashRemote = slashRemoteNames.length ? splitRemoteBranchName(name, slashRemoteNames) : void 0;
+					const slash = name.indexOf("/");
+					const remoteName = slashRemote?.[0] ?? (slash > 0 ? name.substring(0, slash) : void 0);
+					const remote = remoteName ? remoteMap.get(remoteName) : void 0;
 					if (remote != null) {
-						const branchName = slashRemote?.[1] ?? getBranchNameWithoutRemote(tip);
+						const branchName = slashRemote?.[1] ?? name.substring(slash + 1);
 						if (branchName === "HEAD") continue;
 						refRemoteHeads.push({
-							id: getBranchId(repoPath, true, tip),
+							id: getBranchId(repoPath, true, name),
 							name: branchName,
 							owner: remote.name,
 							url: remote.url,
-							current: tip === headRefUpstreamName,
-							isDefault: tip === defaultBranchName && !branchMap.has(defaultLocalName),
+							current: name === headRemoteUpstreamName,
+							isDefault: name === defaultBranchName && !localBranchMap.has(defaultLocalName),
 							hostingServiceType: remote.provider?.gkProviderId,
-							starred: branchMap.get(tip)?.starred || void 0
+							starred: branch?.starred || void 0
 						});
 						continue;
 					}
-				}
-				const branch = branchMap.get(tip);
-				const branchId = branch?.id ?? getBranchId(repoPath, false, tip);
+				} else if (tip === "HEAD") name = tip;
+				else continue;
+				const branchId = branch?.id ?? getBranchId(repoPath, false, name);
 				const worktree = worktreesByBranch?.get(branchId) ?? (branchId === branchIdOfMainWorktree ? mainWorktree : void 0);
 				const worktreeRef = worktree != null ? {
 					id: getWorktreeId(repoPath, worktree.name),
@@ -393,11 +411,11 @@ var GraphGitSubProvider = class {
 				} : void 0;
 				refHeads.push({
 					id: branchId,
-					name: tip,
+					name,
 					isCurrentHead: head,
 					upstream: branch?.upstream != null ? {
 						name: branch.upstream.name,
-						id: getBranchId(repoPath, true, branch.upstream.name),
+						id: getBranchId(repoPath, !branch.upstream.local, branch.upstream.name),
 						missing: branch.upstream.missing,
 						state: {
 							ahead: branch.upstream.state.ahead,
@@ -405,7 +423,7 @@ var GraphGitSubProvider = class {
 						}
 					} : void 0,
 					worktree: worktreeRef,
-					isDefault: defaultLocalName != null && tip === defaultLocalName,
+					isDefault: defaultLocalName != null && name === defaultLocalName,
 					starred: branch?.starred || void 0
 				});
 			}
@@ -512,7 +530,7 @@ var GraphGitSubProvider = class {
 			if (!isStash) {
 				for (const parent of parents) if (undoableTipShas.has(parent)) tipShasWithChildren.add(parent);
 			}
-			for (const h of refHeads) if (h.upstream?.name != null) addDownstream(h.upstream.name, h.name);
+			for (const h of refHeads) if (h.upstream?.name != null && localBranchMap.get(h.name)?.upstream?.local !== true) addDownstream(h.upstream.name, h.name);
 			return reachableRefs.get(sha);
 		}
 		const buildRowsStatsDeferred = (rows) => {
@@ -745,7 +763,7 @@ var GraphGitSubProvider = class {
 				fallback("stash-changed");
 				return;
 			}
-			const seedComparableFingerprint = rebindFromRepoPath != null ? computeDecorationFingerprint(rebindFromRepoPath, defaultBranchName, defaultLocalName, seed.headRefUpstreamName, branches, remotes, worktrees, currentUser) : decorationFingerprint;
+			const seedComparableFingerprint = rebindFromRepoPath != null ? computeDecorationFingerprint(rebindFromRepoPath, defaultBranchName, defaultLocalName, seed.headRefUpstreamName, seed.headRefUpstreamLocal === true, branches, remotes, worktrees, currentUser) : decorationFingerprint;
 			if (seed.decorationFingerprint !== seedComparableFingerprint) {
 				fallback("metadata-changed");
 				return;
@@ -762,9 +780,10 @@ var GraphGitSubProvider = class {
 			for (const r of seed.rows) {
 				if (r.heads == null) continue;
 				for (const h of r.heads) {
-					const currentBranch = branchMap.get(h.name);
+					const currentBranch = localBranchMap.get(h.name);
 					if (currentBranch == null) continue;
-					if (h.upstream?.name !== currentBranch.upstream?.name) {
+					const currentUpstream = currentBranch.upstream;
+					if (h.upstream?.id !== (currentUpstream != null ? getBranchId(rebindFromRepoPath ?? repoPath, !currentUpstream.local, currentUpstream.name) : void 0)) {
 						fallback("metadata-changed");
 						return;
 					}
@@ -831,7 +850,7 @@ var GraphGitSubProvider = class {
 				total++;
 				const fresh = freshShas.has(row.sha);
 				if (!fresh) options?.onMutationStart?.();
-				if (rebindFromRepoPath != null && !fresh && row.remotes != null) for (const remoteHead of row.remotes) remoteHead.current = `${remoteHead.owner}/${remoteHead.name}` === headRefUpstreamName;
+				if (rebindFromRepoPath != null && !fresh && row.remotes != null) for (const remoteHead of row.remotes) remoteHead.current = `${remoteHead.owner}/${remoteHead.name}` === headRemoteUpstreamName;
 				const refs = accumulateRowState(row.sha, row.parents, row.heads ?? [], row.remotes ?? [], row.tags ?? [], row.sha === currentHeadSha, row.kind === "stash");
 				if (fresh) {
 					row.reachability = refs?.size ? {
@@ -1303,6 +1322,7 @@ var GraphSession = class {
 		const shape = this.getWalkShape();
 		const buildShape = buildShapeKey(shape);
 		const prior = this._current;
+		const priorHead = find(prior.branches.values(), (b) => b.current);
 		const incrementalSeed = options?.rebuild !== true && prior.refTips != null && this._buildShape === buildShape ? {
 			rows: this._window,
 			tips: prior.refTips,
@@ -1313,7 +1333,8 @@ var GraphSession = class {
 			onlyFollowFirstParent: shape.onlyFollowFirstParent,
 			shallowBoundary: prior.shallowBoundary,
 			decorationFingerprint: prior.decorationFingerprint,
-			headRefUpstreamName: find(prior.branches.values(), (b) => b.current)?.upstream?.name
+			headRefUpstreamName: priorHead?.upstream?.name,
+			headRefUpstreamLocal: priorHead?.upstream?.local === true
 		} : void 0;
 		let outcome;
 		const graph = await this.provider.getGraph(this.repoPath, options?.rev, {