Merge pull request #902 from jfontan/feature/new-packfile-parser

Bugfixes and IndexStorage

Author: jfontan

plumbing/format/idxfile/idxfile.go

@@ -87,7 +87,7 @@ func (idx *MemoryIndex) findHashIndex(h plumbing.Hash) int {
 			low = mid + 1
 		}
 
-		if low > high {
+		if low >= high {
 			break
 		}
 	}

plumbing/format/packfile/decoder.go

@@ -457,7 +457,7 @@ func (d *Decoder) recallByOffset(o int64) (plumbing.EncodedObject, error) {
 
 func (d *Decoder) recallByHash(h plumbing.Hash) (plumbing.EncodedObject, error) {
 	if d.s.IsSeekable {
-		if offset, err := d.idx.FindOffset(h); err != nil {
+		if offset, err := d.idx.FindOffset(h); err == nil {
 			return d.DecodeObjectAt(offset)
 		}
 	}

plumbing/format/packfile/index_test.go

@@ -0,0 +1,47 @@
+package filesystem
+
+import (
+	"os"
+
+	"gopkg.in/src-d/go-git.v4/plumbing/format/index"
+	"gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit"
+	"gopkg.in/src-d/go-git.v4/utils/ioutil"
+)
+
+type IndexStorage struct {
+	dir *dotgit.DotGit
+}
+
+func (s *IndexStorage) SetIndex(idx *index.Index) (err error) {
+	f, err := s.dir.IndexWriter()
+	if err != nil {
+		return err
+	}
+
+	defer ioutil.CheckClose(f, &err)
+
+	e := index.NewEncoder(f)
+	err = e.Encode(idx)
+	return err
+}
+
+func (s *IndexStorage) Index() (i *index.Index, err error) {
+	idx := &index.Index{
+		Version: 2,
+	}
+
+	f, err := s.dir.Index()
+	if err != nil {
+		if os.IsNotExist(err) {
+			return idx, nil
+		}
+
+		return nil, err
+	}
+
+	defer ioutil.CheckClose(f, &err)
+
+	d := index.NewDecoder(f)
+	err = d.Decode(idx)
+	return idx, err
+}