diff options
| author | 2026-03-06 21:19:56 +0800 | |
|---|---|---|
| committer | 2026-03-07 00:34:30 +0800 | |
| commit | 01d15bccf3b1dcc51516b1f64d50950b31d7f8fb (patch) | |
| tree | e491fcc762c67c1ef4ce54faafc5dafdb734ae8a /mergebase/compute.go | |
| parent | objectstored/refstore: Weird ireturn behavior (diff) | |
| signature | No signature | |
Urgh I made some wrong amends and I'm too tired to separate the commits out this time
ancestor: Split out of reachability
mergebase: Add merge base routines
internal/commitquery: Add commit query context engine thingy
internal/peel: Shared tag peeling
errors: Shared object query errors
internal/testgit: Add rooted repo helpers; remove raw path access
objectstore/memory: Add in-memory object store
objectid: Add Compare helper
Diffstat (limited to 'mergebase/compute.go')
| -rw-r--r-- | mergebase/compute.go | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/mergebase/compute.go b/mergebase/compute.go new file mode 100644 index 00000000..0fae0aed --- /dev/null +++ b/mergebase/compute.go @@ -0,0 +1,56 @@ +package mergebase + +import ( + "slices" + + "codeberg.org/lindenii/furgit/internal/commitquery" + "codeberg.org/lindenii/furgit/internal/peel" + "codeberg.org/lindenii/furgit/objectid" +) + +func (query *Bases) compute() ([]objectid.ObjectID, error) { + leftCommit, err := peel.ToCommit(query.store, query.left) + if err != nil { + return nil, err + } + + rightCommit, err := peel.ToCommit(query.store, query.right) + if err != nil { + return nil, err + } + + ctx := commitquery.NewContext(query.store, query.graph) + + leftIdx, err := ctx.ResolveOID(leftCommit) + if err != nil { + return nil, err + } + + rightIdx, err := ctx.ResolveOID(rightCommit) + if err != nil { + return nil, err + } + + candidates, err := commitquery.MergeBases(ctx, leftIdx, rightIdx) + if err != nil { + return nil, err + } + + slices.SortFunc(candidates, func(left, right commitquery.NodeIndex) int { + switch { + case ctx.CommitTime(left) > ctx.CommitTime(right): + return -1 + case ctx.CommitTime(left) < ctx.CommitTime(right): + return 1 + default: + return objectid.Compare(ctx.ID(left), ctx.ID(right)) + } + }) + + out := make([]objectid.ObjectID, 0, len(candidates)) + for _, idx := range candidates { + out = append(out, ctx.ID(idx)) + } + + return out, nil +} |
