@gitkraken/core-gitlens 0.5.116 → 0.7.0

package/src/git/utils/conflictResolution.utils.ts

@@ -1,157 +0,0 @@
-import type { GitFileConflictStatus } from '../models/fileStatus.js';
-
-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
- * AI text resolver can't parse (binary, symlink, submodule, mode-only, add/add) and to surface
- * rename conflicts. Derived by {@link classifyConflictKind} from the XY status plus, when
- * available, the per-stage file modes/oids and rename/binary hints the caller computes.
- */
-export type ConflictKind =
-	| 'text'
-	| 'binary'
-	| 'symlink'
-	| 'submodule'
-	| 'mode-only'
-	| 'add-add'
-	| 'delete-modify'
-	| 'both-deleted'
-	| 'rename-rename'
-	| 'rename-delete'
-	| 'rename-modify'
-	| 'unknown';
-
-export type ConflictRenameKind = 'rename-rename' | 'rename-delete' | 'rename-modify';
-
-const symlinkMode = '120000';
-const submoduleMode = '160000';
-
-/**
- * Classifies a conflict into a {@link ConflictKind}. Pure — all detection that needs git/IO
- * (rename correlation, binary sniffing) is computed by the caller and passed via `hints`. When
- * `modes`/`oids` are omitted (e.g. a webview caller that only has the XY status), it still returns
- * a useful coarse kind; pass the per-stage data for the fine-grained symlink/submodule/mode-only split.
- */
-export function classifyConflictKind(
-	status: GitFileConflictStatus,
-	modes?: { base?: string; current?: string; incoming?: string },
-	oids?: { base?: string; current?: string; incoming?: string },
-	hints?: { binary?: boolean; rename?: ConflictRenameKind },
-): ConflictKind {
-	if (hints?.rename != null) return hints.rename;
-
-	if (status === 'DD') return 'both-deleted';
-	if (status === 'UD' || status === 'DU') return 'delete-modify';
-
-	const presentModes = [modes?.current, modes?.incoming, modes?.base].filter((m): m is string => m != null);
-	if (presentModes.includes(submoduleMode)) return 'submodule';
-	if (presentModes.includes(symlinkMode)) return 'symlink';
-
-	if (hints?.binary) return 'binary';
-
-	// Both sides present with identical content (same oid) but different mode → only the file mode
-	// conflicts (e.g. one side flipped the executable bit).
-	if (
-		modes?.current != null &&
-		modes?.incoming != null &&
-		modes.current !== modes.incoming &&
-		oids?.current != null &&
-		oids.current === oids?.incoming
-	) {
-		return 'mode-only';
-	}
-
-	if (status === 'AA' || status === 'AU' || status === 'UA') return 'add-add';
-
-	return 'text';
-}
-
-export function classifyConflictAction(
-	status: GitFileConflictStatus,
-	resolution: 'current' | 'incoming',
-): ConflictResolutionAction {
-	const takeCurrent = resolution === 'current';
-
-	if (status === 'DD') return 'delete';
-	if (status === 'UD' && !takeCurrent) return 'delete';
-	if (status === 'DU' && takeCurrent) return 'delete';
-
-	// `git checkout --{ours,theirs}` fails when the requested stage is absent.
-	// Single-file UI filters these out; bulk resolve surfaces them as failures.
-	if (status === 'UA' && takeCurrent) return 'unsupported';
-	if (status === 'AU' && !takeCurrent) return 'unsupported';
-
-	return takeCurrent ? 'take-ours' : 'take-theirs';
-}
-
-// Stage Current is invalid when the current side has no content to take (added/deleted only by them, or both deleted)
-export function canStageCurrent(status: GitFileConflictStatus): boolean {
-	return status !== 'UA' && status !== 'DD';
-}
-
-// Stage Incoming is invalid when the incoming side has no content to take (added/deleted only by us, or both deleted)
-export function canStageIncoming(status: GitFileConflictStatus): boolean {
-	return status !== 'AU' && status !== 'DD';
-}
-
-/** 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. */
-export function getConflictKindLabel(kind: ConflictKind, renameOf?: string): { label: string; description: string } {
-	const named = renameOf ? `"${renameOf}"` : 'The file';
-	switch (kind) {
-		case 'binary':
-			return {
-				label: 'Binary conflict',
-				description: 'Binary file changed on both sides — choose a side to keep',
-			};
-		case 'symlink':
-			return {
-				label: 'Symlink conflict',
-				description: 'Symbolic link changed on both sides — choose a side to keep',
-			};
-		case 'submodule':
-			return {
-				label: 'Submodule conflict',
-				description: 'Submodule reference changed on both sides — choose a side to keep',
-			};
-		case 'mode-only':
-			return {
-				label: 'File mode conflict',
-				description: 'Only the file mode differs (e.g. the executable bit) — choose a side to keep',
-			};
-		case 'add-add':
-			// Covers AA (added on both sides) as well as AU/UA (added on one side) — keep the wording
-			// accurate for all three rather than asserting "both sides".
-			return {
-				label: 'Add conflict',
-				description: 'Conflicting file additions — choose a side to keep',
-			};
-		case 'delete-modify':
-			return {
-				label: 'Modified and deleted',
-				description: 'Deleted on one side and modified on the other — keep the file or delete it',
-			};
-		case 'both-deleted':
-			return { label: 'Deleted on both sides', description: 'Deleted on both sides — confirm the deletion' };
-		case 'rename-rename':
-			return {
-				label: 'Renamed differently',
-				description: `${named} was renamed differently on each side — choose which name to keep`,
-			};
-		case 'rename-delete':
-			return {
-				label: 'Renamed and deleted',
-				description: `${named} was renamed on one side and deleted on the other — keep the file or delete it`,
-			};
-		case 'rename-modify':
-			return {
-				label: 'Renamed and modified',
-				description: `${named} was renamed on one side and modified on the other`,
-			};
-		case 'text':
-			return { label: 'Text conflict', description: 'Conflicting changes on both sides' };
-		default:
-			return { label: 'Conflict', description: 'Resolve this conflict manually' };
-	}
-}

package/src/git/utils/contributor.utils.ts

@@ -1,105 +0,0 @@
-import type { GitCommitStats } from '../models/commit.js';
-import type { GitContributionTiers, GitContributor, GitContributorsStats } from '../models/contributor.js';
-import type { GitUser } from '../models/user.js';
-
-export interface ContributorScoreOptions {
-	// Thresholds
-	recentThresholdInDays: number;
-	maxScoreNormalization: number;
-
-	// Time-based weights
-	recentWeight: number;
-
-	// Impact weights
-	additionsWeight: number;
-	deletionsWeight: number;
-}
-
-export const defaultContributorScoreOptions: ContributorScoreOptions = {
-	recentThresholdInDays: 30,
-	recentWeight: 1.5,
-	additionsWeight: 0.8,
-	deletionsWeight: 1.2,
-	maxScoreNormalization: 1000,
-};
-
-export function calculateContributionScore(
-	stats: GitCommitStats | undefined,
-	timestamp: number,
-	options: ContributorScoreOptions = defaultContributorScoreOptions,
-	now: number = Date.now(),
-): number {
-	if (stats == null) return 0;
-
-	const ageInDays = (now - timestamp) / (24 * 3600 * 1000);
-
-	// Time decay factor (exponential decay)
-	const recencyScore = Math.exp(-ageInDays / options.recentThresholdInDays);
-
-	// Impact score with weighted components
-	const impactScore = stats.additions * options.additionsWeight + stats.deletions * options.deletionsWeight;
-
-	return Math.min(impactScore * (1 + recencyScore * options.recentWeight), options.maxScoreNormalization);
-}
-
-export function calculateDistribution<T extends string>(
-	stats: GitContributorsStats | undefined,
-	prefix: T,
-): Record<`${typeof prefix}${GitContributionTiers}`, number> {
-	if (stats == null) return {} as unknown as Record<`${typeof prefix}${GitContributionTiers}`, number>;
-
-	const distribution: Record<`${string}${GitContributionTiers}`, number> = {
-		[`${prefix}[1]`]: 0,
-		[`${prefix}[2-5]`]: 0,
-		[`${prefix}[6-10]`]: 0,
-		[`${prefix}[11-50]`]: 0,
-		[`${prefix}[51-100]`]: 0,
-		[`${prefix}[101+]`]: 0,
-	};
-
-	for (const c of stats.contributions) {
-		if (c === 1) {
-			distribution[`${prefix}[1]`]++;
-		} else if (c <= 5) {
-			distribution[`${prefix}[2-5]`]++;
-		} else if (c <= 10) {
-			distribution[`${prefix}[6-10]`]++;
-		} else if (c <= 50) {
-			distribution[`${prefix}[11-50]`]++;
-		} else if (c <= 100) {
-			distribution[`${prefix}[51-100]`]++;
-		} else {
-			distribution[`${prefix}[101+]`]++;
-		}
-	}
-
-	return distribution;
-}
-
-export function matchContributor(c: GitContributor, user: GitUser): boolean {
-	return c.name === user.name && c.email === user.email && c.username === user.username;
-}
-
-/** Appends `Co-authored-by:` trailers for the given coauthors to a commit message, replacing
- *  any existing trailer block. Each coauthor is the `Name <email>` form (GitContributor.coauthor). */
-export function appendCoauthorsToMessage(message: string, coauthors: Iterable<string>): string {
-	const index = message.indexOf('Co-authored-by: ');
-	if (index !== -1) {
-		message = message.substring(0, index - 1).trimEnd();
-	}
-
-	for (const coauthor of coauthors) {
-		let newlines;
-		if (message.includes('Co-authored-by: ')) {
-			newlines = '\n';
-		} else if (message.length !== 0 && message.endsWith('\n')) {
-			newlines = '\n\n';
-		} else {
-			newlines = '\n\n\n';
-		}
-
-		message += `${newlines}Co-authored-by: ${coauthor}`;
-	}
-
-	return message;
-}

package/src/git/utils/fetch.utils.ts

@@ -1,48 +0,0 @@
-const millisecondsPerMinute = 60 * 1000;
-const millisecondsPerHour = 60 * 60 * 1000;
-export const millisecondsPerDay = 24 * 60 * 60 * 1000;
-
-/**
- * Calculates the update interval for fetch status based on how long ago the last fetch occurred.
- * Uses stepped intervals to prevent thrashing from frequent recalculations.
- *
- * @param lastFetched - Timestamp (in milliseconds) of the last fetch
- * @returns Update interval in milliseconds
- *
- * Interval schedule:
- * - < 15 minutes ago: refresh every 5 minutes
- * - < 30 minutes ago: refresh every 10 minutes
- * - < 1 hour ago: refresh every 20 minutes
- * - < 3 hours ago: refresh every 1 hour
- * - < 6 hours ago: refresh every 2 hours
- * - < 12 hours ago: refresh every 4 hours
- * - < 2 days ago: refresh every 8 hours
- * - ≥ 2 days ago: refresh every 1 day
- */
-export function getLastFetchedUpdateInterval(lastFetched: number): number {
-	const timeDiff = Date.now() - lastFetched;
-
-	// Stepped intervals to prevent thrashing
-	if (timeDiff < 15 * millisecondsPerMinute) {
-		return 5 * millisecondsPerMinute;
-	}
-	if (timeDiff < 30 * millisecondsPerMinute) {
-		return 10 * millisecondsPerMinute;
-	}
-	if (timeDiff < millisecondsPerHour) {
-		return 20 * millisecondsPerMinute;
-	}
-	if (timeDiff < 3 * millisecondsPerHour) {
-		return millisecondsPerHour;
-	}
-	if (timeDiff < 6 * millisecondsPerHour) {
-		return 2 * millisecondsPerHour;
-	}
-	if (timeDiff < 12 * millisecondsPerHour) {
-		return 4 * millisecondsPerHour;
-	}
-	if (timeDiff < 2 * millisecondsPerDay) {
-		return 8 * millisecondsPerHour;
-	}
-	return millisecondsPerDay;
-}

package/src/git/utils/fileStatus.utils.ts

@@ -1,62 +0,0 @@
-import type { GitFileConflictStatus, GitFileStatus } from '../models/fileStatus.js';
-
-const statusIconsMap = {
-	'.': undefined,
-	'!': 'icon-status-ignored.svg',
-	'?': 'icon-status-untracked.svg',
-	A: 'icon-status-added.svg',
-	D: 'icon-status-deleted.svg',
-	M: 'icon-status-modified.svg',
-	R: 'icon-status-renamed.svg',
-	C: 'icon-status-copied.svg',
-	AA: 'icon-status-conflict.svg',
-	AU: 'icon-status-conflict.svg',
-	UA: 'icon-status-conflict.svg',
-	DD: 'icon-status-conflict.svg',
-	DU: 'icon-status-conflict.svg',
-	UD: 'icon-status-conflict.svg',
-	UU: 'icon-status-conflict.svg',
-	T: 'icon-status-modified.svg',
-	U: 'icon-status-modified.svg',
-};
-
-export function getGitFileStatusIcon(status: GitFileStatus): string {
-	return statusIconsMap[status] ?? 'icon-status-unknown.svg';
-}
-
-const statusTextMap = {
-	'.': 'Unchanged',
-	'!': 'Ignored',
-	'?': 'Untracked',
-	A: 'Added',
-	D: 'Deleted',
-	M: 'Modified',
-	R: 'Renamed',
-	C: 'Copied',
-	AA: 'Added (Both)',
-	AU: 'Added (Current)',
-	UA: 'Added (Incoming)',
-	DD: 'Deleted (Both)',
-	DU: 'Deleted (Current)',
-	UD: 'Deleted (Incoming)',
-	UU: 'Modified (Both)',
-	T: 'Modified',
-	U: 'Updated but Unmerged',
-};
-
-export function getGitFileStatusText(status: GitFileStatus | keyof typeof statusTextMap): string {
-	return statusTextMap[status] ?? 'Unknown';
-}
-
-const conflictStatuses = new Set<string>(['U', 'AA', 'AU', 'UA', 'DD', 'DU', 'UD', 'UU']);
-
-export function isConflictStatus(status: string | undefined): status is 'U' | GitFileConflictStatus {
-	return status != null && conflictStatuses.has(status);
-}
-
-/** Repo-relative pathspec entries for a file. Renames/copies need BOTH sides: git applies pathspec limiting
- *  before rename detection, so `git diff -- <new>` drops the old path's deletion and the patch reads as a
- *  bare add (applying it duplicates the file instead of renaming it). */
-export function getFileDiffPathspecs(file: { path: string; originalPath?: string }): string[] {
-	return file.originalPath ? [file.path, file.originalPath] : [file.path];
-}

package/src/git/utils/graph.utils.ts

@@ -1,46 +0,0 @@
-import type { GitGraphRow } from '../models/graph.js';
-
-/**
- * Cursor-anchored concatenation of an accumulated rows window with a freshly-paged set — the SAME
- * cursor-anchored append the graph webview's reducer performs: keep prior rows up to and including the
- * cursor sha (trimming anything below it), then append the page; a cursor missing from the prior rows
- * appends after all of them (the reducer's fallthrough).
- *
- * Owns the canonical cursor-trim rule for the provider-side accumulated window (`GitGraphSession.window`)
- * and the host's rows mirror. Its ledger analogue (`appendRowsLedger` in the graph webview's
- * `graphRowsSplice.ts`) MUST stay in lockstep with this so the row mirror and its fingerprint ledger
- * can't drift.
- */
-export function appendRowsAtCursor(
-	prior: readonly GitGraphRow[],
-	startingCursor: string,
-	page: readonly GitGraphRow[],
-): GitGraphRow[] {
-	const cursorIndex = prior.findIndex(r => r.sha === startingCursor);
-	const keep = cursorIndex >= 0 ? cursorIndex + 1 : prior.length;
-	// Single-pass copy: preallocate the exact length, copy the kept prefix, then append the page — avoids
-	// the intermediate array a `slice` + double-spread allocates.
-	const result = new Array<GitGraphRow>(keep + page.length);
-	for (let i = 0; i < keep; i++) {
-		result[i] = prior[i];
-	}
-	for (let i = 0; i < page.length; i++) {
-		result[keep + i] = page[i];
-	}
-	return result;
-}
-
-/**
- * Write-once cross-generation avatar merge: carry a prior graph generation's resolved avatar URLs forward into
- * a fresh generation's map WITHOUT overwriting its own entries. Resolved URLs are cheap to keep across a
- * rebuild/page and the fresh map's entries always win, so a stale carry-forward can never clobber current data.
- */
-export function mergeAvatarsForward(prior: ReadonlyMap<string, string>, incoming: Map<string, string>): void {
-	if (prior.size === 0) return;
-
-	for (const [email, url] of prior) {
-		if (!incoming.has(email)) {
-			incoming.set(email, url);
-		}
-	}
-}

package/src/git/utils/issue.utils.ts

@@ -1,177 +0,0 @@
-import type {
-	Issue,
-	IssueRepositoryIdentityDescriptor,
-	IssueShape,
-	IssueSortField,
-	IssueSorting,
-} from '../models/issue.js';
-import { defaultIssueSort } from '../models/issue.js';
-
-/**
- * How each sort field is read off an {@link IssueShape}, for the reads that MERGE several provider queries and so
- * have to order the union themselves instead of letting the provider do it.
- *
- * Only the fields the shape actually carries appear. `priority`, `dueDate` and `resolved` are absent because
- * `IssueOrPullRequest`/`IssueShape` doesn't model them: a provider may well order by them server-side on a
- * single-query read, but a merged one cannot — which is exactly what {@link getIssueComparator} returning
- * `undefined` lets its caller refuse, instead of concatenating unordered runs and calling them sorted.
- */
-const issueSortValues: Partial<Record<IssueSortField, (issue: IssueShape) => number | Date | string | undefined>> = {
-	created: i => i.createdDate,
-	updated: i => i.updatedDate,
-	closed: i => i.closedDate,
-	comments: i => i.commentsCount,
-	reactions: i => i.thumbsUpCount,
-	title: i => i.title,
-};
-
-/**
- * The order a read that ALWAYS orders is being made under: the caller's key, or the facade's default.
- *
- * The one place `?? defaultIssueSort` may be written. Several things downstream must agree on the answer — the
- * emitted provider qualifier, the fingerprint sealed into a cursor, the comparator that re-sorts a merged page and
- * the ceiling warning that names the order — and re-deriving the fallback at each is how they come to disagree,
- * which is not cosmetic: a cursor sealed with a key its query wasn't built with makes the fingerprint check refuse
- * valid resumptions.
- *
- * Note this is for a surface that CAN always order. A read whose provider may not express even the default resolves
- * through `resolveIssueSort` instead, which can answer "leave the provider's own order".
- */
-export function effectiveIssueSort(sort: IssueSorting | undefined): IssueSorting {
-	return sort ?? defaultIssueSort;
-}
-
-/**
- * A comparator for one sort key over normalized issues, or `undefined` when the field isn't derivable from an
- * {@link IssueShape} — the signal that the key is only honorable on a SINGLE-origin read, where the provider
- * already ordered the page.
- *
- * `@gitkraken/provider-apis` carries a twin of this over its own `Issue` shape (`src/issueSort.ts`), which it uses
- * for the merges it performs itself. It is not importable — the SDK does not export it, and it takes a different
- * shape — so the two are separate implementations of one rule, and the rule below is the part that must not drift.
- *
- * Missing values sort LAST in both directions. That is deliberately not the same as negating the descending
- * comparator (which would float them to the front when ascending), and it is why they're partitioned before any
- * arithmetic rather than mapped to an infinite sentinel: two missing values have to compare equal, and
- * `-Infinity - -Infinity` is `NaN`, which makes the comparator inconsistent and the resulting order
- * implementation-defined.
- *
- * Note it orders whatever it is handed. Sorting a page that was already capped does not make it the top N.
- *
- * KNOWN DIVERGENCE, `title` only: strings are compared by code unit, so `'B' < 'a'`. A single-scope read is
- * ordered by the provider's own database instead — case-insensitive and accent-aware — so the same `title:asc`
- * yields "Banana, apple, ábaco" from a merged page and "ábaco, apple, Banana" from one repository. Deliberately
- * NOT fixed with `localeCompare`: the SDK's twin comparator (which performs the merges core doesn't, notably
- * GitLab's repo-ids aggregate) compares by code unit, so switching here would make two paths of the SAME
- * multi-repo read disagree — a worse divergence than the one it closes, and it would break the parity test in
- * `issueSortCapabilities.test.ts`. Closing this properly means changing the rule on BOTH sides at once; until
- * then it is a cosmetic ordering difference on one key, not wrong data.
- */
-export function getIssueComparator(sort: IssueSorting): ((a: IssueShape, b: IssueShape) => number) | undefined {
-	// The union's shape guarantees both halves, so this needs no validation — only the cast tsc can't infer.
-	const [field, direction] = sort.split(':') as [IssueSortField, 'asc' | 'desc'];
-	const getValue = issueSortValues[field];
-	if (getValue == null) return undefined;
-
-	return (a, b) => {
-		const left = toComparable(getValue(a));
-		const right = toComparable(getValue(b));
-		if (left == null || right == null) {
-			if (left == null && right == null) return 0;
-			return left == null ? 1 : -1;
-		}
-
-		const ordered = left < right ? -1 : left > right ? 1 : 0;
-		return direction === 'asc' ? ordered : -ordered;
-	};
-}
-
-function toComparable(value: number | Date | string | undefined): number | string | undefined {
-	return value instanceof Date ? value.getTime() : value;
-}
-
-export function getRepositoryIdentityForIssue(issue: IssueShape | Issue): IssueRepositoryIdentityDescriptor {
-	if (issue.repository == null) throw new Error('Missing repository');
-
-	return {
-		remote: {
-			url: issue.repository.url,
-			domain: issue.provider.domain,
-		},
-		name: `${issue.repository.owner}/${issue.repository.repo}`,
-		provider: {
-			id: issue.provider.id,
-			domain: issue.provider.domain,
-			repoDomain: issue.repository.owner,
-			repoName: issue.repository.repo,
-			repoOwnerDomain: issue.repository.owner,
-		},
-	};
-}
-
-export function serializeIssue(value: IssueShape): IssueShape {
-	const serialized: IssueShape = {
-		type: value.type,
-		provider: {
-			id: value.provider.id,
-			name: value.provider.name,
-			domain: value.provider.domain,
-			icon: value.provider.icon,
-		},
-		id: value.id,
-		nodeId: value.nodeId,
-		issueType: value.issueType,
-		title: value.title,
-		url: value.url,
-		createdDate: value.createdDate,
-		updatedDate: value.updatedDate,
-		closedDate: value.closedDate,
-		closed: value.closed,
-		state: value.state,
-		author:
-			value.author == null
-				? undefined
-				: {
-						id: value.author.id,
-						name: value.author.name,
-						username: value.author.username,
-						avatarUrl: value.author.avatarUrl,
-						url: value.author.url,
-					},
-		repository:
-			value.repository == null
-				? undefined
-				: {
-						owner: value.repository.owner,
-						repo: value.repository.repo,
-						url: value.repository.url,
-					},
-		project:
-			value.project == null
-				? undefined
-				: {
-						id: value.project.id,
-						name: value.project.name,
-						resourceId: value.project.resourceId,
-						resourceName: value.project.resourceName,
-					},
-		assignees: value.assignees.map(assignee => ({
-			id: assignee.id,
-			name: assignee.name,
-			username: assignee.username,
-			avatarUrl: assignee.avatarUrl,
-			url: assignee.url,
-		})),
-		labels:
-			value.labels == null
-				? undefined
-				: value.labels.map(label => ({
-						color: label.color,
-						name: label.name,
-					})),
-		commentsCount: value.commentsCount,
-		thumbsUpCount: value.thumbsUpCount,
-		body: value.body,
-	};
-	return serialized;
-}

package/src/git/utils/issueOrPullRequest.utils.ts

@@ -1,23 +0,0 @@
-import type { IssueOrPullRequest } from '../models/issueOrPullRequest.js';
-
-export function serializeIssueOrPullRequest(value: IssueOrPullRequest): IssueOrPullRequest {
-	const serialized: IssueOrPullRequest = {
-		type: value.type,
-		provider: {
-			id: value.provider.id,
-			name: value.provider.name,
-			domain: value.provider.domain,
-			icon: value.provider.icon,
-		},
-		id: value.id,
-		nodeId: value.nodeId,
-		title: value.title,
-		url: value.url,
-		createdDate: value.createdDate,
-		updatedDate: value.updatedDate,
-		closedDate: value.closedDate,
-		closed: value.closed,
-		state: value.state,
-	};
-	return serialized;
-}

package/src/git/utils/mergeConflicts.utils.ts

@@ -1,21 +0,0 @@
-import type { ConflictDetectionErrorReason, ConflictDetectionResult } from '../models/mergeConflicts.js';
-
-export function createConflictDetectionError(reason: ConflictDetectionErrorReason): ConflictDetectionResult {
-	return { status: 'error', reason: reason, message: getConflictDetectionErrorMessage(reason) };
-}
-
-function getConflictDetectionErrorMessage(reason: ConflictDetectionErrorReason): string {
-	switch (reason) {
-		case 'unsupported':
-			return 'Unable to detect conflicts because Git 2.38 or later is required';
-		case 'noParent':
-			return 'Unable to detect conflicts because the selection includes the initial commit';
-		case 'noMergeBase':
-			return "Unable to detect conflicts because the branches don't share a common history";
-		case 'refNotFound':
-			return "Unable to detect conflicts because the branch or commit doesn't exist";
-		case 'other':
-		default:
-			return 'Unable to detect conflicts';
-	}
-}