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

Remove 'oid' as id name 

Following the cleanup from libgit2, let's not use 'oid' unless we mean
the name of the data type. In the other cases, we mean an identifier,
hence the name 'id'.
This commit is contained in:
Carlos Martín Nieto 2014-02-26 15:30:16 +01:00
parent 5f4283fac3
commit 3e5586bd8d
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
repository.go
View File

@ -85,13 +85,13 @@ func (v *Repository) Index() (*Index, error) {
return newIndexFromC(ptr), nil return newIndexFromC(ptr), nil
} }
func (v *Repository) lookupType(oid *Oid, t ObjectType) (Object, error) { func (v *Repository) lookupType(id *Oid, t ObjectType) (Object, error) {
var ptr *C.git_object var ptr *C.git_object
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ret := C.git_object_lookup(&ptr, v.ptr, oid.toC(), C.git_otype(t)) ret := C.git_object_lookup(&ptr, v.ptr, id.toC(), C.git_otype(t))
if ret < 0 { if ret < 0 {
return nil, LastError() return nil, LastError()
} }
@ -99,12 +99,12 @@ func (v *Repository) lookupType(oid *Oid, t ObjectType) (Object, error) {
return allocObject(ptr), nil return allocObject(ptr), nil
} }
func (v *Repository) Lookup(oid *Oid) (Object, error) { func (v *Repository) Lookup(id *Oid) (Object, error) {
return v.lookupType(oid, ObjectAny) return v.lookupType(id, ObjectAny)
} }
func (v *Repository) LookupTree(oid *Oid) (*Tree, error) { func (v *Repository) LookupTree(id *Oid) (*Tree, error) {
obj, err := v.lookupType(oid, ObjectTree) obj, err := v.lookupType(id, ObjectTree)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -112,8 +112,8 @@ func (v *Repository) LookupTree(oid *Oid) (*Tree, error) {
return obj.(*Tree), nil return obj.(*Tree), nil
} }
func (v *Repository) LookupCommit(oid *Oid) (*Commit, error) { func (v *Repository) LookupCommit(id *Oid) (*Commit, error) {
obj, err := v.lookupType(oid, ObjectCommit) obj, err := v.lookupType(id, ObjectCommit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -121,8 +121,8 @@ func (v *Repository) LookupCommit(oid *Oid) (*Commit, error) {
return obj.(*Commit), nil return obj.(*Commit), nil
} }
func (v *Repository) LookupBlob(oid *Oid) (*Blob, error) { func (v *Repository) LookupBlob(id *Oid) (*Blob, error) {
obj, err := v.lookupType(oid, ObjectBlob) obj, err := v.lookupType(id, ObjectBlob)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -146,7 +146,7 @@ func (v *Repository) LookupReference(name string) (*Reference, error) {
return newReferenceFromC(ptr), nil return newReferenceFromC(ptr), nil
} }
func (v *Repository) CreateReference(name string, oid *Oid, force bool, sig *Signature, msg string) (*Reference, error) { func (v *Repository) CreateReference(name string, id *Oid, force bool, sig *Signature, msg string) (*Reference, error) {
cname := C.CString(name) cname := C.CString(name)
defer C.free(unsafe.Pointer(cname)) defer C.free(unsafe.Pointer(cname))
@ -161,7 +161,7 @@ func (v *Repository) CreateReference(name string, oid *Oid, force bool, sig *Sig
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ecode := C.git_reference_create(&ptr, v.ptr, cname, oid.toC(), cbool(force), csig, cmsg) ecode := C.git_reference_create(&ptr, v.ptr, cname, id.toC(), cbool(force), csig, cmsg)
if ecode < 0 { if ecode < 0 {
return nil, LastError() return nil, LastError()
} }

4
walk.go
View File

@ -46,11 +46,11 @@ func (v *RevWalk) PushHead() (err error) {
return return
} }
func (v *RevWalk) Next(oid *Oid) (err error) { func (v *RevWalk) Next(id *Oid) (err error) {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ret := C.git_revwalk_next(oid.toC(), v.ptr) ret := C.git_revwalk_next(id.toC(), v.ptr)
switch { switch {
case ret == ITEROVER: case ret == ITEROVER:
err = io.EOF err = io.EOF