@gitkraken/core-gitlens 0.6.0 → 0.7.0

package/dist/git/utils/branch.utils.js

@@ -1,133 +1,107 @@
-import { shortenRevision } from './revision.utils.js';
+import { getRemoteNameSlashIndex } from "../../utils/gitRefs.js";
+import { shortenRevision } from "./revision.utils.js";
+//#region ../git/src/utils/branch.utils.ts
 /**
- * The names git uses where a branch name would go when HEAD isn't on a branch — `(HEAD detached
- * at|from <rev>)`, `(no branch)`, `(no branch, rebasing <name>)`, `(no branch, bisect started on
- * <name>)`, and `git status --porcelain=v2`'s `branch.head` token `(detached)` — plus bare `HEAD`
- * and our own {@link formatDetachedHeadName} output (`(<rev>...)`).
- *
- * Deliberately NOT "anything parenthesized": parentheses are legal in ref names, so `(release)`,
- * `v1.0(rc)` and `feat/(wip)` are all real branches a user can be on. Matching those made
- * `GitBranch` rewrite a genuine branch's `name` to the synthesized `(sha…)` label and re-key its
- * `id` by SHA, which corrupts its identity for every downstream consumer.
- */
+* The names git uses where a branch name would go when HEAD isn't on a branch — `(HEAD detached
+* at|from <rev>)`, `(no branch)`, `(no branch, rebasing <name>)`, `(no branch, bisect started on
+* <name>)`, and `git status --porcelain=v2`'s `branch.head` token `(detached)` — plus bare `HEAD`
+* and our own {@link formatDetachedHeadName} output (`(<rev>...)`).
+*
+* Deliberately NOT "anything parenthesized": parentheses are legal in ref names, so `(release)`,
+* `v1.0(rc)` and `feat/(wip)` are all real branches a user can be on. Matching those made
+* `GitBranch` rewrite a genuine branch's `name` to the synthesized `(sha…)` label and re-key its
+* `id` by SHA, which corrupts its identity for every downstream consumer.
+*/
 const detachedHEADRegex = /^(?:HEAD|\(detached\)|\(HEAD detached (?:at|from) .+\)|\(no branch.*\)|\(.+\.\.\.\))$/;
-export function formatDetachedHeadName(sha) {
-    return `(${shortenRevision(sha)}...)`;
+function formatDetachedHeadName(sha) {
+	return `(${shortenRevision(sha)}...)`;
 }
-export function getBranchId(repoPath, remote, name) {
-    return `${repoPath}|${remote ? 'remotes/' : 'heads/'}${name}`;
+function getBranchNameAndRemote(ref) {
+	if (ref.remote) {
+		const index = getRemoteNameSlashIndex(ref.name);
+		if (index === -1) return [ref.name, void 0];
+		return [ref.name.substring(index + 1), ref.name.substring(0, index)];
+	}
+	if (ref.upstream?.name != null) {
+		const index = getRemoteNameSlashIndex(ref.upstream.name);
+		if (index === -1) return [ref.name, void 0];
+		return [ref.name, ref.upstream.name.substring(0, index)];
+	}
+	return [ref.name, void 0];
 }
-export function getBranchNameAndRemote(ref) {
-    if (ref.remote) {
-        const index = getRemoteNameSlashIndex(ref.name);
-        if (index === -1)
-            return [ref.name, undefined];
-        return [ref.name.substring(index + 1), ref.name.substring(0, index)];
-    }
-    if (ref.upstream?.name != null) {
-        const index = getRemoteNameSlashIndex(ref.upstream.name);
-        if (index === -1)
-            return [ref.name, undefined];
-        return [ref.name, ref.upstream.name.substring(0, index)];
-    }
-    return [ref.name, undefined];
+function getBranchTrackingWithoutRemote(ref) {
+	return ref.upstream?.name.substring(getRemoteNameSlashIndex(ref.upstream.name) + 1);
 }
-export function getBranchNameWithoutRemote(name) {
-    return name.substring(getRemoteNameSlashIndex(name) + 1);
+function isDetachedHead(name) {
+	name = name.trim();
+	return name.length ? detachedHEADRegex.test(name) : true;
 }
-export function getBranchTrackingWithoutRemote(ref) {
-    return ref.upstream?.name.substring(getRemoteNameSlashIndex(ref.upstream.name) + 1);
-}
-export function getRemoteNameFromBranchName(name) {
-    return name.substring(0, getRemoteNameSlashIndex(name));
-}
-export function getRemoteNameSlashIndex(name) {
-    return name.startsWith('remotes/') ? name.indexOf('/', 8) : name.indexOf('/');
-}
-export function isDetachedHead(name) {
-    // If there is whitespace in the name assume this is not a valid branch name
-    // Deals with detached HEAD states
-    name = name.trim();
-    return name.length ? detachedHEADRegex.test(name) : true;
-}
-export function isOfBranchRefType(branch) {
-    return branch?.refType === 'branch';
+function isOfBranchRefType(branch) {
+	return branch?.refType === "branch";
 }
 const localBranchesPrefixRegex = /^(refs\/)?heads\//i;
 const remoteBranchesPrefixRegex = /^(refs\/)?remotes\//i;
 const remoteHEADRegex = /^(refs\/)?remotes\/(.*\/)HEAD$/i;
-export function isRemoteBranch(refName) {
-    return remoteBranchesPrefixRegex.test(refName);
+function isRemoteBranch(refName) {
+	return remoteBranchesPrefixRegex.test(refName);
 }
-export function isRemoteHEAD(refName) {
-    return remoteHEADRegex.test(refName);
+function isRemoteHEAD(refName) {
+	return remoteHEADRegex.test(refName);
 }
-export function parseRefName(refName) {
-    const remote = isRemoteBranch(refName);
-    let name;
-    if (remote) {
-        // Strip off refs/remotes/
-        name = refName.replace(remoteBranchesPrefixRegex, '');
-    }
-    else {
-        // Strip off refs/heads/
-        name = refName.replace(localBranchesPrefixRegex, '');
-    }
-    return { name: name, remote: remote };
+function parseRefName(refName) {
+	const remote = isRemoteBranch(refName);
+	let name;
+	if (remote) name = refName.replace(remoteBranchesPrefixRegex, "");
+	else name = refName.replace(localBranchesPrefixRegex, "");
+	return {
+		name,
+		remote
+	};
 }
-export async function getLocalBranchByUpstream(remoteBranchName, branches) {
-    let qualifiedRemoteBranchName;
-    if (remoteBranchName.startsWith('remotes/')) {
-        qualifiedRemoteBranchName = remoteBranchName;
-        remoteBranchName = remoteBranchName.substring(8);
-    }
-    else {
-        qualifiedRemoteBranchName = `remotes/${remoteBranchName}`;
-    }
-    function matches(branch) {
-        return (!branch.remote &&
-            branch.upstream?.name != null &&
-            (branch.upstream.name === remoteBranchName || branch.upstream.name === qualifiedRemoteBranchName));
-    }
-    const values = branches.values();
-    if (Symbol.asyncIterator in values) {
-        for await (const branch of values) {
-            if (matches(branch))
-                return branch;
-        }
-    }
-    else {
-        for (const branch of values) {
-            if (matches(branch))
-                return branch;
-        }
-    }
-    return undefined;
+async function getLocalBranchByUpstream(remoteBranchName, branches) {
+	let qualifiedRemoteBranchName;
+	if (remoteBranchName.startsWith("remotes/")) {
+		qualifiedRemoteBranchName = remoteBranchName;
+		remoteBranchName = remoteBranchName.substring(8);
+	} else qualifiedRemoteBranchName = `remotes/${remoteBranchName}`;
+	function matches(branch) {
+		return !branch.remote && branch.upstream?.name != null && (branch.upstream.name === remoteBranchName || branch.upstream.name === qualifiedRemoteBranchName);
+	}
+	const values = branches.values();
+	if (Symbol.asyncIterator in values) {
+		for await (const branch of values) if (matches(branch)) return branch;
+	} else for (const branch of values) if (matches(branch)) return branch;
 }
-export async function getLocalBranchUpstreamNames(branches) {
-    const remoteBranches = new Set();
-    for await (const branch of branches.values()) {
-        if (!branch.remote && branch.upstream?.name != null) {
-            remoteBranches.add(branch.upstream.name);
-        }
-    }
-    return remoteBranches;
+async function getLocalBranchUpstreamNames(branches) {
+	const remoteBranches = /* @__PURE__ */ new Set();
+	for await (const branch of branches.values()) if (!branch.remote && branch.upstream?.name != null) remoteBranches.add(branch.upstream.name);
+	return remoteBranches;
 }
 const trackingStateRegex = /(?:\[(?:ahead ([0-9]+))?[,\s]*(?:behind ([0-9]+))?]|\[(gone)])/;
-export function parseUpstream(upstream, tracking) {
-    if (!upstream)
-        return undefined;
-    const { name } = parseRefName(upstream);
-    const match = trackingStateRegex.exec(tracking);
-    if (match == null) {
-        return { name: name, missing: false, state: { ahead: 0, behind: 0 } };
-    }
-    const ahead = match[1] == null ? 0 : Number(match[1]);
-    const behind = match[2] == null ? 0 : Number(match[2]);
-    return {
-        name: name,
-        missing: match[3] != null,
-        state: { ahead: isNaN(ahead) ? 0 : ahead, behind: isNaN(behind) ? 0 : behind },
-    };
+function parseUpstream(upstream, tracking) {
+	if (!upstream) return void 0;
+	const { name } = parseRefName(upstream);
+	const match = trackingStateRegex.exec(tracking);
+	if (match == null) return {
+		name,
+		missing: false,
+		state: {
+			ahead: 0,
+			behind: 0
+		}
+	};
+	const ahead = match[1] == null ? 0 : Number(match[1]);
+	const behind = match[2] == null ? 0 : Number(match[2]);
+	return {
+		name,
+		missing: match[3] != null,
+		state: {
+			ahead: isNaN(ahead) ? 0 : ahead,
+			behind: isNaN(behind) ? 0 : behind
+		}
+	};
 }
+//#endregion
+export { formatDetachedHeadName, getBranchNameAndRemote, getBranchTrackingWithoutRemote, getLocalBranchByUpstream, getLocalBranchUpstreamNames, isDetachedHead, isOfBranchRefType, isRemoteBranch, isRemoteHEAD, parseRefName, parseUpstream };
+
 //# sourceMappingURL=branch.utils.js.map

package/dist/git/utils/branch.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"branch.utils.js","sourceRoot":"","sources":["../../../src/git/utils/branch.utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"branch.utils.js","names":[],"sources":["../../../../git/src/utils/branch.utils.ts"],"sourcesContent":["import { getRemoteNameSlashIndex } from '@gitlens/utils/gitRefs.js';\nimport type { PageableResult } from '@gitlens/utils/paging.js';\nimport type { GitBranch, GitTrackingUpstream } from '../models/branch.js';\nimport type { GitBranchReference, GitReference } from '../models/reference.js';\nimport { shortenRevision } from './revision.utils.js';\n\n/**\n * The names git uses where a branch name would go when HEAD isn't on a branch — `(HEAD detached\n * at|from <rev>)`, `(no branch)`, `(no branch, rebasing <name>)`, `(no branch, bisect started on\n * <name>)`, and `git status --porcelain=v2`'s `branch.head` token `(detached)` — plus bare `HEAD`\n * and our own {@link formatDetachedHeadName} output (`(<rev>...)`).\n *\n * Deliberately NOT \"anything parenthesized\": parentheses are legal in ref names, so `(release)`,\n * `v1.0(rc)` and `feat/(wip)` are all real branches a user can be on. Matching those made\n * `GitBranch` rewrite a genuine branch's `name` to the synthesized `(sha…)` label and re-key its\n * `id` by SHA, which corrupts its identity for every downstream consumer.\n */\nconst detachedHEADRegex = /^(?:HEAD|\\(detached\\)|\\(HEAD detached (?:at|from) .+\\)|\\(no branch.*\\)|\\(.+\\.\\.\\.\\))$/;\n\nexport function formatDetachedHeadName(sha: string): string {\n\treturn `(${shortenRevision(sha)}...)`;\n}\n\nexport function getBranchNameAndRemote(ref: GitBranchReference): [name: string, remote: string | undefined] {\n\tif (ref.remote) {\n\t\tconst index = getRemoteNameSlashIndex(ref.name);\n\t\tif (index === -1) return [ref.name, undefined];\n\n\t\treturn [ref.name.substring(index + 1), ref.name.substring(0, index)];\n\t}\n\n\tif (ref.upstream?.name != null) {\n\t\tconst index = getRemoteNameSlashIndex(ref.upstream.name);\n\t\tif (index === -1) return [ref.name, undefined];\n\n\t\treturn [ref.name, ref.upstream.name.substring(0, index)];\n\t}\n\n\treturn [ref.name, undefined];\n}\n\nexport function getBranchTrackingWithoutRemote(ref: GitBranchReference): string | undefined {\n\treturn ref.upstream?.name.substring(getRemoteNameSlashIndex(ref.upstream.name) + 1);\n}\n\nexport function isDetachedHead(name: string): boolean {\n\t// If there is whitespace in the name assume this is not a valid branch name\n\t// Deals with detached HEAD states\n\tname = name.trim();\n\treturn name.length ? detachedHEADRegex.test(name) : true;\n}\n\nexport function isOfBranchRefType(branch: GitReference | undefined): branch is GitBranchReference {\n\treturn branch?.refType === 'branch';\n}\n\nconst localBranchesPrefixRegex = /^(refs\\/)?heads\\//i;\nconst remoteBranchesPrefixRegex = /^(refs\\/)?remotes\\//i;\nconst remoteHEADRegex = /^(refs\\/)?remotes\\/(.*\\/)HEAD$/i;\n\nexport function isRemoteBranch(refName: string): boolean {\n\treturn remoteBranchesPrefixRegex.test(refName);\n}\n\nexport function isRemoteHEAD(refName: string): boolean {\n\treturn remoteHEADRegex.test(refName);\n}\n\nexport function parseRefName(refName: string): { name: string; remote: boolean } {\n\tconst remote = isRemoteBranch(refName);\n\n\tlet name;\n\tif (remote) {\n\t\t// Strip off refs/remotes/\n\t\tname = refName.replace(remoteBranchesPrefixRegex, '');\n\t} else {\n\t\t// Strip off refs/heads/\n\t\tname = refName.replace(localBranchesPrefixRegex, '');\n\t}\n\n\treturn { name: name, remote: remote };\n}\n\nexport async function getLocalBranchByUpstream(\n\tremoteBranchName: string,\n\tbranches: PageableResult<GitBranch> | ReadonlyMap<unknown, GitBranch>,\n): Promise<GitBranch | undefined> {\n\tlet qualifiedRemoteBranchName;\n\tif (remoteBranchName.startsWith('remotes/')) {\n\t\tqualifiedRemoteBranchName = remoteBranchName;\n\t\tremoteBranchName = remoteBranchName.substring(8);\n\t} else {\n\t\tqualifiedRemoteBranchName = `remotes/${remoteBranchName}`;\n\t}\n\n\tfunction matches(branch: GitBranch): boolean {\n\t\treturn (\n\t\t\t!branch.remote &&\n\t\t\tbranch.upstream?.name != null &&\n\t\t\t(branch.upstream.name === remoteBranchName || branch.upstream.name === qualifiedRemoteBranchName!)\n\t\t);\n\t}\n\n\tconst values = branches.values();\n\tif (Symbol.asyncIterator in values) {\n\t\tfor await (const branch of values) {\n\t\t\tif (matches(branch)) return branch;\n\t\t}\n\t} else {\n\t\tfor (const branch of values) {\n\t\t\tif (matches(branch)) return branch;\n\t\t}\n\t}\n\n\treturn undefined;\n}\n\nexport async function getLocalBranchUpstreamNames(branches: PageableResult<GitBranch>): Promise<Set<string>> {\n\tconst remoteBranches = new Set<string>();\n\n\tfor await (const branch of branches.values()) {\n\t\tif (!branch.remote && branch.upstream?.name != null) {\n\t\t\tremoteBranches.add(branch.upstream.name);\n\t\t}\n\t}\n\n\treturn remoteBranches;\n}\n\nconst trackingStateRegex = /(?:\\[(?:ahead ([0-9]+))?[,\\s]*(?:behind ([0-9]+))?]|\\[(gone)])/;\n\nexport function parseUpstream(upstream: string, tracking: string): GitTrackingUpstream | undefined {\n\tif (!upstream) return undefined;\n\n\tconst { name } = parseRefName(upstream);\n\n\tconst match = trackingStateRegex.exec(tracking);\n\tif (match == null) {\n\t\treturn { name: name, missing: false, state: { ahead: 0, behind: 0 } };\n\t}\n\n\tconst ahead = match[1] == null ? 0 : Number(match[1]);\n\tconst behind = match[2] == null ? 0 : Number(match[2]);\n\n\treturn {\n\t\tname: name,\n\t\tmissing: match[3] != null,\n\t\tstate: { ahead: isNaN(ahead) ? 0 : ahead, behind: isNaN(behind) ? 0 : behind },\n\t};\n}\n"],"mappings":"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"}

package/dist/git/utils/commit.utils.d.ts

@@ -1,26 +1,20 @@
-import type { GitCommitFileset, GitCommitStats, GitCommitWithFullDetails } from '../models/commit.js';
-import { GitCommit } from '../models/commit.js';
-import type { GitReference } from '../models/reference.js';
-import type { GitUser } from '../models/user.js';
+import { GitReference } from "../models/reference.js";
+import { GitCommit, GitCommitFileset, GitCommitStats, GitCommitWithFullDetails } from "../models/commit.js";
+import { GitUser } from "../models/user.js";
+//#region ../git/src/utils/commit.utils.d.ts
 export type CurrentUserNameStyle = 'you' | 'name' | 'nameAndYou';
 export declare function formatCurrentUserDisplayName(name: string, style: CurrentUserNameStyle): string;
 export declare function formatIdentityDisplayName(identity: {
-    name: string;
-    current?: boolean | undefined;
+  name: string;
+  current?: boolean | undefined;
 }, style: CurrentUserNameStyle): string;
 export declare function assertsCommitHasFullDetails(commit: GitCommit): asserts commit is GitCommitWithFullDetails;
 export declare function getChangedFilesCount(changedFiles: GitCommitStats['files'] | undefined): number;
 export declare function isOfCommitOrStashRefType(commit: GitReference | undefined): boolean;
-/**
- * use `\n` symbol is presented to split commit message to description and title
- */
-export declare function splitCommitMessage(commitMessage?: string): {
-    summary: string;
-    body?: string;
-};
 export declare function createUncommittedChangesCommit(repoPath: string, sha: string, now: Date, user: GitUser | undefined, options?: {
-    fileset?: GitCommitFileset;
-    parents?: string[];
-    stats?: GitCommitStats;
+  fileset?: GitCommitFileset;
+  parents?: string[];
+  stats?: GitCommitStats;
 }): GitCommit;
+//#endregion
 //# sourceMappingURL=commit.utils.d.ts.map

package/dist/git/utils/commit.utils.js

@@ -1,54 +1,35 @@
-import { GitCommit, GitCommitIdentity } from '../models/commit.js';
-import { uncommittedStaged } from '../models/revision.js';
-export function formatCurrentUserDisplayName(name, style) {
-    switch (style) {
-        case 'name':
-            return name;
-        case 'nameAndYou':
-            if (name === 'You' || name.endsWith(' (you)')) {
-                debugger;
-                return name;
-            }
-            return name ? `${name} (you)` : 'You';
-        case 'you':
-        default:
-            return 'You';
-    }
+import "../models/revision.js";
+import { GitCommit, GitCommitIdentity } from "../models/commit.js";
+import * as l10n from "@vscode/l10n";
+//#region ../git/src/utils/commit.utils.ts
+function formatCurrentUserDisplayName(name, style) {
+	const you = l10n.t("You");
+	switch (style) {
+		case "name": return name;
+		case "nameAndYou":
+			if (name === "You" || name === you) return you;
+			if (name.endsWith(" (you)")) name = name.slice(0, -6);
+			return name ? l10n.t("{0} (you)", name) : you;
+		default: return you;
+	}
 }
-export function formatIdentityDisplayName(identity, style) {
-    return identity.current ? formatCurrentUserDisplayName(identity.name, style) : identity.name;
+function formatIdentityDisplayName(identity, style) {
+	return identity.current ? formatCurrentUserDisplayName(identity.name, style) : identity.name;
 }
-export function assertsCommitHasFullDetails(commit) {
-    if (!commit.hasFullDetails()) {
-        throw new Error(`GitCommit(${commit.sha}) is not fully loaded`);
-    }
+function assertsCommitHasFullDetails(commit) {
+	if (!commit.hasFullDetails()) throw new Error(`GitCommit(${commit.sha}) is not fully loaded`);
 }
-export function getChangedFilesCount(changedFiles) {
-    if (changedFiles == null)
-        return 0;
-    return typeof changedFiles === 'number'
-        ? changedFiles
-        : changedFiles.added + changedFiles.changed + changedFiles.deleted;
+function getChangedFilesCount(changedFiles) {
+	if (changedFiles == null) return 0;
+	return typeof changedFiles === "number" ? changedFiles : changedFiles.added + changedFiles.changed + changedFiles.deleted;
 }
-export function isOfCommitOrStashRefType(commit) {
-    return commit?.refType === 'revision' || commit?.refType === 'stash';
+function isOfCommitOrStashRefType(commit) {
+	return commit?.refType === "revision" || commit?.refType === "stash";
 }
-/**
- * use `\n` symbol is presented to split commit message to description and title
- */
-export function splitCommitMessage(commitMessage) {
-    if (!commitMessage)
-        return { summary: '' };
-    const message = commitMessage.trim();
-    const index = message.indexOf('\n');
-    if (index < 0)
-        return { summary: message };
-    return {
-        summary: message.substring(0, index),
-        body: message.substring(index + 1).trim(),
-    };
-}
-export function createUncommittedChangesCommit(repoPath, sha, now, user, options) {
-    return new GitCommit(repoPath, sha, new GitCommitIdentity(user?.name ?? '', user?.email ?? undefined, now, undefined, true), new GitCommitIdentity(user?.name ?? '', user?.email ?? undefined, now, undefined, true), 'Uncommitted changes', options?.parents ?? (sha === uncommittedStaged ? ['HEAD'] : []), 'Uncommitted changes', options?.fileset, options?.stats, []);
+function createUncommittedChangesCommit(repoPath, sha, now, user, options) {
+	return new GitCommit(repoPath, sha, new GitCommitIdentity(user?.name ?? "", user?.email ?? void 0, now, void 0, true), new GitCommitIdentity(user?.name ?? "", user?.email ?? void 0, now, void 0, true), "Uncommitted changes", options?.parents ?? (sha === "0000000000000000000000000000000000000000:" ? ["HEAD"] : []), "Uncommitted changes", options?.fileset, options?.stats, []);
 }
+//#endregion
+export { assertsCommitHasFullDetails, createUncommittedChangesCommit, formatCurrentUserDisplayName, formatIdentityDisplayName, getChangedFilesCount, isOfCommitOrStashRefType };
+
 //# sourceMappingURL=commit.utils.js.map

package/dist/git/utils/commit.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"commit.utils.js","sourceRoot":"","sources":["../../../src/git/utils/commit.utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAK1D,MAAM,UAAU,4BAA4B,CAAC,IAAY,EAAE,KAA2B;IACrF,QAAQ,KAAK,EAAE,CAAC;QACf,KAAK,MAAM;YACV,OAAO,IAAI,CAAC;QACb,KAAK,YAAY;YAChB,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/C,SAAS;gBACT,OAAO,IAAI,CAAC;YACb,CAAC;YACD,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;QACvC,KAAK,KAAK,CAAC;QACX;YACC,OAAO,KAAK,CAAC;IACf,CAAC;AACF,CAAC;AAED,MAAM,UAAU,yBAAyB,CACxC,QAAyD,EACzD,KAA2B;IAE3B,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,4BAA4B,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;AAC9F,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAAiB;IAC5D,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,aAAa,MAAM,CAAC,GAAG,uBAAuB,CAAC,CAAC;IACjE,CAAC;AACF,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,YAAiD;IACrF,IAAI,YAAY,IAAI,IAAI;QAAE,OAAO,CAAC,CAAC;IAEnC,OAAO,OAAO,YAAY,KAAK,QAAQ;QACtC,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,YAAY,CAAC,KAAK,GAAG,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAAgC;IACxE,OAAO,MAAM,EAAE,OAAO,KAAK,UAAU,IAAI,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC;AACtE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,aAAsB;IACxD,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAE3C,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;IACrC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,KAAK,GAAG,CAAC;QAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;IAE3C,OAAO;QACN,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC;QACpC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE;KACzC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC7C,QAAgB,EAChB,GAAW,EACX,GAAS,EACT,IAAyB,EACzB,OAIC;IAED,OAAO,IAAI,SAAS,CACnB,QAAQ,EACR,GAAG,EACH,IAAI,iBAAiB,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,IAAI,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,EACvF,IAAI,iBAAiB,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,IAAI,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,EACvF,qBAAqB,EACrB,OAAO,EAAE,OAAO,IAAI,CAAC,GAAG,KAAK,iBAAiB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAC/D,qBAAqB,EACrB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,KAAK,EACd,EAAE,CACF,CAAC;AACH,CAAC"}
+{"version":3,"file":"commit.utils.js","names":[],"sources":["../../../../git/src/utils/commit.utils.ts"],"sourcesContent":["import * as l10n from '@vscode/l10n';\nimport type { GitCommitFileset, GitCommitStats, GitCommitWithFullDetails } from '../models/commit.js';\nimport { GitCommit, GitCommitIdentity } from '../models/commit.js';\nimport type { GitReference } from '../models/reference.js';\nimport { uncommittedStaged } from '../models/revision.js';\nimport type { GitUser } from '../models/user.js';\n\nexport type CurrentUserNameStyle = 'you' | 'name' | 'nameAndYou';\n\nexport function formatCurrentUserDisplayName(name: string, style: CurrentUserNameStyle): string {\n\tconst you = l10n.t('You');\n\n\tswitch (style) {\n\t\tcase 'name':\n\t\t\treturn name;\n\t\tcase 'nameAndYou':\n\t\t\tif (name === 'You' || name === you) {\n\t\t\t\treturn you;\n\t\t\t}\n\n\t\t\tif (name.endsWith(' (you)')) {\n\t\t\t\tname = name.slice(0, -' (you)'.length);\n\t\t\t}\n\n\t\t\treturn name ? l10n.t('{0} (you)', name) : you;\n\t\tcase 'you':\n\t\tdefault:\n\t\t\treturn you;\n\t}\n}\n\nexport function formatIdentityDisplayName(\n\tidentity: { name: string; current?: boolean | undefined },\n\tstyle: CurrentUserNameStyle,\n): string {\n\treturn identity.current ? formatCurrentUserDisplayName(identity.name, style) : identity.name;\n}\n\nexport function assertsCommitHasFullDetails(commit: GitCommit): asserts commit is GitCommitWithFullDetails {\n\tif (!commit.hasFullDetails()) {\n\t\tthrow new Error(`GitCommit(${commit.sha}) is not fully loaded`);\n\t}\n}\n\nexport function getChangedFilesCount(changedFiles: GitCommitStats['files'] | undefined): number {\n\tif (changedFiles == null) return 0;\n\n\treturn typeof changedFiles === 'number'\n\t\t? changedFiles\n\t\t: changedFiles.added + changedFiles.changed + changedFiles.deleted;\n}\n\nexport function isOfCommitOrStashRefType(commit: GitReference | undefined): boolean {\n\treturn commit?.refType === 'revision' || commit?.refType === 'stash';\n}\n\nexport function createUncommittedChangesCommit(\n\trepoPath: string,\n\tsha: string,\n\tnow: Date,\n\tuser: GitUser | undefined,\n\toptions?: {\n\t\tfileset?: GitCommitFileset;\n\t\tparents?: string[];\n\t\tstats?: GitCommitStats;\n\t},\n): GitCommit {\n\treturn new GitCommit(\n\t\trepoPath,\n\t\tsha,\n\t\tnew GitCommitIdentity(user?.name ?? '', user?.email ?? undefined, now, undefined, true),\n\t\tnew GitCommitIdentity(user?.name ?? '', user?.email ?? undefined, now, undefined, true),\n\t\t'Uncommitted changes',\n\t\toptions?.parents ?? (sha === uncommittedStaged ? ['HEAD'] : []),\n\t\t'Uncommitted changes',\n\t\toptions?.fileset,\n\t\toptions?.stats,\n\t\t[],\n\t);\n}\n"],"mappings":";;;;AASA,SAAgB,6BAA6B,MAAc,OAAqC;CAC/F,MAAM,MAAM,KAAK,EAAE,KAAK;CAExB,QAAQ,OAAR;EACC,KAAK,QACJ,OAAO;EACR,KAAK;GACJ,IAAI,SAAS,SAAS,SAAS,KAC9B,OAAO;GAGR,IAAI,KAAK,SAAS,QAAQ,GACzB,OAAO,KAAK,MAAM,GAAG,EAAgB;GAGtC,OAAO,OAAO,KAAK,EAAE,aAAa,IAAI,IAAI;EAE3C,SACC,OAAO;CACT;AACD;AAEA,SAAgB,0BACf,UACA,OACS;CACT,OAAO,SAAS,UAAU,6BAA6B,SAAS,MAAM,KAAK,IAAI,SAAS;AACzF;AAEA,SAAgB,4BAA4B,QAA+D;CAC1G,IAAI,CAAC,OAAO,eAAe,GAC1B,MAAM,IAAI,MAAM,aAAa,OAAO,IAAI,sBAAsB;AAEhE;AAEA,SAAgB,qBAAqB,cAA2D;CAC/F,IAAI,gBAAgB,MAAM,OAAO;CAEjC,OAAO,OAAO,iBAAiB,WAC5B,eACA,aAAa,QAAQ,aAAa,UAAU,aAAa;AAC7D;AAEA,SAAgB,yBAAyB,QAA2C;CACnF,OAAO,QAAQ,YAAY,cAAc,QAAQ,YAAY;AAC9D;AAEA,SAAgB,+BACf,UACA,KACA,KACA,MACA,SAKY;CACZ,OAAO,IAAI,UACV,UACA,KACA,IAAI,kBAAkB,MAAM,QAAQ,IAAI,MAAM,SAAS,KAAA,GAAW,KAAK,KAAA,GAAW,IAAI,GACtF,IAAI,kBAAkB,MAAM,QAAQ,IAAI,MAAM,SAAS,KAAA,GAAW,KAAK,KAAA,GAAW,IAAI,GACtF,uBACA,SAAS,YAAY,QAAA,8CAA4B,CAAC,MAAM,IAAI,CAAC,IAC7D,uBACA,SAAS,SACT,SAAS,OACT,CAAC,CACF;AACD"}

package/dist/git/utils/config.utils.d.ts

@@ -1,3 +1,5 @@
+//#region ../git/src/utils/config.utils.d.ts
 /** Interprets a git config value with git's boolean semantics; `undefined` in → `undefined` out (unset). */
 export declare function parseGitBoolean(value: string | null | undefined): boolean | undefined;
+//#endregion
 //# sourceMappingURL=config.utils.d.ts.map

package/dist/git/utils/config.utils.js

@@ -1,8 +1,17 @@
-const falseValues = new Set(['', 'false', 'no', 'off', '0']);
+//#region ../git/src/utils/config.utils.ts
+const falseValues = /* @__PURE__ */ new Set([
+	"",
+	"false",
+	"no",
+	"off",
+	"0"
+]);
 /** Interprets a git config value with git's boolean semantics; `undefined` in → `undefined` out (unset). */
-export function parseGitBoolean(value) {
-    if (value == null)
-        return undefined;
-    return !falseValues.has(value.trim().toLowerCase());
+function parseGitBoolean(value) {
+	if (value == null) return void 0;
+	return !falseValues.has(value.trim().toLowerCase());
 }
+//#endregion
+export { parseGitBoolean };
+
 //# sourceMappingURL=config.utils.js.map

package/dist/git/utils/config.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.utils.js","sourceRoot":"","sources":["../../../src/git/utils/config.utils.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;AAE7D,4GAA4G;AAC5G,MAAM,UAAU,eAAe,CAAC,KAAgC;IAC/D,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC;IAEpC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AACrD,CAAC"}
+{"version":3,"file":"config.utils.js","names":[],"sources":["../../../../git/src/utils/config.utils.ts"],"sourcesContent":["const falseValues = new Set(['', 'false', 'no', 'off', '0']);\n\n/** Interprets a git config value with git's boolean semantics; `undefined` in → `undefined` out (unset). */\nexport function parseGitBoolean(value: string | null | undefined): boolean | undefined {\n\tif (value == null) return undefined;\n\n\treturn !falseValues.has(value.trim().toLowerCase());\n}\n"],"mappings":";AAAA,MAAM,8BAAc,IAAI,IAAI;CAAC;CAAI;CAAS;CAAM;CAAO;AAAG,CAAC;;AAG3D,SAAgB,gBAAgB,OAAuD;CACtF,IAAI,SAAS,MAAM,OAAO,KAAA;CAE1B,OAAO,CAAC,YAAY,IAAI,MAAM,KAAK,CAAC,CAAC,YAAY,CAAC;AACnD"}

package/dist/git/utils/conflictResolution.utils.d.ts

@@ -1,4 +1,5 @@
-import type { GitFileConflictStatus } from '../models/fileStatus.js';
+import { GitFileConflictStatus } from "../models/fileStatus.js";
+//#region ../git/src/utils/conflictResolution.utils.d.ts
 export type ConflictResolutionAction = 'take-ours' | 'take-theirs' | 'delete' | 'unsupported';
 /**
  * A richer description of a conflict than the raw XY status code — used to label conflicts the
@@ -15,24 +16,26 @@ export type ConflictRenameKind = 'rename-rename' | 'rename-delete' | 'rename-mod
  * a useful coarse kind; pass the per-stage data for the fine-grained symlink/submodule/mode-only split.
  */
 export declare function classifyConflictKind(status: GitFileConflictStatus, modes?: {
-    base?: string;
-    current?: string;
-    incoming?: string;
+  base?: string;
+  current?: string;
+  incoming?: string;
 }, oids?: {
-    base?: string;
-    current?: string;
-    incoming?: string;
+  base?: string;
+  current?: string;
+  incoming?: string;
 }, hints?: {
-    binary?: boolean;
-    rename?: ConflictRenameKind;
+  binary?: boolean;
+  rename?: ConflictRenameKind;
 }): ConflictKind;
 export declare function classifyConflictAction(status: GitFileConflictStatus, resolution: 'current' | 'incoming'): ConflictResolutionAction;
 export declare function canStageCurrent(status: GitFileConflictStatus): boolean;
 export declare function canStageIncoming(status: GitFileConflictStatus): boolean;
-/** A short label + one-line description for a {@link ConflictKind}, used to explain conflicts the AI
- *  resolver can't auto-merge (and rename conflicts) wherever they're surfaced. */
+/** A short label, complete description, and standalone reason for a {@link ConflictKind}, used to
+ *  explain conflicts the AI resolver can't auto-merge (and rename conflicts) wherever they're surfaced. */
 export declare function getConflictKindLabel(kind: ConflictKind, renameOf?: string): {
-    label: string;
-    description: string;
+  label: string;
+  description: string;
+  reason: string;
 };
+//#endregion
 //# sourceMappingURL=conflictResolution.utils.d.ts.map