diff options
author | Miguel Molina <miguel@erizocosmi.co> | 2018-06-08 12:31:15 +0200 |
---|---|---|
committer | Miguel Molina <miguel@erizocosmi.co> | 2018-06-08 14:31:01 +0200 |
commit | ecd2bd553ce223252d9784572fd47bd9f597618e (patch) | |
tree | 88fa5da0c9fe6c01860d0cda8850db33d7c0078e /storage/filesystem | |
parent | b23570073eaee3489e5e3d666f22ba5cbeb53243 (diff) | |
download | go-git-ecd2bd553ce223252d9784572fd47bd9f597618e.tar.gz |
storage: filesystem, make ObjectStorage constructor public
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
Diffstat (limited to 'storage/filesystem')
-rw-r--r-- | storage/filesystem/object.go | 5 | ||||
-rw-r--r-- | storage/filesystem/object_test.go | 10 | ||||
-rw-r--r-- | storage/filesystem/storage.go | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go index 54f268a..9ffe4dc 100644 --- a/storage/filesystem/object.go +++ b/storage/filesystem/object.go @@ -26,7 +26,8 @@ type ObjectStorage struct { index map[plumbing.Hash]*packfile.Index } -func newObjectStorage(dir *dotgit.DotGit) (ObjectStorage, error) { +// NewObjectStorage creates a new ObjectStorage with the given .git directory. +func NewObjectStorage(dir *dotgit.DotGit) (ObjectStorage, error) { s := ObjectStorage{ deltaBaseCache: cache.NewObjectLRUDefault(), dir: dir, @@ -166,7 +167,7 @@ func (s *ObjectStorage) EncodedObject(t plumbing.ObjectType, h plumbing.Hash) (p // Create a new object storage with the DotGit(s) and check for the // required hash object. Skip when not found. for _, dg := range dotgits { - o, oe := newObjectStorage(dg) + o, oe := NewObjectStorage(dg) if oe != nil { continue } diff --git a/storage/filesystem/object_test.go b/storage/filesystem/object_test.go index 4b57a67..ecd6beb 100644 --- a/storage/filesystem/object_test.go +++ b/storage/filesystem/object_test.go @@ -24,7 +24,7 @@ var _ = Suite(&FsSuite{ func (s *FsSuite) TestGetFromObjectFile(c *C) { fs := fixtures.ByTag(".git").ByTag("unpacked").One().DotGit() - o, err := newObjectStorage(dotgit.New(fs)) + o, err := NewObjectStorage(dotgit.New(fs)) c.Assert(err, IsNil) expected := plumbing.NewHash("f3dfe29d268303fc6e1bbce268605fc99573406e") @@ -36,7 +36,7 @@ func (s *FsSuite) TestGetFromObjectFile(c *C) { func (s *FsSuite) TestGetFromPackfile(c *C) { fixtures.Basic().ByTag(".git").Test(c, func(f *fixtures.Fixture) { fs := f.DotGit() - o, err := newObjectStorage(dotgit.New(fs)) + o, err := NewObjectStorage(dotgit.New(fs)) c.Assert(err, IsNil) expected := plumbing.NewHash("6ecf0ef2c2dffb796033e5a02219af86ec6584e5") @@ -48,7 +48,7 @@ func (s *FsSuite) TestGetFromPackfile(c *C) { func (s *FsSuite) TestGetFromPackfileMultiplePackfiles(c *C) { fs := fixtures.ByTag(".git").ByTag("multi-packfile").One().DotGit() - o, err := newObjectStorage(dotgit.New(fs)) + o, err := NewObjectStorage(dotgit.New(fs)) c.Assert(err, IsNil) expected := plumbing.NewHash("8d45a34641d73851e01d3754320b33bb5be3c4d3") @@ -65,7 +65,7 @@ func (s *FsSuite) TestGetFromPackfileMultiplePackfiles(c *C) { func (s *FsSuite) TestIter(c *C) { fixtures.ByTag(".git").ByTag("packfile").Test(c, func(f *fixtures.Fixture) { fs := f.DotGit() - o, err := newObjectStorage(dotgit.New(fs)) + o, err := NewObjectStorage(dotgit.New(fs)) c.Assert(err, IsNil) iter, err := o.IterEncodedObjects(plumbing.AnyObject) @@ -86,7 +86,7 @@ func (s *FsSuite) TestIterWithType(c *C) { fixtures.ByTag(".git").Test(c, func(f *fixtures.Fixture) { for _, t := range s.Types { fs := f.DotGit() - o, err := newObjectStorage(dotgit.New(fs)) + o, err := NewObjectStorage(dotgit.New(fs)) c.Assert(err, IsNil) iter, err := o.IterEncodedObjects(t) diff --git a/storage/filesystem/storage.go b/storage/filesystem/storage.go index d7aa18b..622bb4a 100644 --- a/storage/filesystem/storage.go +++ b/storage/filesystem/storage.go @@ -25,7 +25,7 @@ type Storage struct { // NewStorage returns a new Storage backed by a given `fs.Filesystem` func NewStorage(fs billy.Filesystem) (*Storage, error) { dir := dotgit.New(fs) - o, err := newObjectStorage(dir) + o, err := NewObjectStorage(dir) if err != nil { return nil, err } |