Merge branch 'master' into custom_odb

Conflicts:
	odb.go
	wrapper.c

1 files changed, 121 insertions, 13 deletions

diff --git a/walk.go b/walk.go
index 6979b6b..f7c147d 100644
--- a/walk.go
+++ b/walk.go
@@ -9,16 +9,18 @@ import "C"
 import (
 	"io"
 	"runtime"
+	"unsafe"
 )
 
 // RevWalk
 
 type SortType uint
+
 const (
-	SortNone SortType = C.GIT_SORT_NONE
-	SortTopological   = C.GIT_SORT_TOPOLOGICAL
-	SortTime          = C.GIT_SORT_TIME
-	SortReverse       = C.GIT_SORT_REVERSE
+	SortNone        SortType = C.GIT_SORT_NONE
+	SortTopological          = C.GIT_SORT_TOPOLOGICAL
+	SortTime                 = C.GIT_SORT_TIME
+	SortReverse              = C.GIT_SORT_REVERSE
 )
 
 type RevWalk struct {
@@ -26,12 +28,67 @@ type RevWalk struct {
 	repo *Repository
 }
 
+func revWalkFromC(repo *Repository, c *C.git_revwalk) *RevWalk {
+	v := &RevWalk{ptr: c, repo: repo}
+	runtime.SetFinalizer(v, (*RevWalk).Free)
+	return v
+}
+
 func (v *RevWalk) Reset() {
 	C.git_revwalk_reset(v.ptr)
 }
 
-func (v *RevWalk) Push(id *Oid) {
-	C.git_revwalk_push(v.ptr, id.toC())
+func (v *RevWalk) Push(id *Oid) error {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ecode := C.git_revwalk_push(v.ptr, id.toC())
+	if ecode < 0 {
+		return MakeGitError(ecode)
+	}
+	return nil
+}
+
+func (v *RevWalk) PushGlob(glob string) error {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	cstr := C.CString(glob)
+	defer C.free(unsafe.Pointer(cstr))
+
+	ecode := C.git_revwalk_push_glob(v.ptr, cstr)
+	if ecode < 0 {
+		return MakeGitError(ecode)
+	}
+	return nil
+}
+
+func (v *RevWalk) PushRange(r string) error {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	cstr := C.CString(r)
+	defer C.free(unsafe.Pointer(cstr))
+
+	ecode := C.git_revwalk_push_range(v.ptr, cstr)
+	if ecode < 0 {
+		return MakeGitError(ecode)
+	}
+	return nil
+}
+
+func (v *RevWalk) PushRef(r string) error {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	cstr := C.CString(r)
+	defer C.free(unsafe.Pointer(cstr))
+
+	ecode := C.git_revwalk_push_ref(v.ptr, cstr)
+	if ecode < 0 {
+		return MakeGitError(ecode)
+	}
+	return nil
 }
 
 func (v *RevWalk) PushHead() (err error) {
@@ -40,22 +97,71 @@ func (v *RevWalk) PushHead() (err error) {
 
 	ecode := C.git_revwalk_push_head(v.ptr)
 	if ecode < 0 {
-		err = LastError()
+		err = MakeGitError(ecode)
 	}
+	return nil
+}
 
-	return
+func (v *RevWalk) Hide(id *Oid) error {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ecode := C.git_revwalk_hide(v.ptr, id.toC())
+	if ecode < 0 {
+		return MakeGitError(ecode)
+	}
+	return nil
+}
+
+func (v *RevWalk) HideGlob(glob string) error {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	cstr := C.CString(glob)
+	defer C.free(unsafe.Pointer(cstr))
+
+	ecode := C.git_revwalk_hide_glob(v.ptr, cstr)
+	if ecode < 0 {
+		return MakeGitError(ecode)
+	}
+	return nil
 }
 
-func (v *RevWalk) Next(oid *Oid) (err error) {
+func (v *RevWalk) HideRef(r string) error {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	ret := C.git_revwalk_next(oid.toC(), v.ptr)
+	cstr := C.CString(r)
+	defer C.free(unsafe.Pointer(cstr))
+
+	ecode := C.git_revwalk_hide_ref(v.ptr, cstr)
+	if ecode < 0 {
+		return MakeGitError(ecode)
+	}
+	return nil
+}
+
+func (v *RevWalk) HideHead() (err error) {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ecode := C.git_revwalk_hide_head(v.ptr)
+	if ecode < 0 {
+		err = MakeGitError(ecode)
+	}
+	return nil
+}
+
+func (v *RevWalk) Next(id *Oid) (err error) {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_revwalk_next(id.toC(), v.ptr)
 	switch {
 	case ret == ITEROVER:
 		err = io.EOF
 	case ret < 0:
-		err = LastError()
+		err = MakeGitError(ret)
 	}
 
 	return
@@ -92,6 +198,8 @@ func (v *RevWalk) Sorting(sm SortType) {
 	C.git_revwalk_sorting(v.ptr, C.uint(sm))
 }
 
-func freeRevWalk(walk *RevWalk) {
-	C.git_revwalk_free(walk.ptr)
+func (v *RevWalk) Free() {
+
+	runtime.SetFinalizer(v, nil)
+	C.git_revwalk_free(v.ptr)
 }