Merge branch 'master' into custom_odb

Conflicts:
	odb.go
	wrapper.c

1 files changed, 193 insertions, 0 deletions

diff --git a/branch.go b/branch.go
new file mode 100644
index 0000000..bd7312b
--- /dev/null
+++ b/branch.go
@@ -0,0 +1,193 @@
+package git
+
+/*
+#cgo pkg-config: libgit2
+#include <git2.h>
+#include <git2/errors.h>
+*/
+import "C"
+
+import (
+	"runtime"
+	"unsafe"
+)
+
+type BranchType uint
+
+const (
+	BranchLocal  BranchType = C.GIT_BRANCH_LOCAL
+	BranchRemote            = C.GIT_BRANCH_REMOTE
+)
+
+type Branch struct {
+	Reference
+}
+
+func (repo *Repository) CreateBranch(branchName string, target *Commit, force bool, signature *Signature, msg string) (*Reference, error) {
+
+	ref := new(Reference)
+	cBranchName := C.CString(branchName)
+	cForce := cbool(force)
+
+	cSignature := signature.toC()
+	defer C.git_signature_free(cSignature)
+
+	var cmsg *C.char
+	if msg == "" {
+		cmsg = nil
+	} else {
+		cmsg = C.CString(msg)
+		defer C.free(unsafe.Pointer(cmsg))
+	}
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_branch_create(&ref.ptr, repo.ptr, cBranchName, target.cast_ptr, cForce, cSignature, cmsg)
+	if ret < 0 {
+		return nil, MakeGitError(ret)
+	}
+	return ref, nil
+}
+
+func (b *Branch) Delete() error {
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+	ret := C.git_branch_delete(b.ptr)
+	if ret < 0 {
+		return MakeGitError(ret)
+	}
+	return nil
+}
+
+func (b *Branch) Move(newBranchName string, force bool, signature *Signature, msg string) (*Branch, error) {
+	newBranch := new(Branch)
+	cNewBranchName := C.CString(newBranchName)
+	cForce := cbool(force)
+
+	cSignature := signature.toC()
+	defer C.git_signature_free(cSignature)
+
+	var cmsg *C.char
+	if msg == "" {
+		cmsg = nil
+	} else {
+		cmsg = C.CString(msg)
+		defer C.free(unsafe.Pointer(cmsg))
+	}
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_branch_move(&newBranch.ptr, b.ptr, cNewBranchName, cForce, cSignature, cmsg)
+	if ret < 0 {
+		return nil, MakeGitError(ret)
+	}
+	return newBranch, nil
+}
+
+func (b *Branch) IsHead() (bool, error) {
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_branch_is_head(b.ptr)
+	switch ret {
+	case 1:
+		return true, nil
+	case 0:
+		return false, nil
+	}
+	return false, MakeGitError(ret)
+
+}
+
+func (repo *Repository) LookupBranch(branchName string, bt BranchType) (*Branch, error) {
+	branch := new(Branch)
+	cName := C.CString(branchName)
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_branch_lookup(&branch.ptr, repo.ptr, cName, C.git_branch_t(bt))
+	if ret < 0 {
+		return nil, MakeGitError(ret)
+	}
+	return branch, nil
+}
+
+func (b *Branch) Name() (string, error) {
+	var cName *C.char
+	defer C.free(unsafe.Pointer(cName))
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_branch_name(&cName, b.ptr)
+	if ret < 0 {
+		return "", MakeGitError(ret)
+	}
+
+	return C.GoString(cName), nil
+}
+
+func (repo *Repository) RemoteName(canonicalBranchName string) (string, error) {
+	cName := C.CString(canonicalBranchName)
+
+	nameBuf := C.git_buf{}
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_branch_remote_name(&nameBuf, repo.ptr, cName)
+	if ret < 0 {
+		return "", MakeGitError(ret)
+	}
+	defer C.git_buf_free(&nameBuf)
+
+	return C.GoString(nameBuf.ptr), nil
+}
+
+func (b *Branch) SetUpstream(upstreamName string) error {
+	cName := C.CString(upstreamName)
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_branch_set_upstream(b.ptr, cName)
+	if ret < 0 {
+		return MakeGitError(ret)
+	}
+	return nil
+}
+
+func (b *Branch) Upstream() (*Branch, error) {
+	upstream := new(Branch)
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_branch_upstream(&upstream.ptr, b.ptr)
+	if ret < 0 {
+		return nil, MakeGitError(ret)
+	}
+	return upstream, nil
+}
+
+func (repo *Repository) UpstreamName(canonicalBranchName string) (string, error) {
+	cName := C.CString(canonicalBranchName)
+
+	nameBuf := C.git_buf{}
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_branch_upstream_name(&nameBuf, repo.ptr, cName)
+	if ret < 0 {
+		return "", MakeGitError(ret)
+	}
+	defer C.git_buf_free(&nameBuf)
+
+	return C.GoString(nameBuf.ptr), nil
+}