1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
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
}
|
