diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 86f8265..0000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -language: go - -go: - - 1.0 - - 1.1 - - tip - -env: - - PKG_CONFIG_PATH=libgit2/install/lib/pkgconfig LD_LIBRARY_PATH=libgit2/install/lib - -install: - - script/build-libgit2.sh diff --git a/branch.go b/branch.go new file mode 100644 index 0000000..aee23e4 --- /dev/null +++ b/branch.go @@ -0,0 +1,193 @@ +package git + +/* +#cgo pkg-config: libgit2 +#include +#include +*/ +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.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 +} diff --git a/reference.go b/reference.go index d246c55..45a3b22 100644 --- a/reference.go +++ b/reference.go @@ -40,13 +40,8 @@ func (v *Reference) SetSymbolicTarget(target string, sig *Signature, msg string) csig := sig.toC() defer C.free(unsafe.Pointer(csig)) - var cmsg *C.char - if msg == "" { - cmsg = nil - } else { - cmsg = C.CString(msg) - defer C.free(unsafe.Pointer(cmsg)) - } + cmsg := C.CString(msg) + defer C.free(unsafe.Pointer(cmsg)) ret := C.git_reference_symbolic_set_target(&ptr, v.ptr, ctarget, csig, cmsg) if ret < 0 { @@ -65,13 +60,8 @@ func (v *Reference) SetTarget(target *Oid, sig *Signature, msg string) (*Referen csig := sig.toC() defer C.free(unsafe.Pointer(csig)) - var cmsg *C.char - if msg == "" { - cmsg = nil - } else { - cmsg = C.CString(msg) - defer C.free(unsafe.Pointer(cmsg)) - } + cmsg := C.CString(msg) + defer C.free(unsafe.Pointer(cmsg)) ret := C.git_reference_set_target(&ptr, v.ptr, target.toC(), csig, cmsg) if ret < 0 { @@ -103,13 +93,8 @@ func (v *Reference) Rename(name string, force bool, sig *Signature, msg string) csig := sig.toC() defer C.free(unsafe.Pointer(csig)) - var cmsg *C.char - if msg == "" { - cmsg = nil - } else { - cmsg = C.CString(msg) - defer C.free(unsafe.Pointer(cmsg)) - } + cmsg := C.CString(msg) + defer C.free(unsafe.Pointer(cmsg)) runtime.LockOSThread() defer runtime.UnlockOSThread() @@ -149,17 +134,6 @@ func (v *Reference) Delete() error { return nil } -// Cmp compares both references, retursn 0 on equality, otherwise a -// stable sorting. -func (v *Reference) Cmp(ref2 *Reference) int { - return int(C.git_reference_cmp(v.ptr, ref2.ptr)) -} - -// Shorthand returns a "human-readable" short reference name -func (v *Reference) Shorthand() string { - return C.GoString(C.git_reference_shorthand(v.ptr)) -} - func (v *Reference) Name() string { return C.GoString(C.git_reference_name(v.ptr)) } diff --git a/reference_test.go b/reference_test.go index ffa9f35..156960a 100644 --- a/reference_test.go +++ b/reference_test.go @@ -159,33 +159,6 @@ func TestIterator(t *testing.T) { compareStringList(t, expected, list) } -func TestUtil(t *testing.T) { - repo := createTestRepo(t) - defer os.RemoveAll(repo.Workdir()) - - commitId, _ := seedTestRepo(t, repo) - - ref, err := repo.CreateReference("refs/heads/foo", commitId, true, nil, "") - checkFatal(t, err) - - ref2, err := repo.DwimReference("foo") - checkFatal(t, err) - - if ref.Cmp(ref2) != 0 { - t.Fatalf("foo didn't dwim to the right thing") - } - - if ref.Shorthand() != "foo" { - t.Fatalf("refs/heads/foo has no foo shorthand") - } - - hasLog, err := repo.HasLog("refs/heads/foo") - checkFatal(t, err) - if !hasLog { - t.Fatalf("branches ahve logs by default") - } -} - func compareStringList(t *testing.T, expected, actual []string) { for i, v := range expected { if actual[i] != v { diff --git a/repository.go b/repository.go index 6b7345d..e78422e 100644 --- a/repository.go +++ b/repository.go @@ -153,13 +153,8 @@ func (v *Repository) CreateReference(name string, id *Oid, force bool, sig *Sign csig := sig.toC() defer C.free(unsafe.Pointer(csig)) - var cmsg *C.char - if msg == "" { - cmsg = nil - } else { - cmsg = C.CString(msg) - defer C.free(unsafe.Pointer(cmsg)) - } + cmsg := C.CString(msg) + defer C.free(unsafe.Pointer(cmsg)) var ptr *C.git_reference @@ -184,13 +179,8 @@ func (v *Repository) CreateSymbolicReference(name, target string, force bool, si csig := sig.toC() defer C.free(unsafe.Pointer(csig)) - var cmsg *C.char - if msg == "" { - cmsg = nil - } else { - cmsg = C.CString(msg) - defer C.free(unsafe.Pointer(cmsg)) - } + cmsg := C.CString(msg) + defer C.free(unsafe.Pointer(cmsg)) var ptr *C.git_reference @@ -342,52 +332,3 @@ func (v *Repository) RevparseSingle(spec string) (Object, error) { return allocObject(ptr), nil } - -// EnsureLog ensures that there is a reflog for the given reference -// name and creates an empty one if necessary. -func (v *Repository) EnsureLog(name string) error { - cname := C.CString(name) - defer C.free(unsafe.Pointer(cname)) - - runtime.LockOSThread() - defer runtime.UnlockOSThread() - - if ret := C.git_reference_ensure_log(v.ptr, cname); ret < 0 { - return MakeGitError(ret) - } - - return nil -} - -// HasLog returns whether there is a reflog for the given reference -// name -func (v *Repository) HasLog(name string) (bool, error) { - cname := C.CString(name) - defer C.free(unsafe.Pointer(cname)) - - runtime.LockOSThread() - defer runtime.UnlockOSThread() - - ret := C.git_reference_has_log(v.ptr, cname) - if ret < 0 { - return false, MakeGitError(ret) - } - - return ret == 1, nil -} - -// DwimReference looks up a reference by DWIMing its short name -func (v *Repository) DwimReference(name string) (*Reference, error) { - cname := C.CString(name) - defer C.free(unsafe.Pointer(cname)) - - runtime.LockOSThread() - defer runtime.UnlockOSThread() - - var ptr *C.git_reference - if ret := C.git_reference_dwim(&ptr, v.ptr, cname); ret < 0 { - return nil, MakeGitError(ret) - } - - return newReferenceFromC(ptr), nil -} diff --git a/script/build-libgit2.sh b/script/build-libgit2.sh deleted file mode 100755 index aa43df5..0000000 --- a/script/build-libgit2.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -ex - -git clone --depth 1 --single-branch git://github.com/libgit2/libgit2 libgit2 - -cd libgit2 -cmake -DTHREADSAFE=ON \ - -DBUILD_CLAR=OFF \ - -DCMAKE_INSTALL_PREFIX=$PWD/install \ - . - -make install - -# Let the Go build system know where to find libgit2 -export LD_LIBRARY_PATH="$TMPDIR/libgit2/install/lib" -export PKG_CONFIG_PATH="$TMPDIR/libgit2/install/lib/pkgconfig"