jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Remote: keep a pointer to the repo 

Make sure the finalizer doesn't get called too early, and unify where
that setup happens.
This commit is contained in:
Carlos Martín Nieto 2014-03-20 03:52:53 +01:00
parent 574f0dd12d
commit 9fc307a58d
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
remote.go
View File

@ -53,7 +53,18 @@ type RemoteCallbacks struct {
} }
type Remote struct { type Remote struct {
ptr *C.git_remote ptr *C.git_remote
repo *Repository
}
func newRemote(cremote *C.git_remote, repo *Repository) *Remote {
remote := &Remote {
ptr: cremote,
repo: repo,
}
runtime.SetFinalizer(remote, (*Remote).Free)
return remote
} }
func populateRemoteCallbacks(ptr *C.git_remote_callbacks, callbacks *RemoteCallbacks) { func populateRemoteCallbacks(ptr *C.git_remote_callbacks, callbacks *RemoteCallbacks) {
@ -129,11 +140,12 @@ func RemoteIsValidName(name string) bool {
func (r *Remote) Free() { func (r *Remote) Free() {
runtime.SetFinalizer(r, nil) runtime.SetFinalizer(r, nil)
r.repo = nil
C.git_remote_free(r.ptr) C.git_remote_free(r.ptr)
} }
func (repo *Repository) CreateRemote(name string, url string) (*Remote, error) { func (repo *Repository) CreateRemote(name string, url string) (*Remote, error) {
remote := &Remote{} var ptr *C.git_remote
cname := C.CString(name) cname := C.CString(name)
defer C.free(unsafe.Pointer(cname)) defer C.free(unsafe.Pointer(cname))
@ -143,16 +155,16 @@ func (repo *Repository) CreateRemote(name string, url string) (*Remote, error) {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ret := C.git_remote_create(&remote.ptr, repo.ptr, cname, curl) ret := C.git_remote_create(&ptr, repo.ptr, cname, curl)
if ret < 0 { if ret < 0 {
return nil, MakeGitError(ret) return nil, MakeGitError(ret)
} }
runtime.SetFinalizer(remote, (*Remote).Free)
return remote, nil return newRemote(ptr, repo), nil
} }
func (repo *Repository) CreateRemoteWithFetchspec(name string, url string, fetch string) (*Remote, error) { func (repo *Repository) CreateRemoteWithFetchspec(name string, url string, fetch string) (*Remote, error) {
remote := &Remote{} var ptr *C.git_remote
cname := C.CString(name) cname := C.CString(name)
defer C.free(unsafe.Pointer(cname)) defer C.free(unsafe.Pointer(cname))
@ -164,16 +176,16 @@ func (repo *Repository) CreateRemoteWithFetchspec(name string, url string, fetch
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ret := C.git_remote_create_with_fetchspec(&remote.ptr, repo.ptr, cname, curl, cfetch) ret := C.git_remote_create_with_fetchspec(&ptr, repo.ptr, cname, curl, cfetch)
if ret < 0 { if ret < 0 {
return nil, MakeGitError(ret) return nil, MakeGitError(ret)
} }
runtime.SetFinalizer(remote, (*Remote).Free)
return remote, nil return newRemote(ptr, repo), nil
} }
func (repo *Repository) CreateRemoteInMemory(fetch string, url string) (*Remote, error) { func (repo *Repository) CreateRemoteInMemory(fetch string, url string) (*Remote, error) {
remote := &Remote{} var ptr *C.git_remote
curl := C.CString(url) curl := C.CString(url)
defer C.free(unsafe.Pointer(curl)) defer C.free(unsafe.Pointer(curl))
@ -183,16 +195,16 @@ func (repo *Repository) CreateRemoteInMemory(fetch string, url string) (*Remote,
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ret := C.git_remote_create_inmemory(&remote.ptr, repo.ptr, cfetch, curl) ret := C.git_remote_create_inmemory(&ptr, repo.ptr, cfetch, curl)
if ret < 0 { if ret < 0 {
return nil, MakeGitError(ret) return nil, MakeGitError(ret)
} }
runtime.SetFinalizer(remote, (*Remote).Free)
return remote, nil return newRemote(ptr, repo), nil
} }
func (repo *Repository) LoadRemote(name string) (*Remote, error) { func (repo *Repository) LoadRemote(name string) (*Remote, error) {
remote := &Remote{} var ptr *C.git_remote
cname := C.CString(name) cname := C.CString(name)
defer C.free(unsafe.Pointer(cname)) defer C.free(unsafe.Pointer(cname))
@ -200,12 +212,12 @@ func (repo *Repository) LoadRemote(name string) (*Remote, error) {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ret := C.git_remote_load(&remote.ptr, repo.ptr, cname) ret := C.git_remote_load(&ptr, repo.ptr, cname)
if ret < 0 { if ret < 0 {
return nil, MakeGitError(ret) return nil, MakeGitError(ret)
} }
runtime.SetFinalizer(remote, (*Remote).Free)
return remote, nil return newRemote(ptr, repo), nil
} }
func (o *Remote) Save() error { func (o *Remote) Save() error {