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

gofmt

This commit is contained in:
Simon Menke 2014-04-09 16:13:42 +02:00
parent 9cd1d129bc
commit e504c9c021
10 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
checkout.go
View File

@ -5,8 +5,8 @@ package git
*/ */
import "C" import "C"
import ( import (
"runtime"
"os" "os"
"runtime"
) )
type CheckoutStrategy uint type CheckoutStrategy uint

3
config.go
View File

@ -75,7 +75,6 @@ func (c *Config) AddFile(path string, level ConfigLevel, force bool) error {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ret := C.git_config_add_file_ondisk(c.ptr, cpath, C.git_config_level_t(level), cbool(force)) ret := C.git_config_add_file_ondisk(c.ptr, cpath, C.git_config_level_t(level), cbool(force))
if ret < 0 { if ret < 0 {
return MakeGitError(ret) return MakeGitError(ret)
@ -131,7 +130,6 @@ func (c *Config) LookupString(name string) (string, error) {
return C.GoString(ptr), nil return C.GoString(ptr), nil
} }
func (c *Config) LookupBool(name string) (bool, error) { func (c *Config) LookupBool(name string) (bool, error) {
var out C.int var out C.int
cname := C.CString(name) cname := C.CString(name)
@ -374,4 +372,3 @@ func (iter *ConfigIterator) Free() {
runtime.SetFinalizer(iter, nil) runtime.SetFinalizer(iter, nil)
C.free(unsafe.Pointer(iter.ptr)) C.free(unsafe.Pointer(iter.ptr))
} }

2
credentials.go
View File

@ -28,7 +28,7 @@ func (o *Cred) HasUsername() bool {
} }
func (o *Cred) Type() CredType { func (o *Cred) Type() CredType {
return (CredType)(o.ptr.credtype) return CredType(o.ptr.credtype)
} }
func credFromC(ptr *C.git_cred) *Cred { func credFromC(ptr *C.git_cred) *Cred {

4
object.go
View File

@ -28,8 +28,8 @@ type gitObject struct {
ptr *C.git_object ptr *C.git_object
} }
func (t ObjectType) String() (string) { func (t ObjectType) String() string {
switch (t) { switch t {
case ObjectAny: case ObjectAny:
return "Any" return "Any"
case ObjectBad: case ObjectBad:

8
odb.go
View File

@ -8,9 +8,9 @@ extern int _go_git_odb_foreach(git_odb *db, void *payload);
*/ */
import "C" import "C"
import ( import (
"unsafe"
"reflect" "reflect"
"runtime" "runtime"
"unsafe"
) )
type Odb struct { type Odb struct {
@ -65,7 +65,7 @@ func odbForEachCb(id *C.git_oid, payload unsafe.Pointer) int {
case <-ch: case <-ch:
return -1 return -1
} }
return 0; return 0
} }
func (v *Odb) forEachWrap(ch chan *Oid) { func (v *Odb) forEachWrap(ch chan *Oid) {
@ -88,7 +88,7 @@ func (v *Odb) Hash(data []byte, otype ObjectType) (oid *Oid, err error) {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
ret := C.git_odb_hash(oid.toC(), ptr, C.size_t(header.Len), C.git_otype(otype)); ret := C.git_odb_hash(oid.toC(), ptr, C.size_t(header.Len), C.git_otype(otype))
if ret < 0 { if ret < 0 {
err = MakeGitError(ret) err = MakeGitError(ret)
} }
@ -145,7 +145,7 @@ func (object *OdbObject) Data() (data []byte) {
len := int(C.git_odb_object_size(object.ptr)) len := int(C.git_odb_object_size(object.ptr))
sliceHeader := (*reflect.SliceHeader)((unsafe.Pointer(&blob))) sliceHeader := (*reflect.SliceHeader)(unsafe.Pointer(&blob))
sliceHeader.Cap = len sliceHeader.Cap = len
sliceHeader.Len = len sliceHeader.Len = len
sliceHeader.Data = uintptr(c_blob) sliceHeader.Data = uintptr(c_blob)

2
odb_test.go
View File

@ -48,7 +48,7 @@ parent 66e1c476199ebcd3e304659992233132c5a52c6c
author John Doe <john@doe.com> 1390682018 +0000 author John Doe <john@doe.com> 1390682018 +0000
committer John Doe <john@doe.com> 1390682018 +0000 committer John Doe <john@doe.com> 1390682018 +0000
Initial commit.`; Initial commit.`
oid, error := odb.Hash([]byte(str), ObjectCommit) oid, error := odb.Hash([]byte(str), ObjectCommit)
checkFatal(t, error) checkFatal(t, error)

2
packbuilder.go
View File

@ -122,7 +122,7 @@ func packbuilderForEachCb(buf unsafe.Pointer, size C.size_t, payload unsafe.Poin
slice := C.GoBytes(buf, C.int(size)) slice := C.GoBytes(buf, C.int(size))
select { select {
case <- stop: case <-stop:
return -1 return -1
case ch <- slice: case ch <- slice:
} }

4
remote.go
View File

@ -81,7 +81,7 @@ func completionCallback(completion_type C.git_remote_completion_type, data unsaf
if callbacks.CompletionCallback == nil { if callbacks.CompletionCallback == nil {
return 0 return 0
} }
return callbacks.CompletionCallback((RemoteCompletion)(completion_type)) return callbacks.CompletionCallback(RemoteCompletion(completion_type))
} }
//export credentialsCallback //export credentialsCallback
@ -92,7 +92,7 @@ func credentialsCallback(_cred **C.git_cred, _url *C.char, _username_from_url *C
} }
url := C.GoString(_url) url := C.GoString(_url)
username_from_url := C.GoString(_username_from_url) username_from_url := C.GoString(_username_from_url)
ret, cred := callbacks.CredentialsCallback(url, username_from_url, (CredType)(allowed_types)) ret, cred := callbacks.CredentialsCallback(url, username_from_url, CredType(allowed_types))
*_cred = cred.ptr *_cred = cred.ptr
return ret return ret
} }

6
settings/settings.go
View File

@ -27,9 +27,9 @@ int _go_git_opts_get_size_t(int opt, size_t *val)
*/ */
import "C" import "C"
import ( import (
"github.com/libgit2/git2go"
"runtime" "runtime"
"unsafe" "unsafe"
"github.com/libgit2/git2go"
) )
func MakeGitError(err C.int) error { func MakeGitError(err C.int) error {
@ -71,7 +71,7 @@ func getSizet(opt C.int) (int, error) {
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
var val C.size_t var val C.size_t
err := C._go_git_opts_get_size_t(opt, &val); err := C._go_git_opts_get_size_t(opt, &val)
if err < 0 { if err < 0 {
return 0, MakeGitError(err) return 0, MakeGitError(err)
} }
@ -84,7 +84,7 @@ func setSizet(opt C.int, val int) error {
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
cval := C.size_t(val) cval := C.size_t(val)
err := C._go_git_opts_set_size_t(opt, cval); err := C._go_git_opts_set_size_t(opt, cval)
if err < 0 { if err < 0 {
return MakeGitError(err) return MakeGitError(err)
} }

10
settings/settings_test.go
View File

@ -1,9 +1,9 @@
package settings package settings
import ( import (
"testing"
"runtime"
"github.com/libgit2/git2go" "github.com/libgit2/git2go"
"runtime"
"testing"
) )
type pathPair struct { type pathPair struct {
@ -13,9 +13,9 @@ type pathPair struct {
func TestSearchPath(t *testing.T) { func TestSearchPath(t *testing.T) {
paths := []pathPair{ paths := []pathPair{
pathPair{git.ConfigLevelSystem, "/tmp/system"}, {git.ConfigLevelSystem, "/tmp/system"},
pathPair{git.ConfigLevelGlobal, "/tmp/global"}, {git.ConfigLevelGlobal, "/tmp/global"},
pathPair{git.ConfigLevelXDG, "/tmp/xdg"}, {git.ConfigLevelXDG, "/tmp/xdg"},
} }
for _, pair := range paths { for _, pair := range paths {