just-git 1.5.7 → 1.5.9

package/dist/repo/index.d.ts

@@ -1,5 +1,5 @@
 import { g as GitRepo, Z as RefEntry, e as Commit, a3 as TreeEntry, i as ObjectId, h as Identity, a4 as TreeDiffEntry, d as GitContext, F as FileSystem } from '../hooks-CimfP56a.js';
-export { B as BuildCommitOptions, b as CommitAuthor, c as CommitIdentity, C as CommitOptions, a as CommitResult, d as CreateAnnotatedTagOptions, e as CreateCommitOptions, T as TreeEntryInput, f as TreeUpdate, g as buildCommit, h as commit, i as createAnnotatedTag, j as createCommit, u as updateTree, w as writeBlob, k as writeTree } from '../writing-CF-eYohc.js';
+export { B as BuildCommitOptions, C as CommitAuthor, a as CommitIdentity, b as CommitOptions, c as CommitResult, d as CreateAnnotatedTagOptions, e as CreateCommitOptions, T as TreeEntryInput, f as TreeUpdate, g as buildCommit, h as commit, i as createAnnotatedTag, j as createCommit, u as updateTree, w as writeBlob, k as writeTree } from '../writing-IwfRRrts.js';
 
 /** Extract the short branch name from a full ref path like "refs/heads/main" → "main". */
 declare function branchNameFromRef(ref: string): string;
@@ -281,6 +281,45 @@ interface MergeConflict {
     theirsOrigPath?: string;
 }
 
+/**
+ * merge-ort — Three-way merge engine modeled after Git's merge-ort.c.
+ *
+ * Key insight: the entire merge is computed in-core first (producing a
+ * result tree with conflict-marker blobs embedded), then a standard
+ * two-way checkout applies the result to the worktree.
+ *
+ * Three phases:
+ *   1. collectMergeInfo  — flatten three trees, build per-path ConflictInfo
+ *   2. detectAndProcessRenames — rename detection, update path map
+ *   3. processEntries — resolve conflicts, content merge, build result tree
+ *
+ * The recursive wrapper (mergeOrtRecursive) handles criss-cross merges
+ * by pairwise-merging multiple LCAs into a virtual base tree.
+ */
+
+/**
+ * Custom content merge callback. Called during three-way merge before the
+ * default line-based diff3 algorithm. Analogous to git's `.gitattributes`
+ * `merge=` drivers, but as an async callback rather than a shell command.
+ *
+ * Return a result to override the default merge, or `null` to fall back
+ * to diff3. When `conflict` is `false`, the content is written as a clean
+ * stage-0 entry. When `conflict` is `true`, the original base/ours/theirs
+ * blobs are preserved as index stages 1/2/3 (so `--ours`/`--theirs`
+ * checkout still works) and the returned content becomes the worktree blob.
+ */
+type MergeDriver = (ctx: {
+    path: string;
+    base: string | null;
+    ours: string;
+    theirs: string;
+}) => MergeDriverResult | null | Promise<MergeDriverResult | null>;
+/** Result from a {@link MergeDriver} callback. */
+interface MergeDriverResult {
+    content: string;
+    conflict: boolean;
+}
+
 /** Result of a tree-level merge via {@link mergeTrees} or {@link mergeTreesFromTreeHashes}. */
 interface MergeTreesResult {
     /** Hash of the result tree (may contain conflict-marker blobs). */
@@ -303,18 +342,20 @@ interface MergeTreesResult {
  * Use `mergeTreesFromTreeHashes` if you already have tree hashes and a
  * known base tree.
  */
-declare function mergeTrees(repo: GitRepo, oursCommit: string, theirsCommit: string, labels?: {
+declare function mergeTrees(repo: GitRepo, oursCommit: string, theirsCommit: string, options?: {
     ours?: string;
     theirs?: string;
+    mergeDriver?: MergeDriver;
 }): Promise<MergeTreesResult>;
 /**
  * Three-way tree merge from raw tree hashes. Useful when you already
  * have the base/ours/theirs trees and don't want automatic merge-base
  * computation.
  */
-declare function mergeTreesFromTreeHashes(repo: GitRepo, baseTree: string | null, oursTree: string, theirsTree: string, labels?: {
+declare function mergeTreesFromTreeHashes(repo: GitRepo, baseTree: string | null, oursTree: string, theirsTree: string, options?: {
     ours?: string;
     theirs?: string;
+    mergeDriver?: MergeDriver;
 }): Promise<MergeTreesResult>;
 
 /** Result of {@link extractTree}. */
@@ -574,4 +615,4 @@ declare function readonlyRepo(repo: GitRepo): GitRepo;
  */
 declare function overlayRepo(repo: GitRepo): GitRepo;
 
-export { type BisectOptions, type BisectSearchResult, type BisectStepInfo, type BlameEntry, Commit, type CommitInfo, type CreateWorktreeOptions, type DiffHunk, type DiffOptions, type ExtractTreeResult, type FileDiff, type FlatTreeEntry, GitRepo, type GrepFileMatch, type GrepMatch, type GrepOptions, type HeadInfo, Identity, type MaterializeTarget, type MergeConflict, type MergeTreesResult, RefEntry, type TreeAccessor, TreeDiffEntry, TreeEntry, type WorktreeResult, bisect, blame, branchNameFromRef, countAheadBehind, createSandboxWorktree, createTreeAccessor, createWorktree, diffCommits, diffTrees, extractTree, findMergeBases, flattenTree, formatDiff, getChangedFiles, getNewCommits, grep, isAncestor, listBranches, listTags, mergeTrees, mergeTreesFromTreeHashes, overlayRepo, readBlob, readBlobText, readCommit, readFileAtCommit, readHead, readTree, readonlyRepo, resolveRef, tagNameFromRef, walkCommitHistory };
+export { type BisectOptions, type BisectSearchResult, type BisectStepInfo, type BlameEntry, Commit, type CommitInfo, type CreateWorktreeOptions, type DiffHunk, type DiffOptions, type ExtractTreeResult, type FileDiff, type FlatTreeEntry, GitRepo, type GrepFileMatch, type GrepMatch, type GrepOptions, type HeadInfo, Identity, type MaterializeTarget, type MergeConflict, type MergeDriver, type MergeDriverResult, type MergeTreesResult, RefEntry, type TreeAccessor, TreeDiffEntry, TreeEntry, type WorktreeResult, bisect, blame, branchNameFromRef, countAheadBehind, createSandboxWorktree, createTreeAccessor, createWorktree, diffCommits, diffTrees, extractTree, findMergeBases, flattenTree, formatDiff, getChangedFiles, getNewCommits, grep, isAncestor, listBranches, listTags, mergeTrees, mergeTreesFromTreeHashes, overlayRepo, readBlob, readBlobText, readCommit, readFileAtCommit, readHead, readTree, readonlyRepo, resolveRef, tagNameFromRef, walkCommitHistory };