From 6b0a5984ac0c69742e60a39ad9437fd981dbe31b Mon Sep 17 00:00:00 2001 From: Máximo Cuadros Date: Wed, 17 Feb 2016 12:20:56 +0100 Subject: update imports to v3 --- .travis.yml | 2 +- blame.go | 4 ++-- blame_test.go | 4 ++-- clients/common.go | 6 +++--- clients/common/common.go | 4 ++-- clients/common/common_test.go | 4 ++-- clients/common_test.go | 2 +- clients/http/common.go | 4 ++-- clients/http/git_upload_pack.go | 6 +++--- clients/http/git_upload_pack_test.go | 4 ++-- clients/ssh/auth_method.go | 2 +- clients/ssh/git_upload_pack.go | 4 ++-- clients/ssh/git_upload_pack_test.go | 4 ++-- commit.go | 2 +- commit_test.go | 4 ++-- common_test.go | 4 ++-- diff/diff_ext_test.go | 2 +- examples/basic/main.go | 2 +- file.go | 2 +- file_test.go | 4 ++-- formats/packfile/reader.go | 2 +- formats/packfile/reader_test.go | 4 ++-- objects.go | 2 +- objects_test.go | 4 ++-- references.go | 4 ++-- references_test.go | 4 ++-- remote.go | 6 +++--- remote_test.go | 6 +++--- repository.go | 8 ++++---- repository_test.go | 4 ++-- storage/memory/object.go | 2 +- storage/memory/object_test.go | 2 +- storage/memory/storage.go | 2 +- storage/memory/storage_test.go | 2 +- tree.go | 2 +- tree_test.go | 4 ++-- 36 files changed, 64 insertions(+), 64 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c3a723..2caf684 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: install: - rm -rf $GOPATH/src/gopkg.in/src-d - mkdir -p $GOPATH/src/gopkg.in/src-d - - ln -s $PWD $GOPATH/src/gopkg.in/src-d/go-git.v2 + - ln -s $PWD $GOPATH/src/gopkg.in/src-d/go-git.v3 - go get -v -t ./... script: diff --git a/blame.go b/blame.go index 0faae67..7dc2cc0 100644 --- a/blame.go +++ b/blame.go @@ -8,8 +8,8 @@ import ( "strings" "unicode/utf8" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/diff" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/diff" ) type Blame struct { diff --git a/blame_test.go b/blame_test.go index 622d2af..f64dfa9 100644 --- a/blame_test.go +++ b/blame_test.go @@ -3,8 +3,8 @@ package git import ( "os" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/formats/packfile" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/formats/packfile" . "gopkg.in/check.v1" ) diff --git a/clients/common.go b/clients/common.go index f7868cf..55b3b4b 100644 --- a/clients/common.go +++ b/clients/common.go @@ -15,9 +15,9 @@ import ( "fmt" "net/url" - "gopkg.in/src-d/go-git.v2/clients/common" - "gopkg.in/src-d/go-git.v2/clients/http" - "gopkg.in/src-d/go-git.v2/clients/ssh" + "gopkg.in/src-d/go-git.v3/clients/common" + "gopkg.in/src-d/go-git.v3/clients/http" + "gopkg.in/src-d/go-git.v3/clients/ssh" ) // DefaultProtocols are the protocols supported by default. diff --git a/clients/common/common.go b/clients/common/common.go index ec04dda..5aa6269 100644 --- a/clients/common/common.go +++ b/clients/common/common.go @@ -8,8 +8,8 @@ import ( "io/ioutil" "strings" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/formats/pktline" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/formats/pktline" "gopkg.in/sourcegraph/go-vcsurl.v1" ) diff --git a/clients/common/common_test.go b/clients/common/common_test.go index c8dafe9..091e5fa 100644 --- a/clients/common/common_test.go +++ b/clients/common/common_test.go @@ -6,8 +6,8 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/formats/pktline" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/formats/pktline" ) func Test(t *testing.T) { TestingT(t) } diff --git a/clients/common_test.go b/clients/common_test.go index c3b766b..88f66ab 100644 --- a/clients/common_test.go +++ b/clients/common_test.go @@ -6,7 +6,7 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v2/clients/common" + "gopkg.in/src-d/go-git.v3/clients/common" ) func Test(t *testing.T) { TestingT(t) } diff --git a/clients/http/common.go b/clients/http/common.go index aa6e7a1..f163cfc 100644 --- a/clients/http/common.go +++ b/clients/http/common.go @@ -6,9 +6,9 @@ import ( "fmt" "net/http" - "gopkg.in/src-d/go-git.v2/clients/common" + "gopkg.in/src-d/go-git.v3/clients/common" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/core" ) var InvalidAuthMethodErr = errors.New("invalid http auth method: a http.HTTPAuthMethod should be provided.") diff --git a/clients/http/git_upload_pack.go b/clients/http/git_upload_pack.go index 2d38d42..7a3d296 100644 --- a/clients/http/git_upload_pack.go +++ b/clients/http/git_upload_pack.go @@ -6,9 +6,9 @@ import ( "net/http" "strings" - "gopkg.in/src-d/go-git.v2/clients/common" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/formats/pktline" + "gopkg.in/src-d/go-git.v3/clients/common" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/formats/pktline" ) type GitUploadPackService struct { diff --git a/clients/http/git_upload_pack_test.go b/clients/http/git_upload_pack_test.go index f9ec424..0b76fb9 100644 --- a/clients/http/git_upload_pack_test.go +++ b/clients/http/git_upload_pack_test.go @@ -4,8 +4,8 @@ import ( "io/ioutil" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v2/clients/common" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/clients/common" + "gopkg.in/src-d/go-git.v3/core" ) type SuiteRemote struct{} diff --git a/clients/ssh/auth_method.go b/clients/ssh/auth_method.go index 445d502..c680336 100644 --- a/clients/ssh/auth_method.go +++ b/clients/ssh/auth_method.go @@ -4,7 +4,7 @@ import ( "fmt" "golang.org/x/crypto/ssh" - "gopkg.in/src-d/go-git.v2/clients/common" + "gopkg.in/src-d/go-git.v3/clients/common" ) // AuthMethod is the interface all auth methods for the ssh client diff --git a/clients/ssh/git_upload_pack.go b/clients/ssh/git_upload_pack.go index 09cb5ab..0d824cd 100644 --- a/clients/ssh/git_upload_pack.go +++ b/clients/ssh/git_upload_pack.go @@ -12,8 +12,8 @@ import ( "io/ioutil" "net/url" - "gopkg.in/src-d/go-git.v2/clients/common" - "gopkg.in/src-d/go-git.v2/formats/pktline" + "gopkg.in/src-d/go-git.v3/clients/common" + "gopkg.in/src-d/go-git.v3/formats/pktline" "github.com/sourcegraph/go-vcsurl" "golang.org/x/crypto/ssh" diff --git a/clients/ssh/git_upload_pack_test.go b/clients/ssh/git_upload_pack_test.go index 673e0fc..4b50c4c 100644 --- a/clients/ssh/git_upload_pack_test.go +++ b/clients/ssh/git_upload_pack_test.go @@ -9,8 +9,8 @@ import ( "golang.org/x/crypto/ssh/agent" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v2/clients/common" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/clients/common" + "gopkg.in/src-d/go-git.v3/core" ) type SuiteRemote struct{} diff --git a/commit.go b/commit.go index cdfc902..9e499d2 100644 --- a/commit.go +++ b/commit.go @@ -7,7 +7,7 @@ import ( "io" "sort" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/core" ) type Hash core.Hash diff --git a/commit_test.go b/commit_test.go index 65f6400..fbaccd6 100644 --- a/commit_test.go +++ b/commit_test.go @@ -4,8 +4,8 @@ import ( "io" "os" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/formats/packfile" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/formats/packfile" . "gopkg.in/check.v1" ) diff --git a/common_test.go b/common_test.go index f6e0f0c..0cd61f1 100644 --- a/common_test.go +++ b/common_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "gopkg.in/src-d/go-git.v2/clients/common" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/clients/common" + "gopkg.in/src-d/go-git.v3/core" . "gopkg.in/check.v1" ) diff --git a/diff/diff_ext_test.go b/diff/diff_ext_test.go index 460cf8a..aa94ca2 100644 --- a/diff/diff_ext_test.go +++ b/diff/diff_ext_test.go @@ -3,7 +3,7 @@ package diff_test import ( "testing" - "gopkg.in/src-d/go-git.v2/diff" + "gopkg.in/src-d/go-git.v3/diff" "github.com/sergi/go-diff/diffmatchpatch" . "gopkg.in/check.v1" diff --git a/examples/basic/main.go b/examples/basic/main.go index c922d35..4b443b2 100644 --- a/examples/basic/main.go +++ b/examples/basic/main.go @@ -5,7 +5,7 @@ import ( "io" "os" - "gopkg.in/src-d/go-git.v2" + "gopkg.in/src-d/go-git.v3" ) func main() { diff --git a/file.go b/file.go index 86baf7d..b0b0141 100644 --- a/file.go +++ b/file.go @@ -5,7 +5,7 @@ import ( "io" "strings" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/core" ) // File represents git file objects. diff --git a/file_test.go b/file_test.go index b5bdeac..25b4cf8 100644 --- a/file_test.go +++ b/file_test.go @@ -3,8 +3,8 @@ package git import ( "os" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/formats/packfile" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/formats/packfile" . "gopkg.in/check.v1" ) diff --git a/formats/packfile/reader.go b/formats/packfile/reader.go index e981d72..6f30f8a 100644 --- a/formats/packfile/reader.go +++ b/formats/packfile/reader.go @@ -7,7 +7,7 @@ import ( "io" "io/ioutil" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/core" "github.com/klauspost/compress/zlib" ) diff --git a/formats/packfile/reader_test.go b/formats/packfile/reader_test.go index 69069c8..040dd02 100644 --- a/formats/packfile/reader_test.go +++ b/formats/packfile/reader_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/storages/memory" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/storages/memory" "github.com/dustin/go-humanize" . "gopkg.in/check.v1" diff --git a/objects.go b/objects.go index cf2c1ff..da27b85 100644 --- a/objects.go +++ b/objects.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/core" ) // Blob is used to store file data - it is generally a file. diff --git a/objects_test.go b/objects_test.go index 683ab15..e8c5d6e 100644 --- a/objects_test.go +++ b/objects_test.go @@ -5,8 +5,8 @@ import ( "time" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/storages/memory" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/storages/memory" ) type ObjectsSuite struct { diff --git a/references.go b/references.go index c69917d..593b975 100644 --- a/references.go +++ b/references.go @@ -3,8 +3,8 @@ package git import ( "io" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/diff" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/diff" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/references_test.go b/references_test.go index 4fa4f76..4bd91d2 100644 --- a/references_test.go +++ b/references_test.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/formats/packfile" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/formats/packfile" . "gopkg.in/check.v1" ) diff --git a/remote.go b/remote.go index 685b8a8..283b6b3 100644 --- a/remote.go +++ b/remote.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v2/clients" - "gopkg.in/src-d/go-git.v2/clients/common" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/clients" + "gopkg.in/src-d/go-git.v3/clients/common" + "gopkg.in/src-d/go-git.v3/core" ) type Remote struct { diff --git a/remote_test.go b/remote_test.go index 14c7ec1..d814402 100644 --- a/remote_test.go +++ b/remote_test.go @@ -1,9 +1,9 @@ package git import ( - "gopkg.in/src-d/go-git.v2/clients/http" - "gopkg.in/src-d/go-git.v2/formats/packfile" - "gopkg.in/src-d/go-git.v2/storages/memory" + "gopkg.in/src-d/go-git.v3/clients/http" + "gopkg.in/src-d/go-git.v3/formats/packfile" + "gopkg.in/src-d/go-git.v3/storages/memory" . "gopkg.in/check.v1" ) diff --git a/repository.go b/repository.go index c2665ff..3af45c9 100644 --- a/repository.go +++ b/repository.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "gopkg.in/src-d/go-git.v2/clients/common" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/formats/packfile" - "gopkg.in/src-d/go-git.v2/storages/memory" + "gopkg.in/src-d/go-git.v3/clients/common" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/formats/packfile" + "gopkg.in/src-d/go-git.v3/storages/memory" ) var ( diff --git a/repository_test.go b/repository_test.go index df6ed6b..d7fe20e 100644 --- a/repository_test.go +++ b/repository_test.go @@ -1,8 +1,8 @@ package git import ( - "gopkg.in/src-d/go-git.v2/clients/http" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/clients/http" + "gopkg.in/src-d/go-git.v3/core" . "gopkg.in/check.v1" ) diff --git a/storage/memory/object.go b/storage/memory/object.go index 7fee252..eda6ab7 100644 --- a/storage/memory/object.go +++ b/storage/memory/object.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/core" ) // Object on memory core.Object implementation diff --git a/storage/memory/object_test.go b/storage/memory/object_test.go index b606eb2..f9dd25d 100644 --- a/storage/memory/object_test.go +++ b/storage/memory/object_test.go @@ -5,7 +5,7 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/core" ) func Test(t *testing.T) { TestingT(t) } diff --git a/storage/memory/storage.go b/storage/memory/storage.go index 4c106cc..9bc1e7b 100644 --- a/storage/memory/storage.go +++ b/storage/memory/storage.go @@ -3,7 +3,7 @@ package memory import ( "fmt" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/core" ) var ErrUnsupportedObjectType = fmt.Errorf("unsupported object type") diff --git a/storage/memory/storage_test.go b/storage/memory/storage_test.go index 4059dfa..ba7e224 100644 --- a/storage/memory/storage_test.go +++ b/storage/memory/storage_test.go @@ -2,7 +2,7 @@ package memory import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/core" ) type ObjectStorageSuite struct{} diff --git a/tree.go b/tree.go index e57d315..4e67f0e 100644 --- a/tree.go +++ b/tree.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "gopkg.in/src-d/go-git.v2/core" + "gopkg.in/src-d/go-git.v3/core" ) // Tree is basically like a directory - it references a bunch of other trees diff --git a/tree_test.go b/tree_test.go index 17d7b68..bec55dd 100644 --- a/tree_test.go +++ b/tree_test.go @@ -4,8 +4,8 @@ import ( "os" "sort" - "gopkg.in/src-d/go-git.v2/core" - "gopkg.in/src-d/go-git.v2/formats/packfile" + "gopkg.in/src-d/go-git.v3/core" + "gopkg.in/src-d/go-git.v3/formats/packfile" . "gopkg.in/check.v1" ) -- cgit