@gitkraken/core-gitlens 0.15.0 → 0.15.1

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

@@ -8,7 +8,7 @@ import { debug, trace } from "../../utils/decorators/log.js";
 import { getBranchId } from "../../utils/gitRefs.js";
 import { normalizePath } from "../../utils/path.js";
 import { createRevisionRange, shortenRevision } from "../../git/utils/revision.utils.js";
-import { formatDetachedHeadName, getLocalBranchByUpstream, isDetachedHead, isRemoteHEAD, parseBranchMetadataGkConfigKey, parseRefName, parseUpstream, setBranchMetadataValue } from "../../git/utils/branch.utils.js";
+import { formatDetachedHeadName, getLocalBranchByUpstream, isDetachedHead, isRemoteHEAD, parseBranchMetadataGkConfigKey, parseRefName, parseUpstream, setBranchMetadataValue, splitRemoteBranchName } from "../../git/utils/branch.utils.js";
 import { createReference } from "../../git/utils/reference.utils.js";
 import __decorate from "../../_virtual/@oxc-project+runtime/helpers/esm/decorate.js";
 import { BranchError, GitWarnings } from "../../git/errors.js";
@@ -153,11 +153,26 @@ var BranchesGitSubProvider = class {
 						level: "debug"
 					} }));
 					const branches = [];
+					let remoteNames;
+					const resolveUpstreamRemote = async (upstream) => {
+						if (!upstream.startsWith("refs/remotes/")) return void 0;
+						const { name } = parseRefName(upstream);
+						if (!name.includes("/", name.indexOf("/") + 1)) return void 0;
+						remoteNames ??= this.provider.remotes.getRemotes(commonPath, void 0, signal).then((remotes) => {
+							if (!remotes.length) cacheable?.invalidate();
+							return remotes.map((r) => r.name);
+						}, (ex) => {
+							if (isCancellationError(ex)) throw ex;
+							cacheable?.invalidate();
+							return [];
+						});
+						return splitRemoteBranchName(name, await remoteNames)?.[0];
+					};
 					for (const record of records) {
 						const fullName = record.name;
 						if (!fullName.startsWith("refs/heads/") && !fullName.startsWith("refs/remotes/")) continue;
 						if (isRemoteHEAD(fullName)) continue;
-						const upstream = parseUpstream(record.upstream, record.upstreamTracking, record.upstreamRemote);
+						const upstream = parseUpstream(record.upstream, record.upstreamTracking, record.upstreamRemote ?? (!worktreePathSupported ? await resolveUpstreamRemote(record.upstream) : void 0), record.upstreamRemoteRef);
 						const metadata = metadataMap.get(parseRefName(fullName).name);
 						const worktreePath = record.worktreePath ? normalizePath(record.worktreePath) : void 0;
 						branches.push(new GitBranch(commonPath, fullName, false, record.committerDate ? new Date(record.committerDate) : void 0, metadata, record.objectname, upstream, worktreePathSupported ? worktreePath ? {
@@ -176,7 +191,9 @@ var BranchesGitSubProvider = class {
 							upstream: branch.upstream?.name ? {
 								name: branch.upstream.name,
 								missing: branch.upstream.missing,
-								remote: branch.upstream.remote
+								remote: branch.upstream.remote,
+								remoteBranch: branch.upstream.remoteBranch,
+								local: branch.upstream.local
 							} : void 0,
 							sha: branch.sha
 						});
@@ -289,11 +306,13 @@ var BranchesGitSubProvider = class {
 					const branch = await this.getBranch(repoPath, ref, void 0, cancellation);
 					if (branch == null) return void 0;
 					const { remote: remoteName } = await resolveBranchRemote(this.provider, repoPath, branch, cancellation);
-					const prTarget = `${remoteName}/${pr.refs.base.branch}`;
-					const { missing } = await this.provider.refs.getSymbolicReferenceNameOrMissing(repoPath, prTarget, priorityOpts, cancellation);
-					if (!missing) {
-						mergeTarget = prTarget;
-						if (pr.stack == null) this.storeMergeTargetBranchName(repoPath, ref, prTarget, { skipInvalidation: ["branchOverviews"] });
+					if (remoteName != null) {
+						const prTarget = `${remoteName}/${pr.refs.base.branch}`;
+						const { missing } = await this.provider.refs.getSymbolicReferenceNameOrMissing(repoPath, prTarget, priorityOpts, cancellation);
+						if (!missing) {
+							mergeTarget = prTarget;
+							if (pr.stack == null) this.storeMergeTargetBranchName(repoPath, ref, prTarget, { skipInvalidation: ["branchOverviews"] });
+						}
 					}
 				}
 			}
@@ -356,26 +375,26 @@ var BranchesGitSubProvider = class {
 					cwd: repoPath,
 					cancellation: signal,
 					errors: "throw"
-				}, "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@", "@{u}", "--");
-				data = [result.stdout, void 0];
+				}, "rev-parse", "--symbolic-full-name", "@", "@{u}", "--");
+				data = parseSymbolicFullNames(result.stdout);
 			} catch (ex) {
 				if (isCancellationError(ex)) throw ex;
 				const msg = ex?.toString() ?? "";
 				if (GitErrors.badRevision.test(msg) || GitWarnings.noUpstream.test(msg)) {
-					if (ex.stdout != null && ex.stdout.length !== 0) data = [ex.stdout, void 0];
+					if (ex.stdout != null && ex.stdout.length !== 0) data = parseSymbolicFullNames(ex.stdout);
 					else {
 						try {
 							result = await this.git.run({
 								cwd: repoPath,
 								cancellation: signal
 							}, "symbolic-ref", "--short", "HEAD");
-							if (result.stdout) data = [result.stdout.trim(), void 0];
+							if (result.stdout) data = { name: result.stdout.trim() };
 						} catch {
 							if (isCancellationError(ex)) throw ex;
 						}
 						if (data == null) {
 							const symbolicRef = await this.getDefaultBranchName(repoPath, "origin", void 0, signal);
-							if (symbolicRef != null) data = [symbolicRef.startsWith("origin/") ? symbolicRef.substring(7) : symbolicRef, void 0];
+							if (symbolicRef != null) data = { name: symbolicRef.startsWith("origin/") ? symbolicRef.substring(7) : symbolicRef };
 						}
 						if (data == null) {
 							const defaultBranch = await this.provider.config.getConfig(repoPath, "init.defaultBranch") ?? "main";
@@ -383,7 +402,12 @@ var BranchesGitSubProvider = class {
 							const remote = configMap.get(`branch.${defaultBranch}.remote`);
 							const merge = configMap.get(`branch.${defaultBranch}.merge`);
 							const remoteBranch = merge?.startsWith("refs/heads/") ? merge.substring(11) : void 0;
-							data = [`${defaultBranch}${remote && remoteBranch ? `\n${remote}/${remoteBranch}` : ""}`, void 0];
+							data = { name: defaultBranch };
+							if (remote && remoteBranch) {
+								data.upstream = remote === "." ? `refs/heads/${remoteBranch}` : `refs/remotes/${remote}/${remoteBranch}`;
+								data.remote = remote;
+								data.remoteRef = merge;
+							}
 						}
 					}
 				} else if (GitWarnings.headNotABranch.test(msg)) {
@@ -395,21 +419,23 @@ var BranchesGitSubProvider = class {
 					}, "log", "-n1", "--format=%H", commitOrdering ? `--${commitOrdering}-order` : void 0, "--");
 					if (result.completion.status === "cancelled" || signal?.aborted) throw new CancellationError();
 					const sha = result.stdout.trim();
-					if (sha) data = [`(HEAD detached at ${shortenRevision(sha)})`, sha];
+					if (sha) data = {
+						name: `(HEAD detached at ${shortenRevision(sha)})`,
+						sha
+					};
 				} else _logger.warn(`[${repoPath}] Unable to get current branch: ${ex}`);
 			}
 			if (data == null) return void 0;
-			const [name, upstream] = data[0].split("\n");
+			const { name } = data;
+			let { remote, remoteRef } = data;
+			if (data.upstream?.startsWith("refs/heads/") && remote == null) [remote, remoteRef] = await Promise.all([this.provider.config.getConfig(repoPath, `branch.${name}.remote`), this.provider.config.getConfig(repoPath, `branch.${name}.merge`)]);
 			return createReference(name, repoPath, {
 				refType: "branch",
 				name,
 				id: getBranchId(repoPath, false, name),
 				remote: false,
-				upstream: upstream ? {
-					name: upstream,
-					missing: false
-				} : void 0,
-				sha: data[1]
+				upstream: data.upstream ? parseUpstream(data.upstream, "", remote, remoteRef) : void 0,
+				sha: data.sha
 			});
 		}, { cancellation });
 	}
@@ -1836,6 +1862,14 @@ __decorate([debug()], BranchesGitSubProvider.prototype, "setUpstreamBranch", nul
 __decorate([debug()], BranchesGitSubProvider.prototype, "storeBaseBranchName", null);
 __decorate([debug()], BranchesGitSubProvider.prototype, "storeMergeTargetBranchName", null);
 __decorate([debug()], BranchesGitSubProvider.prototype, "storeUserMergeTargetBranchName", null);
+/** Reads `rev-parse --symbolic-full-name @ @{u}` output: the current branch, then its upstream when it has one */
+function parseSymbolicFullNames(stdout) {
+	const [head, upstream] = stdout.trim().split("\n");
+	return {
+		name: parseRefName(head).name,
+		upstream: upstream || void 0
+	};
+}
 /** Each ref list {@link findRefTip} searched, by full name: one base read looks up many names in the same cached list */
 const refRecordsByName = /* @__PURE__ */ new WeakMap();
 /**