@gitkraken/core-gitlens 0.13.0 → 0.15.0

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

@@ -11,12 +11,12 @@ import { isRevisionRange, isSha, isUncommitted, isUncommittedStaged } from "../.
 import __decorate from "../../_virtual/@oxc-project+runtime/helpers/esm/decorate.js";
 import { SigningError } from "../../git/errors.js";
 import { GitErrors, classifySigningError, gitConfigsLog, gitConfigsLogWithFiles } from "../exec/git.js";
+import { maybeStopWatch } from "../../utils/stopwatch.js";
+import _usingCtx from "../../_virtual/@oxc-project+runtime/helpers/esm/usingCtx.js";
 import { GitFileChange } from "../../git/models/fileChange.js";
 import { createUncommittedChangesCommit } from "../../git/utils/commit.utils.js";
 import { GitCommit, GitCommitIdentity } from "../../git/models/commit.js";
 import { isUserMatch } from "../../git/utils/user.utils.js";
-import { maybeStopWatch } from "../../utils/stopwatch.js";
-import _usingCtx from "../../_virtual/@oxc-project+runtime/helpers/esm/usingCtx.js";
 import { compareReachableRefs } from "../../git/utils/sorting.js";
 import { parseSearchQueryGitCommand } from "../../git/utils/search.utils.js";
 import { getCommitsLogParser, getShaAndDatesLogParser, getShaAndFilesAndStatsLogParser, getShaLogParser } from "../parsers/logParser.js";

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

@@ -10,9 +10,9 @@ import { WorkspaceUntrustedError } from "../../git/errors.js";
 import { fsExists } from "../../utils/env/node/exec.js";
 import { KeyedSequencer } from "../exec/indexLock.js";
 import { gate } from "../../utils/decorators/gate.js";
-import { hostname, userInfo } from "os";
-import { env } from "process";
 import { promises } from "fs";
+import { env } from "process";
+import { hostname, userInfo } from "os";
 //#region ../git-cli/src/providers/config.ts
 const mappedAuthorRegex = /(.+)\s<(.+)>/;
 const emptyArray = Object.freeze([]);

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

@@ -5,8 +5,8 @@ import { createDisposable } from "../../utils/disposable.js";
 import { isUncommittedStaged } from "../../git/utils/revision.utils.js";
 import __decorate from "../../_virtual/@oxc-project+runtime/helpers/esm/decorate.js";
 import { gitConfigsLog } from "../exec/git.js";
-import { isUserMatch } from "../../git/utils/user.utils.js";
 import _usingCtx from "../../_virtual/@oxc-project+runtime/helpers/esm/usingCtx.js";
+import { isUserMatch } from "../../git/utils/user.utils.js";
 import { getContributorsLogParser } from "../parsers/logParser.js";
 import { GitContributor } from "../../git/models/contributor.js";
 import { calculateContributionScore } from "../../git/utils/contributor.utils.js";

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

@@ -6,12 +6,13 @@ import { debug } from "../../utils/decorators/log.js";
 import { createDisposable } from "../../utils/disposable.js";
 import { getBranchId, getBranchNameWithoutRemote, getRemoteNameFromBranchName } 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";
 import { GitSearchError } from "../../git/errors.js";
 import { classifySearchError, gitConfigsLog } from "../exec/git.js";
+import _usingCtx from "../../_virtual/@oxc-project+runtime/helpers/esm/usingCtx.js";
 import { fnv1aHash64 } from "../../utils/hash.js";
 import { isUserMatch } from "../../git/utils/user.utils.js";
-import _usingCtx from "../../_virtual/@oxc-project+runtime/helpers/esm/usingCtx.js";
 import { getSearchQueryComparisonKey, parseSearchQueryGitCommand } from "../../git/utils/search.utils.js";
 import { getGraphParser, getShaAndDatesLogParser, getShaAndDatesWithFilesLogParser, getShaAndStatsLogParser, getShaLogParser } from "../parsers/logParser.js";
 import { convertStashesToStdin } from "./stash.js";
@@ -239,8 +240,11 @@ var GraphGitSubProvider = class {
 		const headBranch = branches?.find((b) => b.current);
 		const headRefUpstreamName = headBranch?.upstream?.name;
 		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();
+		const slashRemoteNames = [...remoteMap.keys()].filter((n) => n.includes("/"));
 		const defaultBranchName = getSettledValue(defaultBranchResult);
-		const defaultLocalName = defaultBranchName != null ? getBranchNameWithoutRemote(defaultBranchName) : void 0;
+		const defaultLocalName = defaultBranchName != null ? (slashRemoteNames.length ? splitRemoteBranchName(defaultBranchName, slashRemoteNames)?.[1] : void 0) ?? getBranchNameWithoutRemote(defaultBranchName) : void 0;
 		let branchIdOfMainWorktree;
 		let mainWorktree;
 		if (worktreesByBranch != null) {
@@ -251,8 +255,6 @@ var GraphGitSubProvider = class {
 			}
 		}
 		const currentUser = getSettledValue(currentUserResult);
-		const remotes = getSettledValue(remotesResult);
-		const remoteMap = remotes != null ? new Map(remotes.map((r) => [r.name, r])) : /* @__PURE__ */ new Map();
 		const decorationFingerprint = computeDecorationFingerprint(repoPath, defaultBranchName, defaultLocalName, headRefUpstreamName, branches, remotes, worktrees, currentUser);
 		const shas = getSettledValue(shaResult)?.stdout;
 		const selectSha = shas != null ? first(shaParser.parse(shas)) : void 0;
@@ -361,11 +363,12 @@ var GraphGitSubProvider = class {
 					sawHead = true;
 					if (tip !== "HEAD") tip = tip.substring(8);
 				}
-				const remoteName = getRemoteNameFromBranchName(tip);
+				const slashRemote = slashRemoteNames.length ? splitRemoteBranchName(tip, slashRemoteNames) : void 0;
+				const remoteName = slashRemote?.[0] ?? getRemoteNameFromBranchName(tip);
 				if (remoteName) {
 					const remote = remoteMap.get(remoteName);
 					if (remote != null) {
-						const branchName = getBranchNameWithoutRemote(tip);
+						const branchName = slashRemote?.[1] ?? getBranchNameWithoutRemote(tip);
 						if (branchName === "HEAD") continue;
 						refRemoteHeads.push({
 							id: getBranchId(repoPath, true, tip),