From 33e7c165c9fb5594821005b7ee55826e5a305487 Mon Sep 17 00:00:00 2001 From: Antonio Jesus Navarro Perez Date: Tue, 7 Mar 2017 12:58:18 +0100 Subject: project: move imports from srcd.works to gopkg.in To be able to fix #261 we will move again to gopkg.in before v4 stable release. --- storage/filesystem/config.go | 4 ++-- storage/filesystem/config_test.go | 4 ++-- storage/filesystem/index.go | 4 ++-- storage/filesystem/internal/dotgit/dotgit.go | 6 +++--- storage/filesystem/internal/dotgit/dotgit_test.go | 4 ++-- storage/filesystem/internal/dotgit/writers.go | 10 +++++----- storage/filesystem/internal/dotgit/writers_test.go | 2 +- storage/filesystem/module.go | 4 ++-- storage/filesystem/object.go | 18 +++++++++--------- storage/filesystem/object_test.go | 4 ++-- storage/filesystem/reference.go | 6 +++--- storage/filesystem/shallow.go | 4 ++-- storage/filesystem/storage.go | 4 ++-- storage/filesystem/storage_test.go | 6 +++--- 14 files changed, 40 insertions(+), 40 deletions(-) (limited to 'storage/filesystem') diff --git a/storage/filesystem/config.go b/storage/filesystem/config.go index 4da70d4..cad698a 100644 --- a/storage/filesystem/config.go +++ b/storage/filesystem/config.go @@ -4,8 +4,8 @@ import ( "io/ioutil" "os" - "srcd.works/go-git.v4/config" - "srcd.works/go-git.v4/storage/filesystem/internal/dotgit" + "gopkg.in/src-d/go-git.v4/config" + "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" ) type ConfigStorage struct { diff --git a/storage/filesystem/config_test.go b/storage/filesystem/config_test.go index 94665b6..1757150 100644 --- a/storage/filesystem/config_test.go +++ b/storage/filesystem/config_test.go @@ -5,10 +5,10 @@ import ( "os" "github.com/src-d/go-git-fixtures" - "srcd.works/go-git.v4/storage/filesystem/internal/dotgit" + "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" . "gopkg.in/check.v1" - "srcd.works/go-billy.v1/osfs" + "gopkg.in/src-d/go-billy.v1/osfs" ) type ConfigSuite struct { diff --git a/storage/filesystem/index.go b/storage/filesystem/index.go index 009b26f..456ef0b 100644 --- a/storage/filesystem/index.go +++ b/storage/filesystem/index.go @@ -3,8 +3,8 @@ package filesystem import ( "os" - "srcd.works/go-git.v4/plumbing/format/index" - "srcd.works/go-git.v4/storage/filesystem/internal/dotgit" + "gopkg.in/src-d/go-git.v4/plumbing/format/index" + "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" ) type IndexStorage struct { diff --git a/storage/filesystem/internal/dotgit/dotgit.go b/storage/filesystem/internal/dotgit/dotgit.go index b46f827..827269e 100644 --- a/storage/filesystem/internal/dotgit/dotgit.go +++ b/storage/filesystem/internal/dotgit/dotgit.go @@ -9,10 +9,10 @@ import ( "os" "strings" - "srcd.works/go-git.v4/plumbing" - "srcd.works/go-git.v4/utils/ioutil" + "gopkg.in/src-d/go-git.v4/plumbing" + "gopkg.in/src-d/go-git.v4/utils/ioutil" - "srcd.works/go-billy.v1" + "gopkg.in/src-d/go-billy.v1" ) const ( diff --git a/storage/filesystem/internal/dotgit/dotgit_test.go b/storage/filesystem/internal/dotgit/dotgit_test.go index 57dfb53..8c53f00 100644 --- a/storage/filesystem/internal/dotgit/dotgit_test.go +++ b/storage/filesystem/internal/dotgit/dotgit_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/src-d/go-git-fixtures" - "srcd.works/go-git.v4/plumbing" + "gopkg.in/src-d/go-git.v4/plumbing" . "gopkg.in/check.v1" - "srcd.works/go-billy.v1/osfs" + "gopkg.in/src-d/go-billy.v1/osfs" ) func Test(t *testing.T) { TestingT(t) } diff --git a/storage/filesystem/internal/dotgit/writers.go b/storage/filesystem/internal/dotgit/writers.go index 5949ace..13fa9bb 100644 --- a/storage/filesystem/internal/dotgit/writers.go +++ b/storage/filesystem/internal/dotgit/writers.go @@ -5,12 +5,12 @@ import ( "io" "sync/atomic" - "srcd.works/go-git.v4/plumbing" - "srcd.works/go-git.v4/plumbing/format/idxfile" - "srcd.works/go-git.v4/plumbing/format/objfile" - "srcd.works/go-git.v4/plumbing/format/packfile" + "gopkg.in/src-d/go-git.v4/plumbing" + "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile" + "gopkg.in/src-d/go-git.v4/plumbing/format/objfile" + "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" - "srcd.works/go-billy.v1" + "gopkg.in/src-d/go-billy.v1" ) // 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 d4da164..cb0dc95 100644 --- a/storage/filesystem/internal/dotgit/writers_test.go +++ b/storage/filesystem/internal/dotgit/writers_test.go @@ -11,7 +11,7 @@ import ( "github.com/src-d/go-git-fixtures" . "gopkg.in/check.v1" - "srcd.works/go-billy.v1/osfs" + "gopkg.in/src-d/go-billy.v1/osfs" ) func (s *SuiteDotGit) TestNewObjectPack(c *C) { diff --git a/storage/filesystem/module.go b/storage/filesystem/module.go index e8985d8..2e469d3 100644 --- a/storage/filesystem/module.go +++ b/storage/filesystem/module.go @@ -1,8 +1,8 @@ package filesystem import ( - "srcd.works/go-git.v4/storage" - "srcd.works/go-git.v4/storage/filesystem/internal/dotgit" + "gopkg.in/src-d/go-git.v4/storage" + "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" ) type ModuleStorage struct { diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go index 904f6fe..9381721 100644 --- a/storage/filesystem/object.go +++ b/storage/filesystem/object.go @@ -4,15 +4,15 @@ import ( "io" "os" - "srcd.works/go-git.v4/plumbing" - "srcd.works/go-git.v4/plumbing/format/idxfile" - "srcd.works/go-git.v4/plumbing/format/objfile" - "srcd.works/go-git.v4/plumbing/format/packfile" - "srcd.works/go-git.v4/plumbing/storer" - "srcd.works/go-git.v4/storage/filesystem/internal/dotgit" - "srcd.works/go-git.v4/storage/memory" - - "srcd.works/go-billy.v1" + "gopkg.in/src-d/go-git.v4/plumbing" + "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile" + "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-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-billy.v1" ) type ObjectStorage struct { diff --git a/storage/filesystem/object_test.go b/storage/filesystem/object_test.go index 2caa70c..d741fa2 100644 --- a/storage/filesystem/object_test.go +++ b/storage/filesystem/object_test.go @@ -2,8 +2,8 @@ package filesystem import ( "github.com/src-d/go-git-fixtures" - "srcd.works/go-git.v4/plumbing" - "srcd.works/go-git.v4/storage/filesystem/internal/dotgit" + "gopkg.in/src-d/go-git.v4/plumbing" + "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" . "gopkg.in/check.v1" ) diff --git a/storage/filesystem/reference.go b/storage/filesystem/reference.go index cff00c9..49627d3 100644 --- a/storage/filesystem/reference.go +++ b/storage/filesystem/reference.go @@ -1,9 +1,9 @@ package filesystem import ( - "srcd.works/go-git.v4/plumbing" - "srcd.works/go-git.v4/plumbing/storer" - "srcd.works/go-git.v4/storage/filesystem/internal/dotgit" + "gopkg.in/src-d/go-git.v4/plumbing" + "gopkg.in/src-d/go-git.v4/plumbing/storer" + "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" ) type ReferenceStorage struct { diff --git a/storage/filesystem/shallow.go b/storage/filesystem/shallow.go index edd95c8..ec8d20e 100644 --- a/storage/filesystem/shallow.go +++ b/storage/filesystem/shallow.go @@ -4,8 +4,8 @@ import ( "bufio" "fmt" - "srcd.works/go-git.v4/plumbing" - "srcd.works/go-git.v4/storage/filesystem/internal/dotgit" + "gopkg.in/src-d/go-git.v4/plumbing" + "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" ) // ShallowStorage where the shallow commits are stored, an internal to diff --git a/storage/filesystem/storage.go b/storage/filesystem/storage.go index 9895507..93da5d5 100644 --- a/storage/filesystem/storage.go +++ b/storage/filesystem/storage.go @@ -2,9 +2,9 @@ package filesystem import ( - "srcd.works/go-git.v4/storage/filesystem/internal/dotgit" + "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" - "srcd.works/go-billy.v1" + "gopkg.in/src-d/go-billy.v1" ) // 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 7300de7..4510657 100644 --- a/storage/filesystem/storage_test.go +++ b/storage/filesystem/storage_test.go @@ -3,11 +3,11 @@ package filesystem import ( "testing" - "srcd.works/go-git.v4/storage/test" + "gopkg.in/src-d/go-git.v4/storage/test" . "gopkg.in/check.v1" - "srcd.works/go-billy.v1/memfs" - "srcd.works/go-billy.v1/osfs" + "gopkg.in/src-d/go-billy.v1/memfs" + "gopkg.in/src-d/go-billy.v1/osfs" ) func Test(t *testing.T) { TestingT(t) } -- cgit From 8df64141e32abd9bd07d5dfd917c76a8a6dbe3f6 Mon Sep 17 00:00:00 2001 From: Antonio Jesus Navarro Perez Date: Fri, 10 Mar 2017 12:23:51 +0100 Subject: use go-billy.v2 version --- storage/filesystem/config_test.go | 2 +- storage/filesystem/internal/dotgit/dotgit.go | 2 +- storage/filesystem/internal/dotgit/dotgit_test.go | 2 +- storage/filesystem/internal/dotgit/writers.go | 2 +- storage/filesystem/internal/dotgit/writers_test.go | 2 +- storage/filesystem/object.go | 2 +- storage/filesystem/storage.go | 2 +- storage/filesystem/storage_test.go | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'storage/filesystem') diff --git a/storage/filesystem/config_test.go b/storage/filesystem/config_test.go index 1757150..b2879b3 100644 --- a/storage/filesystem/config_test.go +++ b/storage/filesystem/config_test.go @@ -8,7 +8,7 @@ import ( "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v1/osfs" + "gopkg.in/src-d/go-billy.v2/osfs" ) type ConfigSuite struct { diff --git a/storage/filesystem/internal/dotgit/dotgit.go b/storage/filesystem/internal/dotgit/dotgit.go index 827269e..fdfcea7 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.v1" + "gopkg.in/src-d/go-billy.v2" ) const ( diff --git a/storage/filesystem/internal/dotgit/dotgit_test.go b/storage/filesystem/internal/dotgit/dotgit_test.go index 8c53f00..4bfae1d 100644 --- a/storage/filesystem/internal/dotgit/dotgit_test.go +++ b/storage/filesystem/internal/dotgit/dotgit_test.go @@ -12,7 +12,7 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v1/osfs" + "gopkg.in/src-d/go-billy.v2/osfs" ) func Test(t *testing.T) { TestingT(t) } diff --git a/storage/filesystem/internal/dotgit/writers.go b/storage/filesystem/internal/dotgit/writers.go index 13fa9bb..0d2747f 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.v1" + "gopkg.in/src-d/go-billy.v2" ) // 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 cb0dc95..e7d7ef9 100644 --- a/storage/filesystem/internal/dotgit/writers_test.go +++ b/storage/filesystem/internal/dotgit/writers_test.go @@ -11,7 +11,7 @@ import ( "github.com/src-d/go-git-fixtures" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v1/osfs" + "gopkg.in/src-d/go-billy.v2/osfs" ) func (s *SuiteDotGit) TestNewObjectPack(c *C) { diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go index 9381721..1518256 100644 --- a/storage/filesystem/object.go +++ b/storage/filesystem/object.go @@ -12,7 +12,7 @@ import ( "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-billy.v1" + "gopkg.in/src-d/go-billy.v2" ) type ObjectStorage struct { diff --git a/storage/filesystem/storage.go b/storage/filesystem/storage.go index 93da5d5..6d58006 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.v1" + "gopkg.in/src-d/go-billy.v2" ) // 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 4510657..02816f4 100644 --- a/storage/filesystem/storage_test.go +++ b/storage/filesystem/storage_test.go @@ -6,8 +6,8 @@ import ( "gopkg.in/src-d/go-git.v4/storage/test" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v1/memfs" - "gopkg.in/src-d/go-billy.v1/osfs" + "gopkg.in/src-d/go-billy.v2/memfs" + "gopkg.in/src-d/go-billy.v2/osfs" ) func Test(t *testing.T) { TestingT(t) } -- cgit