Merge branch 'master' of https://github.com/libgit2/git2go into add-branch-lookup

1 files changed, 41 insertions, 3 deletions

diff --git a/index.go b/index.go
index fb32010..6da3c98 100644
--- a/index.go
+++ b/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
+}