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
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
package commitquery
import (
"slices"
objectid "codeberg.org/lindenii/furgit/object/id"
)
// MergeBases reports all merge bases in Git's merge-base --all order.
//
// Both inputs are peeled through annotated tags before commit traversal.
func (query *Query) MergeBases(left, right objectid.ObjectID) ([]objectid.ObjectID, error) {
leftIdx, err := query.resolveCommitish(left)
if err != nil {
return nil, err
}
rightIdx, err := query.resolveCommitish(right)
if err != nil {
return nil, err
}
candidates, err := query.mergeBases(leftIdx, rightIdx)
if err != nil {
return nil, err
}
slices.SortFunc(candidates, func(left, right nodeIndex) int {
switch {
case query.commitTime(left) > query.commitTime(right):
return -1
case query.commitTime(left) < query.commitTime(right):
return 1
default:
return objectid.Compare(query.id(left), query.id(right))
}
})
out := make([]objectid.ObjectID, 0, len(candidates))
for _, idx := range candidates {
out = append(out, query.id(idx))
}
return out, nil
}
// MergeBase reports one merge base between left and right, if any.
func (query *Query) MergeBase(left, right objectid.ObjectID) (objectid.ObjectID, bool, error) {
bases, err := query.MergeBases(left, right)
if err != nil {
return objectid.ObjectID{}, false, err
}
if len(bases) == 0 {
return objectid.ObjectID{}, false, nil
}
return bases[0], true, nil
}
func (query *Query) mergeBases(left, right nodeIndex) ([]nodeIndex, error) {
if left == right {
return []nodeIndex{left}, nil
}
err := query.paintDownToCommon(left, []nodeIndex{right}, 0)
if err != nil {
return nil, err
}
candidates := query.collectMarkedResults()
if len(candidates) <= 1 {
slices.SortFunc(candidates, query.compare)
return candidates, nil
}
query.clearTouchedMarks(allMarks)
reduced, err := removeRedundant(query, candidates)
if err != nil {
return nil, err
}
slices.SortFunc(reduced, query.compare)
return reduced, nil
}
|
