diff options
Diffstat (limited to 'storage')
33 files changed, 106 insertions, 106 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) } diff --git a/storage/memory/storage.go b/storage/memory/storage.go index fee8266..fdf8fcf 100644 --- a/storage/memory/storage.go +++ b/storage/memory/storage.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" ) var ErrUnsupportedObjectType = fmt.Errorf("unsupported object type") diff --git a/storage/memory/storage_test.go b/storage/memory/storage_test.go index 31a27fa..85c7859 100644 --- a/storage/memory/storage_test.go +++ b/storage/memory/storage_test.go @@ -4,7 +4,7 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/storage/test" + "github.com/go-git/go-git/v5/storage/test" ) func Test(t *testing.T) { TestingT(t) } diff --git a/storage/storer.go b/storage/storer.go index 5de0cfb..4800ac7 100644 --- a/storage/storer.go +++ b/storage/storer.go @@ -3,14 +3,14 @@ package storage import ( "errors" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing/storer" ) var ErrReferenceHasChanged = errors.New("reference has changed concurrently") // Storer is a generic storage of objects, references and any information -// related to a particular repository. The package gopkg.in/src-d/go-git.v4/storage +// related to a particular repository. The package github.com/go-git/go-git/v5/storage // contains two implementation a filesystem base implementation (such as `.git`) // and a memory implementations being ephemeral type Storer interface { diff --git a/storage/test/storage_suite.go b/storage/test/storage_suite.go index e050b73..a483a79 100644 --- a/storage/test/storage_suite.go +++ b/storage/test/storage_suite.go @@ -7,11 +7,11 @@ import ( "io" "io/ioutil" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/storage/transactional/config.go b/storage/transactional/config.go index 4d8efe1..f8c3cc2 100644 --- a/storage/transactional/config.go +++ b/storage/transactional/config.go @@ -1,6 +1,6 @@ package transactional -import "gopkg.in/src-d/go-git.v4/config" +import "github.com/go-git/go-git/v5/config" // ConfigStorage implements the storer.ConfigStorage for the transactional package. type ConfigStorage struct { diff --git a/storage/transactional/config_test.go b/storage/transactional/config_test.go index 5d1e019..ec7ae89 100644 --- a/storage/transactional/config_test.go +++ b/storage/transactional/config_test.go @@ -2,8 +2,8 @@ package transactional import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/storage/memory" ) var _ = Suite(&ConfigSuite{}) diff --git a/storage/transactional/index.go b/storage/transactional/index.go index 84e0e2f..70641ac 100644 --- a/storage/transactional/index.go +++ b/storage/transactional/index.go @@ -1,8 +1,8 @@ package transactional import ( - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/storer" ) // IndexStorage implements the storer.IndexStorage for the transactional package. diff --git a/storage/transactional/index_test.go b/storage/transactional/index_test.go index e1c571a..88fa1f5 100644 --- a/storage/transactional/index_test.go +++ b/storage/transactional/index_test.go @@ -2,8 +2,8 @@ package transactional import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/storage/memory" ) var _ = Suite(&IndexSuite{}) diff --git a/storage/transactional/object.go b/storage/transactional/object.go index beb63d6..5d102b0 100644 --- a/storage/transactional/object.go +++ b/storage/transactional/object.go @@ -1,8 +1,8 @@ package transactional import ( - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" ) // ObjectStorage implements the storer.EncodedObjectStorer for the transactional package. diff --git a/storage/transactional/object_test.go b/storage/transactional/object_test.go index 10b6318..e634409 100644 --- a/storage/transactional/object_test.go +++ b/storage/transactional/object_test.go @@ -2,8 +2,8 @@ package transactional import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/memory" ) var _ = Suite(&ObjectSuite{}) diff --git a/storage/transactional/reference.go b/storage/transactional/reference.go index a7be532..c3a727c 100644 --- a/storage/transactional/reference.go +++ b/storage/transactional/reference.go @@ -1,9 +1,9 @@ package transactional 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" + "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" ) // ReferenceStorage implements the storer.ReferenceStorage for the transactional package. diff --git a/storage/transactional/reference_test.go b/storage/transactional/reference_test.go index 5793549..a6bd1ce 100644 --- a/storage/transactional/reference_test.go +++ b/storage/transactional/reference_test.go @@ -2,8 +2,8 @@ package transactional import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/memory" ) var _ = Suite(&ReferenceSuite{}) diff --git a/storage/transactional/shallow.go b/storage/transactional/shallow.go index bedc325..20b930e 100644 --- a/storage/transactional/shallow.go +++ b/storage/transactional/shallow.go @@ -1,8 +1,8 @@ package transactional import ( - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" ) // ShallowStorage implements the storer.ShallowStorer for the transactional package. diff --git a/storage/transactional/shallow_test.go b/storage/transactional/shallow_test.go index 5141782..1209fe6 100644 --- a/storage/transactional/shallow_test.go +++ b/storage/transactional/shallow_test.go @@ -2,8 +2,8 @@ package transactional import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/memory" ) var _ = Suite(&ShallowSuite{}) diff --git a/storage/transactional/storage.go b/storage/transactional/storage.go index b81b104..d4c68cb 100644 --- a/storage/transactional/storage.go +++ b/storage/transactional/storage.go @@ -3,8 +3,8 @@ package transactional import ( "io" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" ) // Storage is a transactional implementation of git.Storer, it demux the write diff --git a/storage/transactional/storage_test.go b/storage/transactional/storage_test.go index 63ebfb1..41d656b 100644 --- a/storage/transactional/storage_test.go +++ b/storage/transactional/storage_test.go @@ -3,15 +3,15 @@ package transactional import ( "testing" + "github.com/go-git/go-billy/v5/memfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/memfs" - "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/storer" - "gopkg.in/src-d/go-git.v4/storage" - "gopkg.in/src-d/go-git.v4/storage/filesystem" - "gopkg.in/src-d/go-git.v4/storage/memory" - "gopkg.in/src-d/go-git.v4/storage/test" + "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/storer" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/storage/filesystem" + "github.com/go-git/go-git/v5/storage/memory" + "github.com/go-git/go-git/v5/storage/test" ) func Test(t *testing.T) { TestingT(t) } |