git2go/cherrypick.go at main · libgit2/git2go · GitHub

Name: git2go/cherrypick.go at main · libgit2/git2go · GitHub
Rating: 4.6 (2384 reviews)
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
package git

/*
#include <git2.h>
*/
import"C"
import (
"runtime"
)

typeCherrypickOptionsstruct {
Mainlineuint
MergeOptionsMergeOptions
CheckoutOptionsCheckoutOptions
}

funccherrypickOptionsFromC(c*C.git_cherrypick_options) CherrypickOptions {
opts:=CherrypickOptions{
Mainline: uint(c.mainline),
MergeOptions: mergeOptionsFromC(&c.merge_opts),
CheckoutOptions: checkoutOptionsFromC(&c.checkout_opts),
 }
returnopts
}

funcpopulateCherrypickOptions(copts*C.git_cherrypick_options, opts*CherrypickOptions, errorTarget*error) *C.git_cherrypick_options {
C.git_cherrypick_options_init(copts, C.GIT_CHERRYPICK_OPTIONS_VERSION)
ifopts==nil {
returnnil
 }
copts.mainline=C.uint(opts.Mainline)
populateMergeOptions(&copts.merge_opts, &opts.MergeOptions)
populateCheckoutOptions(&copts.checkout_opts, &opts.CheckoutOptions, errorTarget)
returncopts
}

funcfreeCherrypickOpts(copts*C.git_cherrypick_options) {
ifcopts==nil {
return
 }
freeMergeOptions(&copts.merge_opts)
freeCheckoutOptions(&copts.checkout_opts)
}

funcDefaultCherrypickOptions() (CherrypickOptions, error) {
c:= C.git_cherrypick_options{}

runtime.LockOSThread()
deferruntime.UnlockOSThread()

ecode:=C.git_cherrypick_options_init(&c, C.GIT_CHERRYPICK_OPTIONS_VERSION)
ifecode<0 {
returnCherrypickOptions{}, MakeGitError(ecode)
 }
deferfreeCherrypickOpts(&c)
returncherrypickOptionsFromC(&c), nil
}

func (v*Repository) Cherrypick(commit*Commit, optsCherrypickOptions) error {
runtime.LockOSThread()
deferruntime.UnlockOSThread()

varerrerror
cOpts:=populateCherrypickOptions(&C.git_cherrypick_options{}, &opts, &err)
deferfreeCherrypickOpts(cOpts)

ret:=C.git_cherrypick(v.ptr, commit.cast_ptr, cOpts)
runtime.KeepAlive(v)
runtime.KeepAlive(commit)
ifret==C.int(ErrorCodeUser) &&err!=nil {
returnerr
 }
ifret<0 {
returnMakeGitError(ret)
 }
returnnil
}

func (r*Repository) CherrypickCommit(pick, our*Commit, optsCherrypickOptions) (*Index, error) {
runtime.LockOSThread()
deferruntime.UnlockOSThread()

cOpts:=populateMergeOptions(&C.git_merge_options{}, &opts.MergeOptions)
deferfreeMergeOptions(cOpts)

varptr*C.git_index
ret:=C.git_cherrypick_commit(&ptr, r.ptr, pick.cast_ptr, our.cast_ptr, C.uint(opts.Mainline), cOpts)
runtime.KeepAlive(pick)
runtime.KeepAlive(our)
ifret<0 {
returnnil, MakeGitError(ret)
 }
returnnewIndexFromC(ptr, r), nil
}