Merge branch 'master' of https://github.com/libgit2/git2go into add-branch-lookup
This commit is contained in:
Jesse Ezell
commit
baf4a84336
|
|
@ -65,7 +65,7 @@ func (v *Repository) Checkout(opts *CheckoutOpts) error {
|
|||
|
||||
ret := C.git_checkout_head(v.ptr, &copts)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
@ -81,7 +81,7 @@ func (v *Repository) CheckoutIndex(index *Index, opts *CheckoutOpts) error {
|
|||
|
||||
ret := C.git_checkout_index(v.ptr, index.ptr, &copts)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ func (c Commit) Tree() (*Tree, error) {
|
|||
|
||||
err := C.git_commit_tree(&ptr, c.ptr)
|
||||
if err < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(err)
|
||||
}
|
||||
|
||||
return allocObject(ptr).(*Tree), nil
|
||||
|
|
|
|||
311
config.go
311
config.go
|
|
@ -10,11 +10,81 @@ import (
|
|||
"unsafe"
|
||||
)
|
||||
|
||||
type ConfigLevel int
|
||||
|
||||
const (
|
||||
// System-wide configuration file; /etc/gitconfig on Linux systems
|
||||
ConfigLevelSystem ConfigLevel = C.GIT_CONFIG_LEVEL_SYSTEM
|
||||
|
||||
// XDG compatible configuration file; typically ~/.config/git/config
|
||||
ConfigLevelXDG ConfigLevel = C.GIT_CONFIG_LEVEL_XDG
|
||||
|
||||
// User-specific configuration file (also called Global configuration
|
||||
// file); typically ~/.gitconfig
|
||||
ConfigLevelGlobal ConfigLevel = C.GIT_CONFIG_LEVEL_GLOBAL
|
||||
|
||||
// Repository specific configuration file; $WORK_DIR/.git/config on
|
||||
// non-bare repos
|
||||
ConfigLevelLocal ConfigLevel = C.GIT_CONFIG_LEVEL_LOCAL
|
||||
|
||||
// Application specific configuration file; freely defined by applications
|
||||
ConfigLevelApp ConfigLevel = C.GIT_CONFIG_LEVEL_APP
|
||||
|
||||
// Represents the highest level available config file (i.e. the most
|
||||
// specific config file available that actually is loaded)
|
||||
ConfigLevelHighest ConfigLevel = C.GIT_CONFIG_HIGHEST_LEVEL
|
||||
)
|
||||
|
||||
type ConfigEntry struct {
|
||||
Name string
|
||||
Value string
|
||||
Level ConfigLevel
|
||||
}
|
||||
|
||||
func newConfigEntryFromC(centry *C.git_config_entry) *ConfigEntry {
|
||||
return &ConfigEntry{
|
||||
Name: C.GoString(centry.name),
|
||||
Value: C.GoString(centry.value),
|
||||
Level: ConfigLevel(centry.level),
|
||||
}
|
||||
}
|
||||
|
||||
type Config struct {
|
||||
ptr *C.git_config
|
||||
}
|
||||
|
||||
func (c *Config) LookupInt32(name string) (v int32, err error) {
|
||||
// NewConfig creates a new empty configuration object
|
||||
func NewConfig() (*Config, error) {
|
||||
config := new(Config)
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
if ret := C.git_config_new(&config.ptr); ret < 0 {
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return config, nil
|
||||
}
|
||||
|
||||
// AddFile adds a file-backed backend to the config object at the specified level.
|
||||
func (c *Config) AddFile(path string, level ConfigLevel, force bool) error {
|
||||
cpath := C.CString(path)
|
||||
defer C.free(unsafe.Pointer(cpath))
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
|
||||
ret := C.git_config_add_file_ondisk(c.ptr, cpath, C.git_config_level_t(level), cbool(force))
|
||||
if ret < 0 {
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Config) LookupInt32(name string) (int32, error) {
|
||||
var out C.int32_t
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
|
@ -24,13 +94,13 @@ func (c *Config) LookupInt32(name string) (v int32, err error) {
|
|||
|
||||
ret := C.git_config_get_int32(&out, c.ptr, cname)
|
||||
if ret < 0 {
|
||||
return 0, LastError()
|
||||
return 0, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return int32(out), nil
|
||||
}
|
||||
|
||||
func (c *Config) LookupInt64(name string) (v int64, err error) {
|
||||
func (c *Config) LookupInt64(name string) (int64, error) {
|
||||
var out C.int64_t
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
|
@ -40,13 +110,13 @@ func (c *Config) LookupInt64(name string) (v int64, err error) {
|
|||
|
||||
ret := C.git_config_get_int64(&out, c.ptr, cname)
|
||||
if ret < 0 {
|
||||
return 0, LastError()
|
||||
return 0, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return int64(out), nil
|
||||
}
|
||||
|
||||
func (c *Config) LookupString(name string) (v string, err error) {
|
||||
func (c *Config) LookupString(name string) (string, error) {
|
||||
var ptr *C.char
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
|
@ -54,15 +124,91 @@ func (c *Config) LookupString(name string) (v string, err error) {
|
|||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_config_get_string(&ptr, c.ptr, cname)
|
||||
if ret < 0 {
|
||||
return "", LastError()
|
||||
if ret := C.git_config_get_string(&ptr, c.ptr, cname); ret < 0 {
|
||||
return "", MakeGitError(ret)
|
||||
}
|
||||
|
||||
return C.GoString(ptr), nil
|
||||
}
|
||||
|
||||
func (c *Config) Set(name, value string) (err error) {
|
||||
|
||||
func (c *Config) LookupBool(name string) (bool, error) {
|
||||
var out C.int
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_config_get_bool(&out, c.ptr, cname)
|
||||
if ret < 0 {
|
||||
return false, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return out != 0, nil
|
||||
}
|
||||
|
||||
func (c *Config) NewMultivarIterator(name, regexp string) (*ConfigIterator, error) {
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
||||
var cregexp *C.char
|
||||
if regexp == "" {
|
||||
cregexp = nil
|
||||
} else {
|
||||
cregexp = C.CString(regexp)
|
||||
defer C.free(unsafe.Pointer(cregexp))
|
||||
}
|
||||
|
||||
iter := new(ConfigIterator)
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_config_multivar_iterator_new(&iter.ptr, c.ptr, cname, cregexp)
|
||||
if ret < 0 {
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
runtime.SetFinalizer(iter, (*ConfigIterator).Free)
|
||||
return iter, nil
|
||||
}
|
||||
|
||||
// NewIterator creates an iterator over each entry in the
|
||||
// configuration
|
||||
func (c *Config) NewIterator() (*ConfigIterator, error) {
|
||||
iter := new(ConfigIterator)
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_config_iterator_new(&iter.ptr, c.ptr)
|
||||
if ret < 0 {
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return iter, nil
|
||||
}
|
||||
|
||||
// NewIteratorGlob creates an iterator over each entry in the
|
||||
// configuration whose name matches the given regular expression
|
||||
func (c *Config) NewIteratorGlob(regexp string) (*ConfigIterator, error) {
|
||||
iter := new(ConfigIterator)
|
||||
cregexp := C.CString(regexp)
|
||||
defer C.free(unsafe.Pointer(cregexp))
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_config_iterator_glob_new(&iter.ptr, c.ptr, cregexp)
|
||||
if ret < 0 {
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return iter, nil
|
||||
}
|
||||
|
||||
func (c *Config) SetString(name, value string) (err error) {
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
||||
|
|
@ -74,7 +220,7 @@ func (c *Config) Set(name, value string) (err error) {
|
|||
|
||||
ret := C.git_config_set_string(c.ptr, cname, cvalue)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
@ -84,3 +230,148 @@ func (c *Config) Free() {
|
|||
runtime.SetFinalizer(c, nil)
|
||||
C.git_config_free(c.ptr)
|
||||
}
|
||||
|
||||
func (c *Config) SetInt32(name string, value int32) (err error) {
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
||||
ret := C.git_config_set_int32(c.ptr, cname, C.int32_t(value))
|
||||
if ret < 0 {
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Config) SetInt64(name string, value int64) (err error) {
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_config_set_int64(c.ptr, cname, C.int64_t(value))
|
||||
if ret < 0 {
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Config) SetBool(name string, value bool) (err error) {
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_config_set_bool(c.ptr, cname, cbool(value))
|
||||
if ret < 0 {
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Config) SetMultivar(name, regexp, value string) (err error) {
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
||||
cregexp := C.CString(regexp)
|
||||
defer C.free(unsafe.Pointer(cregexp))
|
||||
|
||||
cvalue := C.CString(value)
|
||||
defer C.free(unsafe.Pointer(cvalue))
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_config_set_multivar(c.ptr, cname, cregexp, cvalue)
|
||||
if ret < 0 {
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Config) Delete(name string) error {
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_config_delete_entry(c.ptr, cname)
|
||||
|
||||
if ret < 0 {
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// OpenLevel creates a single-level focused config object from a multi-level one
|
||||
func (c *Config) OpenLevel(parent *Config, level ConfigLevel) (*Config, error) {
|
||||
config := new(Config)
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_config_open_level(&config.ptr, parent.ptr, C.git_config_level_t(level))
|
||||
if ret < 0 {
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return config, nil
|
||||
}
|
||||
|
||||
// OpenOndisk creates a new config instance containing a single on-disk file
|
||||
func OpenOndisk(parent *Config, path string) (*Config, error) {
|
||||
cpath := C.CString(path)
|
||||
defer C.free(unsafe.Pointer(cpath))
|
||||
|
||||
config := new(Config)
|
||||
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
if ret := C.git_config_open_ondisk(&config.ptr, cpath); ret < 0 {
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return config, nil
|
||||
}
|
||||
|
||||
// Refresh refreshes the configuration to reflect any changes made externally e.g. on disk
|
||||
func (c *Config) Refresh() error {
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
if ret := C.git_config_refresh(c.ptr); ret < 0 {
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type ConfigIterator struct {
|
||||
ptr *C.git_config_iterator
|
||||
}
|
||||
|
||||
// Next returns the next entry for this iterator
|
||||
func (iter *ConfigIterator) Next() (*ConfigEntry, error) {
|
||||
var centry *C.git_config_entry
|
||||
|
||||
ret := C.git_config_next(¢ry, iter.ptr)
|
||||
if ret < 0 {
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return newConfigEntryFromC(centry), nil
|
||||
}
|
||||
|
||||
func (iter *ConfigIterator) Free() {
|
||||
runtime.SetFinalizer(iter, nil)
|
||||
C.free(unsafe.Pointer(iter.ptr))
|
||||
}
|
||||
|
||||
|
|
|
|||
25
git.go
25
git.go
|
|
@ -61,8 +61,8 @@ func NewOidFromString(s string) (*Oid, error) {
|
|||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
if C.git_oid_fromstr(o.toC(), cs) < 0 {
|
||||
return nil, LastError()
|
||||
if ret := C.git_oid_fromstr(o.toC(), cs); ret < 0 {
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return o, nil
|
||||
|
|
@ -123,7 +123,7 @@ func ShortenOids(ids []*Oid, minlen int) (int, error) {
|
|||
buf[40] = 0
|
||||
ret = C.git_oid_shorten_add(shorten, (*C.char)(unsafe.Pointer(&buf[0])))
|
||||
if ret < 0 {
|
||||
return int(ret), LastError()
|
||||
return int(ret), MakeGitError(ret)
|
||||
}
|
||||
}
|
||||
return int(ret), nil
|
||||
|
|
@ -131,19 +131,28 @@ func ShortenOids(ids []*Oid, minlen int) (int, error) {
|
|||
|
||||
type GitError struct {
|
||||
Message string
|
||||
Code int
|
||||
Class int
|
||||
ErrorCode int
|
||||
}
|
||||
|
||||
func (e GitError) Error() string {
|
||||
return e.Message
|
||||
}
|
||||
|
||||
func LastError() error {
|
||||
func IsNotExist(err error) bool {
|
||||
return err.(*GitError).ErrorCode == C.GIT_ENOTFOUND
|
||||
}
|
||||
|
||||
func IsExist(err error) bool {
|
||||
return err.(*GitError).ErrorCode == C.GIT_EEXISTS
|
||||
}
|
||||
|
||||
func MakeGitError(errorCode C.int) error {
|
||||
err := C.giterr_last()
|
||||
if err == nil {
|
||||
return &GitError{"No message", 0}
|
||||
return &GitError{"No message", C.GITERR_INVALID, C.GIT_ERROR}
|
||||
}
|
||||
return &GitError{C.GoString(err.message), int(err.klass)}
|
||||
return &GitError{C.GoString(err.message), int(err.klass), int(errorCode)}
|
||||
}
|
||||
|
||||
func cbool(b bool) C.int {
|
||||
|
|
@ -175,7 +184,7 @@ func Discover(start string, across_fs bool, ceiling_dirs []string) (string, erro
|
|||
|
||||
ret := C.git_repository_discover(&buf, cstart, cbool(across_fs), ceildirs)
|
||||
if ret < 0 {
|
||||
return "", LastError()
|
||||
return "", MakeGitError(ret)
|
||||
}
|
||||
|
||||
return C.GoString(buf.ptr), nil
|
||||
|
|
|
|||
44
index.go
44
index.go
|
|
@ -6,7 +6,9 @@ package git
|
|||
*/
|
||||
import "C"
|
||||
import (
|
||||
"fmt"
|
||||
"runtime"
|
||||
"time"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
|
|
@ -14,6 +16,17 @@ type Index struct {
|
|||
ptr *C.git_index
|
||||
}
|
||||
|
||||
type IndexEntry struct {
|
||||
Ctime time.Time
|
||||
Mtime time.Time
|
||||
Mode uint
|
||||
Uid uint
|
||||
Gid uint
|
||||
Size uint
|
||||
Id *Oid
|
||||
Path string
|
||||
}
|
||||
|
||||
func newIndexFromC(ptr *C.git_index) *Index {
|
||||
idx := &Index{ptr}
|
||||
runtime.SetFinalizer(idx, (*Index).Free)
|
||||
|
|
@ -29,7 +42,7 @@ func (v *Index) AddByPath(path string) error {
|
|||
|
||||
ret := C.git_index_add_bypath(v.ptr, cstr)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
@ -43,7 +56,7 @@ func (v *Index) WriteTree() (*Oid, error) {
|
|||
|
||||
ret := C.git_index_write_tree(oid.toC(), v.ptr)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return oid, nil
|
||||
|
|
@ -55,7 +68,7 @@ func (v *Index) Write() (error) {
|
|||
|
||||
ret := C.git_index_write(v.ptr)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
@ -65,3 +78,28 @@ func (v *Index) Free() {
|
|||
runtime.SetFinalizer(v, nil)
|
||||
C.git_index_free(v.ptr)
|
||||
}
|
||||
|
||||
func (v *Index) EntryCount() uint {
|
||||
return uint(C.git_index_entrycount(v.ptr))
|
||||
}
|
||||
|
||||
func newIndexEntryFromC(entry *C.git_index_entry) *IndexEntry {
|
||||
return &IndexEntry{
|
||||
time.Unix(int64(entry.ctime.seconds), int64(entry.ctime.nanoseconds)),
|
||||
time.Unix(int64(entry.mtime.seconds), int64(entry.mtime.nanoseconds)),
|
||||
uint(entry.mode),
|
||||
uint(entry.uid),
|
||||
uint(entry.gid),
|
||||
uint(entry.file_size),
|
||||
newOidFromC(&entry.id),
|
||||
C.GoString(entry.path),
|
||||
}
|
||||
}
|
||||
|
||||
func (v *Index) EntryByIndex(index uint) (*IndexEntry, error) {
|
||||
centry := C.git_index_get_byindex(v.ptr, C.size_t(index))
|
||||
if centry == nil {
|
||||
return nil, fmt.Errorf("Index out of Bounds")
|
||||
}
|
||||
return newIndexEntryFromC(centry), nil
|
||||
}
|
||||
|
|
|
|||
16
odb.go
16
odb.go
|
|
@ -32,7 +32,7 @@ func (v *Odb) Write(data []byte, otype ObjectType) (oid *Oid, err error) {
|
|||
ret := C.git_odb_write(oid.toC(), v.ptr, unsafe.Pointer(hdr.Data), C.size_t(hdr.Len), C.git_otype(otype))
|
||||
|
||||
if ret < 0 {
|
||||
err = LastError()
|
||||
err = MakeGitError(ret)
|
||||
}
|
||||
|
||||
return
|
||||
|
|
@ -46,7 +46,7 @@ func (v *Odb) Read(oid *Oid) (obj *OdbObject, err error) {
|
|||
|
||||
ret := C.git_odb_read(&obj.ptr, v.ptr, oid.toC())
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
runtime.SetFinalizer(obj, (*OdbObject).Free)
|
||||
|
|
@ -90,7 +90,7 @@ func (v *Odb) Hash(data []byte, otype ObjectType) (oid *Oid, err error) {
|
|||
|
||||
ret := C.git_odb_hash(oid.toC(), ptr, C.size_t(header.Len), C.git_otype(otype));
|
||||
if ret < 0 {
|
||||
err = LastError()
|
||||
err = MakeGitError(ret)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
|
@ -101,7 +101,7 @@ func (v *Odb) NewReadStream(id *Oid) (*OdbReadStream, error) {
|
|||
stream := new(OdbReadStream)
|
||||
ret := C.git_odb_open_rstream(&stream.ptr, v.ptr, id.toC())
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
runtime.SetFinalizer(stream, (*OdbReadStream).Free)
|
||||
|
|
@ -115,7 +115,7 @@ func (v *Odb) NewWriteStream(size int, otype ObjectType) (*OdbWriteStream, error
|
|||
stream := new(OdbWriteStream)
|
||||
ret := C.git_odb_open_wstream(&stream.ptr, v.ptr, C.size_t(size), C.git_otype(otype))
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
runtime.SetFinalizer(stream, (*OdbWriteStream).Free)
|
||||
|
|
@ -164,7 +164,7 @@ func (stream *OdbReadStream) Read(data []byte) (int, error) {
|
|||
size := C.size_t(header.Cap)
|
||||
ret := C.git_odb_stream_read(stream.ptr, ptr, size)
|
||||
if ret < 0 {
|
||||
return 0, LastError()
|
||||
return 0, MakeGitError(ret)
|
||||
}
|
||||
|
||||
header.Len = int(ret)
|
||||
|
|
@ -196,7 +196,7 @@ func (stream *OdbWriteStream) Write(data []byte) (int, error) {
|
|||
|
||||
ret := C.git_odb_stream_write(stream.ptr, ptr, size)
|
||||
if ret < 0 {
|
||||
return 0, LastError()
|
||||
return 0, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return len(data), nil
|
||||
|
|
@ -207,7 +207,7 @@ func (stream *OdbWriteStream) Write(data []byte) (int, error) {
|
|||
func (stream *OdbWriteStream) Close() error {
|
||||
ret := C.git_odb_stream_finalize_write(stream.Id.toC(), stream.ptr)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ func (repo *Repository) NewPackbuilder() (*Packbuilder, error) {
|
|||
|
||||
ret := C.git_packbuilder_new(&builder.ptr, repo.ptr)
|
||||
if ret != 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
runtime.SetFinalizer(builder, (*Packbuilder).Free)
|
||||
return builder, nil
|
||||
|
|
@ -48,7 +48,7 @@ func (pb *Packbuilder) Insert(id *Oid, name string) error {
|
|||
|
||||
ret := C.git_packbuilder_insert(pb.ptr, id.toC(), cname)
|
||||
if ret != 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -59,7 +59,7 @@ func (pb *Packbuilder) InsertCommit(id *Oid) error {
|
|||
|
||||
ret := C.git_packbuilder_insert_commit(pb.ptr, id.toC())
|
||||
if ret != 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -70,7 +70,7 @@ func (pb *Packbuilder) InsertTree(id *Oid) error {
|
|||
|
||||
ret := C.git_packbuilder_insert_tree(pb.ptr, id.toC())
|
||||
if ret != 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -88,7 +88,7 @@ func (pb *Packbuilder) WriteToFile(name string, mode os.FileMode) error {
|
|||
|
||||
ret := C.git_packbuilder_write(pb.ptr, cname, C.uint(mode.Perm()), nil, nil)
|
||||
if ret != 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
18
reference.go
18
reference.go
|
|
@ -45,7 +45,7 @@ func (v *Reference) SetSymbolicTarget(target string, sig *Signature, msg string)
|
|||
|
||||
ret := C.git_reference_symbolic_set_target(&ptr, v.ptr, ctarget, csig, cmsg)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return newReferenceFromC(ptr), nil
|
||||
|
|
@ -65,7 +65,7 @@ func (v *Reference) SetTarget(target *Oid, sig *Signature, msg string) (*Referen
|
|||
|
||||
ret := C.git_reference_set_target(&ptr, v.ptr, target.toC(), csig, cmsg)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return newReferenceFromC(ptr), nil
|
||||
|
|
@ -79,7 +79,7 @@ func (v *Reference) Resolve() (*Reference, error) {
|
|||
|
||||
ret := C.git_reference_resolve(&ptr, v.ptr)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return newReferenceFromC(ptr), nil
|
||||
|
|
@ -102,7 +102,7 @@ func (v *Reference) Rename(name string, force bool, sig *Signature, msg string)
|
|||
ret := C.git_reference_rename(&ptr, v.ptr, cname, cbool(force), csig, cmsg)
|
||||
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return newReferenceFromC(ptr), nil
|
||||
|
|
@ -128,7 +128,7 @@ func (v *Reference) Delete() error {
|
|||
ret := C.git_reference_delete(v.ptr)
|
||||
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
@ -173,7 +173,7 @@ func (repo *Repository) NewReferenceIterator() (*ReferenceIterator, error) {
|
|||
|
||||
ret := C.git_reference_iterator_new(&ptr, repo.ptr)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
iter := &ReferenceIterator{repo: repo, ptr: ptr}
|
||||
|
|
@ -194,7 +194,7 @@ func (repo *Repository) NewReferenceIteratorGlob(glob string) (*ReferenceIterato
|
|||
|
||||
ret := C.git_reference_iterator_glob_new(&ptr, repo.ptr, cstr)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
iter := &ReferenceIterator{repo: repo, ptr: ptr}
|
||||
|
|
@ -215,7 +215,7 @@ func (v *ReferenceIterator) NextName() (string, error) {
|
|||
return "", ErrIterOver
|
||||
}
|
||||
if ret < 0 {
|
||||
return "", LastError()
|
||||
return "", MakeGitError(ret)
|
||||
}
|
||||
|
||||
return C.GoString(ptr), nil
|
||||
|
|
@ -247,7 +247,7 @@ func (v *ReferenceIterator) Next() (*Reference, error) {
|
|||
return nil, ErrIterOver
|
||||
}
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return newReferenceFromC(ptr), nil
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ func OpenRepository(path string) (*Repository, error) {
|
|||
|
||||
ret := C.git_repository_open(&repo.ptr, cpath)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
runtime.SetFinalizer(repo, (*Repository).Free)
|
||||
|
|
@ -44,7 +44,7 @@ func InitRepository(path string, isbare bool) (*Repository, error) {
|
|||
|
||||
ret := C.git_repository_init(&repo.ptr, cpath, ucbool(isbare))
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
runtime.SetFinalizer(repo, (*Repository).Free)
|
||||
|
|
@ -64,7 +64,7 @@ func (v *Repository) Config() (*Config, error) {
|
|||
|
||||
ret := C.git_repository_config(&config.ptr, v.ptr)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
runtime.SetFinalizer(config, (*Config).Free)
|
||||
|
|
@ -79,32 +79,32 @@ func (v *Repository) Index() (*Index, error) {
|
|||
|
||||
ret := C.git_repository_index(&ptr, v.ptr)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
runtime.LockOSThread()
|
||||
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 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return allocObject(ptr), nil
|
||||
}
|
||||
|
||||
func (v *Repository) Lookup(oid *Oid) (Object, error) {
|
||||
return v.lookupType(oid, ObjectAny)
|
||||
func (v *Repository) Lookup(id *Oid) (Object, error) {
|
||||
return v.lookupType(id, ObjectAny)
|
||||
}
|
||||
|
||||
func (v *Repository) LookupTree(oid *Oid) (*Tree, error) {
|
||||
obj, err := v.lookupType(oid, ObjectTree)
|
||||
func (v *Repository) LookupTree(id *Oid) (*Tree, error) {
|
||||
obj, err := v.lookupType(id, ObjectTree)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -112,8 +112,8 @@ func (v *Repository) LookupTree(oid *Oid) (*Tree, error) {
|
|||
return obj.(*Tree), nil
|
||||
}
|
||||
|
||||
func (v *Repository) LookupCommit(oid *Oid) (*Commit, error) {
|
||||
obj, err := v.lookupType(oid, ObjectCommit)
|
||||
func (v *Repository) LookupCommit(id *Oid) (*Commit, error) {
|
||||
obj, err := v.lookupType(id, ObjectCommit)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -121,8 +121,8 @@ func (v *Repository) LookupCommit(oid *Oid) (*Commit, error) {
|
|||
return obj.(*Commit), nil
|
||||
}
|
||||
|
||||
func (v *Repository) LookupBlob(oid *Oid) (*Blob, error) {
|
||||
obj, err := v.lookupType(oid, ObjectBlob)
|
||||
func (v *Repository) LookupBlob(id *Oid) (*Blob, error) {
|
||||
obj, err := v.lookupType(id, ObjectBlob)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -140,13 +140,13 @@ func (v *Repository) LookupReference(name string) (*Reference, error) {
|
|||
|
||||
ecode := C.git_reference_lookup(&ptr, v.ptr, cname)
|
||||
if ecode < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ecode)
|
||||
}
|
||||
|
||||
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)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
||||
|
|
@ -161,9 +161,9 @@ func (v *Repository) CreateReference(name string, oid *Oid, force bool, sig *Sig
|
|||
runtime.LockOSThread()
|
||||
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 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ecode)
|
||||
}
|
||||
|
||||
return newReferenceFromC(ptr), nil
|
||||
|
|
@ -189,7 +189,7 @@ func (v *Repository) CreateSymbolicReference(name, target string, force bool, si
|
|||
|
||||
ecode := C.git_reference_symbolic_create(&ptr, v.ptr, cname, ctarget, cbool(force), csig, cmsg)
|
||||
if ecode < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ecode)
|
||||
}
|
||||
|
||||
return newReferenceFromC(ptr), nil
|
||||
|
|
@ -203,7 +203,7 @@ func (v *Repository) Walk() (*RevWalk, error) {
|
|||
|
||||
ecode := C.git_revwalk_new(&walk.ptr, v.ptr)
|
||||
if ecode < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ecode)
|
||||
}
|
||||
|
||||
walk.repo = v
|
||||
|
|
@ -250,7 +250,7 @@ func (v *Repository) CreateCommit(
|
|||
nil, cmsg, tree.ptr, C.size_t(nparents), parentsarg)
|
||||
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return oid, nil
|
||||
|
|
@ -268,7 +268,7 @@ func (v *Repository) Odb() (odb *Odb, err error) {
|
|||
defer runtime.UnlockOSThread()
|
||||
|
||||
if ret := C.git_repository_odb(&odb.ptr, v.ptr); ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
runtime.SetFinalizer(odb, (*Odb).Free)
|
||||
|
|
@ -294,9 +294,10 @@ func (repo *Repository) SetWorkdir(workdir string, updateGitlink bool) error {
|
|||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
if C.git_repository_set_workdir(repo.ptr, cstr, cbool(updateGitlink)) < 0 {
|
||||
return LastError()
|
||||
if ret := C.git_repository_set_workdir(repo.ptr, cstr, cbool(updateGitlink)); ret < 0 {
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
@ -307,7 +308,7 @@ func (v *Repository) TreeBuilder() (*TreeBuilder, error) {
|
|||
defer runtime.UnlockOSThread()
|
||||
|
||||
if ret := C.git_treebuilder_create(&bld.ptr, nil); ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
runtime.SetFinalizer(bld, (*TreeBuilder).Free)
|
||||
|
||||
|
|
@ -326,7 +327,7 @@ func (v *Repository) RevparseSingle(spec string) (Object, error) {
|
|||
|
||||
ecode := C.git_revparse_single(&ptr, v.ptr, cspec)
|
||||
if ecode < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ecode)
|
||||
}
|
||||
|
||||
return allocObject(ptr), nil
|
||||
|
|
|
|||
26
submodule.go
26
submodule.go
|
|
@ -81,7 +81,7 @@ func (repo *Repository) LookupSubmodule(name string) (*Submodule, error) {
|
|||
|
||||
ret := C.git_submodule_lookup(&sub.ptr, repo.ptr, cname)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return sub, nil
|
||||
|
|
@ -102,7 +102,7 @@ func (repo *Repository) ForeachSubmodule(cbk SubmoduleCbk) error {
|
|||
|
||||
ret := C._go_git_visit_submodule(repo.ptr, unsafe.Pointer(&cbk))
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -120,7 +120,7 @@ func (repo *Repository) AddSubmodule(url, path string, use_git_link bool) (*Subm
|
|||
|
||||
ret := C.git_submodule_add_setup(&sub.ptr, repo.ptr, curl, cpath, cbool(use_git_link))
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
return sub, nil
|
||||
}
|
||||
|
|
@ -131,7 +131,7 @@ func (sub *Submodule) FinalizeAdd() error {
|
|||
|
||||
ret := C.git_submodule_add_finalize(sub.ptr)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -142,7 +142,7 @@ func (sub *Submodule) AddToIndex(write_index bool) error {
|
|||
|
||||
ret := C.git_submodule_add_to_index(sub.ptr, cbool(write_index))
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -153,7 +153,7 @@ func (sub *Submodule) Save() error {
|
|||
|
||||
ret := C.git_submodule_save(sub.ptr)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -188,7 +188,7 @@ func (sub *Submodule) SetUrl(url string) error {
|
|||
|
||||
ret := C.git_submodule_set_url(sub.ptr, curl)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -247,7 +247,7 @@ func (sub *Submodule) SetFetchRecurseSubmodules(recurse SubmoduleRecurse) error
|
|||
|
||||
ret := C.git_submodule_set_fetch_recurse_submodules(sub.ptr, C.git_submodule_recurse_t(recurse))
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(C.int(ret))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -258,7 +258,7 @@ func (sub *Submodule) Init(overwrite bool) error {
|
|||
|
||||
ret := C.git_submodule_init(sub.ptr, cbool(overwrite))
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -269,7 +269,7 @@ func (sub *Submodule) Sync() error {
|
|||
|
||||
ret := C.git_submodule_sync(sub.ptr)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -282,7 +282,7 @@ func (sub *Submodule) Open() (*Repository, error) {
|
|||
|
||||
ret := C.git_submodule_open(&repo.ptr, sub.ptr)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
return repo, nil
|
||||
}
|
||||
|
|
@ -293,7 +293,7 @@ func (sub *Submodule) Reload() error {
|
|||
|
||||
ret := C.git_submodule_reload(sub.ptr)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -304,7 +304,7 @@ func (repo *Repository) ReloadAllSubmodules() error {
|
|||
|
||||
ret := C.git_submodule_reload_all(repo.ptr)
|
||||
if ret < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
8
tree.go
8
tree.go
|
|
@ -67,7 +67,7 @@ func (t Tree) EntryByPath(path string) (*TreeEntry, error) {
|
|||
|
||||
ret := C.git_tree_entry_bypath(&entry, t.ptr, cpath)
|
||||
if ret < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(ret)
|
||||
}
|
||||
|
||||
return newTreeEntry(entry), nil
|
||||
|
|
@ -109,7 +109,7 @@ func (t Tree) Walk(callback TreeWalkCallback) error {
|
|||
)
|
||||
|
||||
if err < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
@ -134,7 +134,7 @@ func (v *TreeBuilder) Insert(filename string, id *Oid, filemode int) (error) {
|
|||
|
||||
err := C.git_treebuilder_insert(nil, v.ptr, cfilename, id.toC(), C.git_filemode_t(filemode))
|
||||
if err < 0 {
|
||||
return LastError()
|
||||
return MakeGitError(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
@ -149,7 +149,7 @@ func (v *TreeBuilder) Write() (*Oid, error) {
|
|||
err := C.git_treebuilder_write(oid.toC(), v.repo.ptr, v.ptr)
|
||||
|
||||
if err < 0 {
|
||||
return nil, LastError()
|
||||
return nil, MakeGitError(err)
|
||||
}
|
||||
|
||||
return oid, nil
|
||||
|
|
|
|||
8
walk.go
8
walk.go
|
|
@ -40,22 +40,22 @@ func (v *RevWalk) PushHead() (err error) {
|
|||
|
||||
ecode := C.git_revwalk_push_head(v.ptr)
|
||||
if ecode < 0 {
|
||||
err = LastError()
|
||||
err = MakeGitError(ecode)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (v *RevWalk) Next(oid *Oid) (err error) {
|
||||
func (v *RevWalk) Next(id *Oid) (err error) {
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_revwalk_next(oid.toC(), v.ptr)
|
||||
ret := C.git_revwalk_next(id.toC(), v.ptr)
|
||||
switch {
|
||||
case ret == ITEROVER:
|
||||
err = io.EOF
|
||||
case ret < 0:
|
||||
err = LastError()
|
||||
err = MakeGitError(ret)
|
||||
}
|
||||
|
||||
return
|
||||
|
|
|
|||
Loading…
Reference in New Issue