From 1eb39394cdf09b26eb2f5c98225fb2912980e61f Mon Sep 17 00:00:00 2001 From: Sergio Arbeo Date: Mon, 19 Dec 2016 10:42:14 +0100 Subject: Extract billy (#173) * Extract billy Billy is a new library directly extracted from go-git. It abstract several storages systems in a filesystem interface. More in github.com/src-d/billy * Fix grouping in imports block * Update billy to v1 * Re-remove fs_implementation example --- storage/filesystem/object.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'storage/filesystem/object.go') diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go index 836e7f3..e9b5bb7 100644 --- a/storage/filesystem/object.go +++ b/storage/filesystem/object.go @@ -11,7 +11,8 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/storer" "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" "gopkg.in/src-d/go-git.v4/storage/memory" - "gopkg.in/src-d/go-git.v4/utils/fs" + + "srcd.works/go-billy.v1" ) type ObjectStorage struct { @@ -261,7 +262,7 @@ func (i index) Decode(r io.Reader) error { } type packfileIter struct { - f fs.File + f billy.File d *packfile.Decoder t plumbing.ObjectType @@ -270,7 +271,7 @@ type packfileIter struct { total uint32 } -func newPackfileIter(f fs.File, t plumbing.ObjectType, seen map[plumbing.Hash]bool) (storer.EncodedObjectIter, error) { +func newPackfileIter(f billy.File, t plumbing.ObjectType, seen map[plumbing.Hash]bool) (storer.EncodedObjectIter, error) { s := packfile.NewScanner(f) _, total, err := s.Header() if err != nil { -- cgit