diff options
author | Máximo Cuadros <mcuadros@gmail.com> | 2020-03-10 00:40:56 +0100 |
---|---|---|
committer | Máximo Cuadros <mcuadros@gmail.com> | 2020-03-10 00:40:56 +0100 |
commit | 2bdfd91f04068220a72feeade31defc09f2a601e (patch) | |
tree | eb3096d97addee6d5a95538a90d37fe4146312e3 /storage/filesystem | |
parent | 042981be1fc9aa9b182c3c35b7e2258845e13f49 (diff) | |
download | go-git-2bdfd91f04068220a72feeade31defc09f2a601e.tar.gz |
*: migration from gopkg to go modules
Diffstat (limited to 'storage/filesystem')
-rw-r--r-- | storage/filesystem/config.go | 6 | ||||
-rw-r--r-- | storage/filesystem/config_test.go | 6 | ||||
-rw-r--r-- | storage/filesystem/deltaobject.go | 2 | ||||
-rw-r--r-- | storage/filesystem/dotgit/dotgit.go | 10 | ||||
-rw-r--r-- | storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go | 4 | ||||
-rw-r--r-- | storage/filesystem/dotgit/dotgit_setref.go | 6 | ||||
-rw-r--r-- | storage/filesystem/dotgit/dotgit_test.go | 6 | ||||
-rw-r--r-- | storage/filesystem/dotgit/writers.go | 10 | ||||
-rw-r--r-- | storage/filesystem/dotgit/writers_test.go | 8 | ||||
-rw-r--r-- | storage/filesystem/index.go | 6 | ||||
-rw-r--r-- | storage/filesystem/module.go | 6 | ||||
-rw-r--r-- | storage/filesystem/object.go | 20 | ||||
-rw-r--r-- | storage/filesystem/object_test.go | 6 | ||||
-rw-r--r-- | storage/filesystem/reference.go | 6 | ||||
-rw-r--r-- | storage/filesystem/shallow.go | 6 | ||||
-rw-r--r-- | storage/filesystem/storage.go | 6 | ||||
-rw-r--r-- | storage/filesystem/storage_test.go | 10 |
17 files changed, 62 insertions, 62 deletions
diff --git a/storage/filesystem/config.go b/storage/filesystem/config.go index be812e4..01b35b4 100644 --- a/storage/filesystem/config.go +++ b/storage/filesystem/config.go @@ -4,9 +4,9 @@ import ( stdioutil "io/ioutil" "os" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/utils/ioutil" ) type ConfigStorage struct { diff --git a/storage/filesystem/config_test.go b/storage/filesystem/config_test.go index 71c947d..89d4210 100644 --- a/storage/filesystem/config_test.go +++ b/storage/filesystem/config_test.go @@ -4,11 +4,11 @@ import ( "io/ioutil" "os" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" + "github.com/go-git/go-billy/v5/osfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/osfs" "gopkg.in/src-d/go-git-fixtures.v3" ) diff --git a/storage/filesystem/deltaobject.go b/storage/filesystem/deltaobject.go index 66cfb71..6ab2cdf 100644 --- a/storage/filesystem/deltaobject.go +++ b/storage/filesystem/deltaobject.go @@ -1,7 +1,7 @@ package filesystem import ( - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) type deltaObject struct { diff --git a/storage/filesystem/dotgit/dotgit.go b/storage/filesystem/dotgit/dotgit.go index 7989e53..3ce9dae 100644 --- a/storage/filesystem/dotgit/dotgit.go +++ b/storage/filesystem/dotgit/dotgit.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "gopkg.in/src-d/go-billy.v4/osfs" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-billy/v5/osfs" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/utils/ioutil" - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-billy/v5" ) const ( diff --git a/storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go b/storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go index 7f1c02c..43263ea 100644 --- a/storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go +++ b/storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go @@ -5,8 +5,8 @@ import ( "os" "runtime" - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-git/v5/utils/ioutil" ) func (d *DotGit) openAndLockPackedRefsMode() int { diff --git a/storage/filesystem/dotgit/dotgit_setref.go b/storage/filesystem/dotgit/dotgit_setref.go index 9da2f31..c057f5c 100644 --- a/storage/filesystem/dotgit/dotgit_setref.go +++ b/storage/filesystem/dotgit/dotgit_setref.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/utils/ioutil" - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-billy/v5" ) func (d *DotGit) setRef(fileName, content string, old *plumbing.Reference) (err error) { diff --git a/storage/filesystem/dotgit/dotgit_test.go b/storage/filesystem/dotgit/dotgit_test.go index bd4e9f0..87b702d 100644 --- a/storage/filesystem/dotgit/dotgit_test.go +++ b/storage/filesystem/dotgit/dotgit_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-billy/v5/osfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/osfs" "gopkg.in/src-d/go-git-fixtures.v3" ) diff --git a/storage/filesystem/dotgit/writers.go b/storage/filesystem/dotgit/writers.go index 93d2d8c..e2ede93 100644 --- a/storage/filesystem/dotgit/writers.go +++ b/storage/filesystem/dotgit/writers.go @@ -5,12 +5,12 @@ import ( "io" "sync/atomic" - "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" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/idxfile" + "github.com/go-git/go-git/v5/plumbing/format/objfile" + "github.com/go-git/go-git/v5/plumbing/format/packfile" - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-billy/v5" ) // PackWriter is a io.Writer that generates the packfile index simultaneously, diff --git a/storage/filesystem/dotgit/writers_test.go b/storage/filesystem/dotgit/writers_test.go index 5a5f7b4..8d3b797 100644 --- a/storage/filesystem/dotgit/writers_test.go +++ b/storage/filesystem/dotgit/writers_test.go @@ -8,12 +8,12 @@ import ( "os" "strconv" - "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/packfile" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/idxfile" + "github.com/go-git/go-git/v5/plumbing/format/packfile" + "github.com/go-git/go-billy/v5/osfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/osfs" "gopkg.in/src-d/go-git-fixtures.v3" ) diff --git a/storage/filesystem/index.go b/storage/filesystem/index.go index be800ef..a19176f 100644 --- a/storage/filesystem/index.go +++ b/storage/filesystem/index.go @@ -4,9 +4,9 @@ import ( "bufio" "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" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/utils/ioutil" ) type IndexStorage struct { diff --git a/storage/filesystem/module.go b/storage/filesystem/module.go index 9272206..20336c1 100644 --- a/storage/filesystem/module.go +++ b/storage/filesystem/module.go @@ -1,9 +1,9 @@ package filesystem import ( - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/storage" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" ) type ModuleStorage struct { diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go index ad5d8d0..862cc1b 100644 --- a/storage/filesystem/object.go +++ b/storage/filesystem/object.go @@ -5,16 +5,16 @@ import ( "os" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "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/dotgit" - "gopkg.in/src-d/go-git.v4/utils/ioutil" - - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing/format/idxfile" + "github.com/go-git/go-git/v5/plumbing/format/objfile" + "github.com/go-git/go-git/v5/plumbing/format/packfile" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/utils/ioutil" + + "github.com/go-git/go-billy/v5" ) type ObjectStorage struct { diff --git a/storage/filesystem/object_test.go b/storage/filesystem/object_test.go index c2461db..f9a6a76 100644 --- a/storage/filesystem/object_test.go +++ b/storage/filesystem/object_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/storage/filesystem/reference.go b/storage/filesystem/reference.go index a891b83..aabcd73 100644 --- a/storage/filesystem/reference.go +++ b/storage/filesystem/reference.go @@ -1,9 +1,9 @@ package filesystem import ( - "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/dotgit" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" ) type ReferenceStorage struct { diff --git a/storage/filesystem/shallow.go b/storage/filesystem/shallow.go index 502d406..afb600c 100644 --- a/storage/filesystem/shallow.go +++ b/storage/filesystem/shallow.go @@ -4,9 +4,9 @@ import ( "bufio" "fmt" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/utils/ioutil" ) // ShallowStorage where the shallow commits are stored, an internal to diff --git a/storage/filesystem/storage.go b/storage/filesystem/storage.go index 88d1ed4..8b69b27 100644 --- a/storage/filesystem/storage.go +++ b/storage/filesystem/storage.go @@ -2,10 +2,10 @@ package filesystem import ( - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-billy/v5" ) // 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 6fa0d90..2c7c690 100644 --- a/storage/filesystem/storage_test.go +++ b/storage/filesystem/storage_test.go @@ -4,13 +4,13 @@ import ( "io/ioutil" "testing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage/test" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage/test" + "github.com/go-git/go-billy/v5/memfs" + "github.com/go-git/go-billy/v5/osfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/memfs" - "gopkg.in/src-d/go-billy.v4/osfs" ) func Test(t *testing.T) { TestingT(t) } |