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

LastError -> MakeGitError

This commit is contained in:
Jesse Ezell 2014-02-26 08:50:47 -08:00
parent baf4a84336
commit a5df611100
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
branch.go
View File

@ -45,9 +45,9 @@ func (repo *Repository) CreateBranch(branchName string, target *Commit, force bo
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
err := C.git_branch_create(&ref.ptr, repo.ptr, cBranchName, target.ptr, cForce, cSignature, cMessage) ret := C.git_branch_create(&ref.ptr, repo.ptr, cBranchName, target.ptr, cForce, cSignature, cMessage)
if err < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return ref, nil return ref, nil
} }
@ -56,9 +56,9 @@ func (b *Branch) Delete() error {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ret := C.git_branch_delete(b.ptr)
if err := C.git_branch_delete(b.ptr); err < 0 { if ret < 0 {
return LastError() return MakeGitError(ret)
} }
return nil return nil
} }
@ -77,9 +77,9 @@ func (b *Branch) Move(newBranchName string, force bool, signature *Signature, me
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
err := C.git_branch_move(&newBranch.ptr, b.ptr, cNewBranchName, cForce, cSignature, cMessage) ret := C.git_branch_move(&newBranch.ptr, b.ptr, cNewBranchName, cForce, cSignature, cMessage)
if err < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return newBranch, nil return newBranch, nil
} }
@ -89,14 +89,14 @@ func (b *Branch) IsHead() (bool, error) {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
isHead := C.git_branch_is_head(b.ptr) ret := C.git_branch_is_head(b.ptr)
switch isHead { switch ret {
case 1: case 1:
return true, nil return true, nil
case 0: case 0:
return false, nil return false, nil
default: default:
return false, LastError() return false, MakeGitError(ret)
} }
} }
@ -108,9 +108,9 @@ func (repo *Repository) LookupBranch(branchName string, bt BranchType) (*Branch,
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
err := C.git_branch_lookup(&branch.ptr, repo.ptr, cName, C.git_branch_t(bt)) ret := C.git_branch_lookup(&branch.ptr, repo.ptr, cName, C.git_branch_t(bt))
if err < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return branch, nil return branch, nil
} }
@ -122,9 +122,9 @@ func (b *Branch) Name() (string, error) {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
err := C.git_branch_name(&cName, b.ptr) ret := C.git_branch_name(&cName, b.ptr)
if err < 0 { if ret < 0 {
return "", LastError() return "", MakeGitError(ret)
} }
return C.GoString(cName), nil return C.GoString(cName), nil
@ -138,8 +138,9 @@ func (repo *Repository) RemoteName(canonicalBranchName string) (string, error) {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
if C.git_branch_remote_name(&nameBuf, repo.ptr, cName) < 0 { ret := C.git_branch_remote_name(&nameBuf, repo.ptr, cName)
return "", LastError() if ret < 0 {
return "", MakeGitError(ret)
} }
C.git_buf_free(&nameBuf) C.git_buf_free(&nameBuf)
@ -152,9 +153,9 @@ func (b *Branch) SetUpstream(upstreamName string) error {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
err := C.git_branch_set_upstream(b.ptr, cName) ret := C.git_branch_set_upstream(b.ptr, cName)
if err < 0 { if ret < 0 {
return LastError() return MakeGitError(ret)
} }
return nil return nil
} }
@ -165,9 +166,9 @@ func (b *Branch) Upstream() (*Branch, error) {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
err := C.git_branch_upstream(&upstream.ptr, b.ptr) ret := C.git_branch_upstream(&upstream.ptr, b.ptr)
if err < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return upstream, nil return upstream, nil
} }
@ -180,8 +181,9 @@ func (repo *Repository) UpstreamName(canonicalBranchName string) (string, error)
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
if C.git_branch_upstream_name(&nameBuf, repo.ptr, cName) < 0 { ret := C.git_branch_upstream_name(&nameBuf, repo.ptr, cName)
return "", LastError() if ret < 0 {
return "", MakeGitError(ret)
} }
C.git_buf_free(&nameBuf) C.git_buf_free(&nameBuf)