diff options
author | Máximo Cuadros <mcuadros@gmail.com> | 2017-11-24 09:49:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-24 09:49:05 +0100 |
commit | be7a64e40de9cf2b2590bf4b62b2f9169f5f9302 (patch) | |
tree | 239e82702d6448db8de5be6219c30422fdb4b387 /storage | |
parent | d9518b57cdc9701c0077d23db54558f496daea9f (diff) | |
parent | caa4dc4729e50e3a10ccd438d02d69fa20f9b766 (diff) | |
download | go-git-be7a64e40de9cf2b2590bf4b62b2f9169f5f9302.tar.gz |
Merge pull request #655 from mcuadros/billy.v4
*: update to go-billy.v4 and go-git-fixtures.v3
Diffstat (limited to 'storage')
-rw-r--r-- | storage/filesystem/config_test.go | 4 | ||||
-rw-r--r-- | storage/filesystem/internal/dotgit/dotgit.go | 2 | ||||
-rw-r--r-- | storage/filesystem/internal/dotgit/dotgit_test.go | 4 | ||||
-rw-r--r-- | storage/filesystem/internal/dotgit/writers.go | 2 | ||||
-rw-r--r-- | storage/filesystem/internal/dotgit/writers_test.go | 8 | ||||
-rw-r--r-- | storage/filesystem/object.go | 2 | ||||
-rw-r--r-- | storage/filesystem/object_test.go | 2 | ||||
-rw-r--r-- | storage/filesystem/storage.go | 2 | ||||
-rw-r--r-- | storage/filesystem/storage_test.go | 4 | ||||
-rw-r--r-- | storage/test/storage_suite.go | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/storage/filesystem/config_test.go b/storage/filesystem/config_test.go index 4226b33..cc03119 100644 --- a/storage/filesystem/config_test.go +++ b/storage/filesystem/config_test.go @@ -4,12 +4,12 @@ import ( "io/ioutil" "os" - "github.com/src-d/go-git-fixtures" "gopkg.in/src-d/go-git.v4/config" "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v3/osfs" + "gopkg.in/src-d/go-billy.v4/osfs" + "gopkg.in/src-d/go-git-fixtures.v3" ) type ConfigSuite struct { diff --git a/storage/filesystem/internal/dotgit/dotgit.go b/storage/filesystem/internal/dotgit/dotgit.go index bbdd6ef..0c9cd33 100644 --- a/storage/filesystem/internal/dotgit/dotgit.go +++ b/storage/filesystem/internal/dotgit/dotgit.go @@ -12,7 +12,7 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/utils/ioutil" - "gopkg.in/src-d/go-billy.v3" + "gopkg.in/src-d/go-billy.v4" ) const ( diff --git a/storage/filesystem/internal/dotgit/dotgit_test.go b/storage/filesystem/internal/dotgit/dotgit_test.go index a7f16f4..d73df19 100644 --- a/storage/filesystem/internal/dotgit/dotgit_test.go +++ b/storage/filesystem/internal/dotgit/dotgit_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "github.com/src-d/go-git-fixtures" "gopkg.in/src-d/go-git.v4/plumbing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v3/osfs" + "gopkg.in/src-d/go-billy.v4/osfs" + "gopkg.in/src-d/go-git-fixtures.v3" ) func Test(t *testing.T) { TestingT(t) } diff --git a/storage/filesystem/internal/dotgit/writers.go b/storage/filesystem/internal/dotgit/writers.go index 46d3619..c2b420f 100644 --- a/storage/filesystem/internal/dotgit/writers.go +++ b/storage/filesystem/internal/dotgit/writers.go @@ -10,7 +10,7 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/format/objfile" "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" - "gopkg.in/src-d/go-billy.v3" + "gopkg.in/src-d/go-billy.v4" ) // PackWriter is a io.Writer that generates the packfile index simultaneously, diff --git a/storage/filesystem/internal/dotgit/writers_test.go b/storage/filesystem/internal/dotgit/writers_test.go index 1544de8..29c4d45 100644 --- a/storage/filesystem/internal/dotgit/writers_test.go +++ b/storage/filesystem/internal/dotgit/writers_test.go @@ -8,12 +8,12 @@ import ( "os" "strconv" - "github.com/src-d/go-git-fixtures" - - . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v3/osfs" "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" + + . "gopkg.in/check.v1" + "gopkg.in/src-d/go-billy.v4/osfs" + "gopkg.in/src-d/go-git-fixtures.v3" ) func (s *SuiteDotGit) TestNewObjectPack(c *C) { diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go index 5073a38..93c804e 100644 --- a/storage/filesystem/object.go +++ b/storage/filesystem/object.go @@ -14,7 +14,7 @@ import ( "gopkg.in/src-d/go-git.v4/storage/memory" "gopkg.in/src-d/go-git.v4/utils/ioutil" - "gopkg.in/src-d/go-billy.v3" + "gopkg.in/src-d/go-billy.v4" ) const DefaultMaxDeltaBaseCacheSize = 92 * cache.MiByte diff --git a/storage/filesystem/object_test.go b/storage/filesystem/object_test.go index 504bd45..de8f2b2 100644 --- a/storage/filesystem/object_test.go +++ b/storage/filesystem/object_test.go @@ -1,11 +1,11 @@ package filesystem import ( - "github.com/src-d/go-git-fixtures" "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" . "gopkg.in/check.v1" + "gopkg.in/src-d/go-git-fixtures.v3" ) type FsSuite struct { diff --git a/storage/filesystem/storage.go b/storage/filesystem/storage.go index 2c7c107..82b137c 100644 --- a/storage/filesystem/storage.go +++ b/storage/filesystem/storage.go @@ -4,7 +4,7 @@ package filesystem import ( "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" - "gopkg.in/src-d/go-billy.v3" + "gopkg.in/src-d/go-billy.v4" ) // Storage is an implementation of git.Storer that stores data on disk in the diff --git a/storage/filesystem/storage_test.go b/storage/filesystem/storage_test.go index b165c5e..4d9ba6f 100644 --- a/storage/filesystem/storage_test.go +++ b/storage/filesystem/storage_test.go @@ -8,8 +8,8 @@ import ( "gopkg.in/src-d/go-git.v4/storage/test" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v3/memfs" - "gopkg.in/src-d/go-billy.v3/osfs" + "gopkg.in/src-d/go-billy.v4/memfs" + "gopkg.in/src-d/go-billy.v4/osfs" ) func Test(t *testing.T) { TestingT(t) } diff --git a/storage/test/storage_suite.go b/storage/test/storage_suite.go index bf93515..18e0086 100644 --- a/storage/test/storage_suite.go +++ b/storage/test/storage_suite.go @@ -13,7 +13,7 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/storer" "gopkg.in/src-d/go-git.v4/storage" - "github.com/src-d/go-git-fixtures" + "gopkg.in/src-d/go-git-fixtures.v3" . "gopkg.in/check.v1" ) |