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
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
|
package git
/*
#include <git2.h>
#include <git2/errors.h>
extern git_merge_head** _go_git_make_merge_head_array(size_t len);
extern void _go_git_merge_head_array_set(git_merge_head** array, git_merge_head* ptr, size_t n);
extern git_merge_head* _go_git_merge_head_array_get(git_merge_head** array, size_t n);
*/
import "C"
import (
"runtime"
"unsafe"
)
type MergeHead struct {
ptr *C.git_merge_head
}
func newMergeHeadFromC(c *C.git_merge_head) *MergeHead {
mh := &MergeHead{ptr: c}
runtime.SetFinalizer(mh, (*MergeHead).Free)
return mh
}
func (mh *MergeHead) Free() {
C.git_merge_head_free(mh.ptr)
runtime.SetFinalizer(mh, nil)
}
func (r *Repository) MergeHeadFromFetchHead(branchName string, remoteURL string, oid *Oid) (*MergeHead, error) {
mh := &MergeHead{}
cbranchName := C.CString(branchName)
defer C.free(unsafe.Pointer(cbranchName))
cremoteURL := C.CString(remoteURL)
defer C.free(unsafe.Pointer(cremoteURL))
ret := C.git_merge_head_from_fetchhead(&mh.ptr, r.ptr, cbranchName, cremoteURL, oid.toC())
if ret < 0 {
return nil, MakeGitError(ret)
}
runtime.SetFinalizer(mh, (*MergeHead).Free)
return mh, nil
}
func (r *Repository) MergeHeadFromId(oid *Oid) (*MergeHead, error) {
mh := &MergeHead{}
ret := C.git_merge_head_from_id(&mh.ptr, r.ptr, oid.toC())
if ret < 0 {
return nil, MakeGitError(ret)
}
runtime.SetFinalizer(mh, (*MergeHead).Free)
return mh, nil
}
func (r *Repository) MergeHeadFromRef(ref *Reference) (*MergeHead, error) {
mh := &MergeHead{}
ret := C.git_merge_head_from_ref(&mh.ptr, r.ptr, ref.ptr)
if ret < 0 {
return nil, MakeGitError(ret)
}
runtime.SetFinalizer(mh, (*MergeHead).Free)
return mh, nil
}
type MergeFlag int
const (
MergeFlagDefault MergeFlag = 0
MergeNoFastForward = 1
MergeFastForwardOnly = 2
)
type MergeOptions struct {
Version uint
Flags MergeFlag
TreeOptions MergeTreeOptions
//TODO: CheckoutOptions CheckoutOptions
}
func (mo *MergeOptions) toC() *C.git_merge_opts {
return &C.git_merge_opts{
version: C.uint(mo.Version),
merge_flags: C.git_merge_flags_t(mo.Flags),
merge_tree_opts: *mo.TreeOptions.toC(),
}
}
type MergeTreeFlag int
const (
MergeTreeFindRenames MergeTreeFlag = 1 << 0
)
type MergeFileFavorType int
const (
MergeFileFavorNormal MergeFileFavorType = 0
MergeFileFavorOurs = 1
MergeFileFavorTheirs = 2
MergeFileFavorUnion = 3
)
type MergeTreeOptions struct {
Version uint
Flags MergeTreeFlag
RenameThreshold uint
TargetLimit uint
//TODO: SimilarityMetric *DiffSimilarityMetric
FileFavor MergeFileFavorType
}
func (mo *MergeTreeOptions) toC() *C.git_merge_tree_opts {
return &C.git_merge_tree_opts{
version: C.uint(mo.Version),
flags: C.git_merge_tree_flag_t(mo.Flags),
rename_threshold: C.uint(mo.RenameThreshold),
target_limit: C.uint(mo.TargetLimit),
file_favor: C.git_merge_file_favor_t(mo.FileFavor),
}
}
type MergeResult struct {
ptr *C.git_merge_result
}
func newMergeResultFromC(c *C.git_merge_result) *MergeResult {
mr := &MergeResult{ptr: c}
runtime.SetFinalizer(mr, (*MergeResult).Free)
return mr
}
func (mr *MergeResult) Free() {
runtime.SetFinalizer(mr, nil)
C.git_merge_result_free(mr.ptr)
}
func (mr *MergeResult) IsFastForward() bool {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
ret := C.git_merge_result_is_fastforward(mr.ptr)
return ret != 0
}
func (mr *MergeResult) IsUpToDate() bool {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
ret := C.git_merge_result_is_uptodate(mr.ptr)
return ret != 0
}
func (mr *MergeResult) FastForwardId() (*Oid, error) {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
var oid C.git_oid
ret := C.git_merge_result_fastforward_id(&oid, mr.ptr)
if ret < 0 {
return nil, MakeGitError(ret)
}
return newOidFromC(&oid), nil
}
func (r *Repository) Merge(theirHeads []MergeHead, options MergeOptions) (*MergeResult, error) {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
var result *C.git_merge_result
copts := options.toC()
cmerge_head_array := C._go_git_make_merge_head_array(C.size_t(len(theirHeads)))
defer C.free(unsafe.Pointer(cmerge_head_array))
for i, _ := range theirHeads {
C._go_git_merge_head_array_set(cmerge_head_array, theirHeads[i].ptr, C.size_t(i))
}
err := C.git_merge(&result, r.ptr, cmerge_head_array, C.size_t(len(theirHeads)), copts)
if err < 0 {
return nil, MakeGitError(err)
}
return newMergeResultFromC(result), nil
}
func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options MergeTreeOptions) (*Index, error) {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
copts := options.toC()
idx := &Index{}
ret := C.git_merge_commits(&idx.ptr, r.ptr, ours.ptr, theirs.ptr, copts)
if ret < 0 {
return nil, MakeGitError(ret)
}
runtime.SetFinalizer(idx, (*Index).Free)
return idx, nil
}
func (r *Repository) MergeTrees(ancestor *Tree, ours *Tree, theirs *Tree, options MergeTreeOptions) (*Index, error) {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
copts := options.toC()
idx := &Index{}
ret := C.git_merge_trees(&idx.ptr, r.ptr, ancestor.ptr, ours.ptr, theirs.ptr, copts)
if ret < 0 {
return nil, MakeGitError(ret)
}
runtime.SetFinalizer(idx, (*Index).Free)
return idx, nil
}
func (r *Repository) MergeBase(one *Oid, two *Oid) (*Oid, error) {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
var oid C.git_oid
ret := C.git_merge_base(&oid, r.ptr, one.toC(), two.toC())
if ret < 0 {
return nil, MakeGitError(ret)
}
return newOidFromC(&oid), nil
}
//TODO: int git_merge_base_many(git_oid *out, git_repository *repo, size_t length, const git_oid input_array[]);
|
