From 27c0c77bddd0333432b59cbd7ce7c1d2762290ad Mon Sep 17 00:00:00 2001 From: "Karrick S. McDermott" Date: Fri, 4 Aug 2017 16:59:30 -0400 Subject: [PATCH] s|karrick/dep|golang/dep|g before merge --- internal/fs/fs_test.go | 2 +- internal/gps/_testdata/src/cycle/a.go | 2 +- internal/gps/_testdata/src/cycle/one/a.go | 2 +- internal/gps/_testdata/src/cycle/two/a.go | 2 +- internal/gps/_testdata/src/disallow/a.go | 2 +- internal/gps/_testdata/src/dotgodir/.m1p/a.go | 2 +- internal/gps/_testdata/src/doublenest/a.go | 2 +- .../src/doublenest/namemismatch/m1p/a.go | 2 +- .../src/github.com/example/varied/m1p/a.go | 2 +- .../example/varied/simple/simple.go | 2 +- internal/gps/_testdata/src/igmain/a.go | 2 +- internal/gps/_testdata/src/igmainfirst/z.go | 2 +- internal/gps/_testdata/src/igmainlong/a.go | 2 +- internal/gps/_testdata/src/igmaint/a.go | 2 +- internal/gps/_testdata/src/m1p/a.go | 2 +- internal/gps/_testdata/src/missing/a.go | 2 +- internal/gps/_testdata/src/missing/m1p/a.go | 2 +- internal/gps/_testdata/src/nest/a.go | 2 +- internal/gps/_testdata/src/nest/m1p/a.go | 2 +- .../_testdata/src/relimport/dotdotslash/a.go | 2 +- internal/gps/_testdata/src/ren/m1p/a.go | 2 +- internal/gps/_testdata/src/ren/simple/a.go | 2 +- internal/gps/_testdata/src/simple/a.go | 2 +- internal/gps/_testdata/src/simpleallt/a.go | 2 +- internal/gps/_testdata/src/simplet/a.go | 2 +- internal/gps/_testdata/src/simplext/a.go | 2 +- internal/gps/_testdata/src/skip_/a.go | 2 +- internal/gps/_testdata/src/twopkgs/a.go | 2 +- internal/gps/_testdata/src/varied/m1p/a.go | 2 +- .../gps/_testdata/src/varied/simple/simple.go | 2 +- internal/gps/example.go | 4 +- internal/gps/lockdiff_test.go | 4 +- internal/gps/pkgtree/pkgtree.go | 2 +- internal/gps/pkgtree/pkgtree_test.go | 98 +++++++++---------- internal/gps/rootdata.go | 2 +- internal/gps/solve_basic_test.go | 2 +- internal/gps/solve_bimodal_test.go | 2 +- internal/gps/solve_test.go | 2 +- internal/gps/solver.go | 4 +- internal/gps/source.go | 4 +- internal/gps/source_cache.go | 2 +- internal/gps/source_manager.go | 2 +- internal/gps/source_manager_test.go | 2 +- internal/gps/source_test.go | 2 +- internal/gps/trace.go | 2 +- internal/gps/vcs_source.go | 4 +- internal/gps/version_unifier_test.go | 2 +- 47 files changed, 100 insertions(+), 100 deletions(-) diff --git a/internal/fs/fs_test.go b/internal/fs/fs_test.go index 56d0ed54b9..33e560ac3e 100644 --- a/internal/fs/fs_test.go +++ b/internal/fs/fs_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/karrick/dep/internal/test" + "github.com/golang/dep/internal/test" ) // This function tests HadFilepathPrefix. It should test it on both case diff --git a/internal/gps/_testdata/src/cycle/a.go b/internal/gps/_testdata/src/cycle/a.go index aee4b42b57..0965bb7037 100644 --- a/internal/gps/_testdata/src/cycle/a.go +++ b/internal/gps/_testdata/src/cycle/a.go @@ -7,7 +7,7 @@ package cycle import ( "cycle/one" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/cycle/one/a.go b/internal/gps/_testdata/src/cycle/one/a.go index f0421a9295..407c8051c2 100644 --- a/internal/gps/_testdata/src/cycle/one/a.go +++ b/internal/gps/_testdata/src/cycle/one/a.go @@ -7,7 +7,7 @@ package one import ( "cycle/two" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/cycle/two/a.go b/internal/gps/_testdata/src/cycle/two/a.go index 96cd10f433..98ea406f9c 100644 --- a/internal/gps/_testdata/src/cycle/two/a.go +++ b/internal/gps/_testdata/src/cycle/two/a.go @@ -7,7 +7,7 @@ package two import ( "cycle" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/disallow/a.go b/internal/gps/_testdata/src/disallow/a.go index aa8c0eef57..7b2b9c67bd 100644 --- a/internal/gps/_testdata/src/disallow/a.go +++ b/internal/gps/_testdata/src/disallow/a.go @@ -8,7 +8,7 @@ import ( "disallow/testdata" "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/dotgodir/.m1p/a.go b/internal/gps/_testdata/src/dotgodir/.m1p/a.go index b79f9801fe..a5fc8c2e57 100644 --- a/internal/gps/_testdata/src/dotgodir/.m1p/a.go +++ b/internal/gps/_testdata/src/dotgodir/.m1p/a.go @@ -7,7 +7,7 @@ package m1p import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/doublenest/a.go b/internal/gps/_testdata/src/doublenest/a.go index c09cfe0f3a..e99afea031 100644 --- a/internal/gps/_testdata/src/doublenest/a.go +++ b/internal/gps/_testdata/src/doublenest/a.go @@ -7,7 +7,7 @@ package base import ( "go/parser" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go b/internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go index d07cbc427f..ddfc833eea 100644 --- a/internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go +++ b/internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go @@ -7,7 +7,7 @@ package m1p import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/github.com/example/varied/m1p/a.go b/internal/gps/_testdata/src/github.com/example/varied/m1p/a.go index f43ccd1218..b2de8754cb 100644 --- a/internal/gps/_testdata/src/github.com/example/varied/m1p/a.go +++ b/internal/gps/_testdata/src/github.com/example/varied/m1p/a.go @@ -7,7 +7,7 @@ package m1p import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/github.com/example/varied/simple/simple.go b/internal/gps/_testdata/src/github.com/example/varied/simple/simple.go index 42537e4b9b..9d0c3445f6 100644 --- a/internal/gps/_testdata/src/github.com/example/varied/simple/simple.go +++ b/internal/gps/_testdata/src/github.com/example/varied/simple/simple.go @@ -7,7 +7,7 @@ package simple import ( "go/parser" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/igmain/a.go b/internal/gps/_testdata/src/igmain/a.go index 9700bb2e70..2789b659d1 100644 --- a/internal/gps/_testdata/src/igmain/a.go +++ b/internal/gps/_testdata/src/igmain/a.go @@ -7,7 +7,7 @@ package simple import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/igmainfirst/z.go b/internal/gps/_testdata/src/igmainfirst/z.go index 9700bb2e70..2789b659d1 100644 --- a/internal/gps/_testdata/src/igmainfirst/z.go +++ b/internal/gps/_testdata/src/igmainfirst/z.go @@ -7,7 +7,7 @@ package simple import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/igmainlong/a.go b/internal/gps/_testdata/src/igmainlong/a.go index 9700bb2e70..2789b659d1 100644 --- a/internal/gps/_testdata/src/igmainlong/a.go +++ b/internal/gps/_testdata/src/igmainlong/a.go @@ -7,7 +7,7 @@ package simple import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/igmaint/a.go b/internal/gps/_testdata/src/igmaint/a.go index 9700bb2e70..2789b659d1 100644 --- a/internal/gps/_testdata/src/igmaint/a.go +++ b/internal/gps/_testdata/src/igmaint/a.go @@ -7,7 +7,7 @@ package simple import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/m1p/a.go b/internal/gps/_testdata/src/m1p/a.go index d07cbc427f..ddfc833eea 100644 --- a/internal/gps/_testdata/src/m1p/a.go +++ b/internal/gps/_testdata/src/m1p/a.go @@ -7,7 +7,7 @@ package m1p import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/missing/a.go b/internal/gps/_testdata/src/missing/a.go index d4df67343b..0cdcb394ba 100644 --- a/internal/gps/_testdata/src/missing/a.go +++ b/internal/gps/_testdata/src/missing/a.go @@ -9,7 +9,7 @@ import ( "missing/missing" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/missing/m1p/a.go b/internal/gps/_testdata/src/missing/m1p/a.go index d07cbc427f..ddfc833eea 100644 --- a/internal/gps/_testdata/src/missing/m1p/a.go +++ b/internal/gps/_testdata/src/missing/m1p/a.go @@ -7,7 +7,7 @@ package m1p import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/nest/a.go b/internal/gps/_testdata/src/nest/a.go index 9700bb2e70..2789b659d1 100644 --- a/internal/gps/_testdata/src/nest/a.go +++ b/internal/gps/_testdata/src/nest/a.go @@ -7,7 +7,7 @@ package simple import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/nest/m1p/a.go b/internal/gps/_testdata/src/nest/m1p/a.go index d07cbc427f..ddfc833eea 100644 --- a/internal/gps/_testdata/src/nest/m1p/a.go +++ b/internal/gps/_testdata/src/nest/m1p/a.go @@ -7,7 +7,7 @@ package m1p import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/relimport/dotdotslash/a.go b/internal/gps/_testdata/src/relimport/dotdotslash/a.go index 98c22f9802..f1ffb55bdd 100644 --- a/internal/gps/_testdata/src/relimport/dotdotslash/a.go +++ b/internal/gps/_testdata/src/relimport/dotdotslash/a.go @@ -5,7 +5,7 @@ package dotslash import ( - "../github.com/karrick/dep/internal/gps" + "../github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/ren/m1p/a.go b/internal/gps/_testdata/src/ren/m1p/a.go index d07cbc427f..ddfc833eea 100644 --- a/internal/gps/_testdata/src/ren/m1p/a.go +++ b/internal/gps/_testdata/src/ren/m1p/a.go @@ -7,7 +7,7 @@ package m1p import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/ren/simple/a.go b/internal/gps/_testdata/src/ren/simple/a.go index 9700bb2e70..2789b659d1 100644 --- a/internal/gps/_testdata/src/ren/simple/a.go +++ b/internal/gps/_testdata/src/ren/simple/a.go @@ -7,7 +7,7 @@ package simple import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/simple/a.go b/internal/gps/_testdata/src/simple/a.go index 9700bb2e70..2789b659d1 100644 --- a/internal/gps/_testdata/src/simple/a.go +++ b/internal/gps/_testdata/src/simple/a.go @@ -7,7 +7,7 @@ package simple import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/simpleallt/a.go b/internal/gps/_testdata/src/simpleallt/a.go index 9700bb2e70..2789b659d1 100644 --- a/internal/gps/_testdata/src/simpleallt/a.go +++ b/internal/gps/_testdata/src/simpleallt/a.go @@ -7,7 +7,7 @@ package simple import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/simplet/a.go b/internal/gps/_testdata/src/simplet/a.go index 9700bb2e70..2789b659d1 100644 --- a/internal/gps/_testdata/src/simplet/a.go +++ b/internal/gps/_testdata/src/simplet/a.go @@ -7,7 +7,7 @@ package simple import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/simplext/a.go b/internal/gps/_testdata/src/simplext/a.go index 9700bb2e70..2789b659d1 100644 --- a/internal/gps/_testdata/src/simplext/a.go +++ b/internal/gps/_testdata/src/simplext/a.go @@ -7,7 +7,7 @@ package simple import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/skip_/a.go b/internal/gps/_testdata/src/skip_/a.go index 1bc5e3c2a4..cd1dd811ae 100644 --- a/internal/gps/_testdata/src/skip_/a.go +++ b/internal/gps/_testdata/src/skip_/a.go @@ -7,7 +7,7 @@ package skip import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/twopkgs/a.go b/internal/gps/_testdata/src/twopkgs/a.go index 9700bb2e70..2789b659d1 100644 --- a/internal/gps/_testdata/src/twopkgs/a.go +++ b/internal/gps/_testdata/src/twopkgs/a.go @@ -7,7 +7,7 @@ package simple import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/varied/m1p/a.go b/internal/gps/_testdata/src/varied/m1p/a.go index f43ccd1218..b2de8754cb 100644 --- a/internal/gps/_testdata/src/varied/m1p/a.go +++ b/internal/gps/_testdata/src/varied/m1p/a.go @@ -7,7 +7,7 @@ package m1p import ( "sort" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/_testdata/src/varied/simple/simple.go b/internal/gps/_testdata/src/varied/simple/simple.go index 42537e4b9b..9d0c3445f6 100644 --- a/internal/gps/_testdata/src/varied/simple/simple.go +++ b/internal/gps/_testdata/src/varied/simple/simple.go @@ -7,7 +7,7 @@ package simple import ( "go/parser" - "github.com/karrick/dep/internal/gps" + "github.com/golang/dep/internal/gps" ) var ( diff --git a/internal/gps/example.go b/internal/gps/example.go index 84fe3cff61..e91db30a79 100644 --- a/internal/gps/example.go +++ b/internal/gps/example.go @@ -14,8 +14,8 @@ import ( "path/filepath" "strings" - "github.com/karrick/dep/internal/gps" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps" + "github.com/golang/dep/internal/gps/pkgtree" ) // This is probably the simplest possible implementation of gps. It does the diff --git a/internal/gps/lockdiff_test.go b/internal/gps/lockdiff_test.go index 5429108525..278fc576fd 100644 --- a/internal/gps/lockdiff_test.go +++ b/internal/gps/lockdiff_test.go @@ -46,8 +46,8 @@ func TestStringDiff_Modify(t *testing.T) { } func TestDiffProjects_NoChange(t *testing.T) { - p1 := NewLockedProject(mkPI("github.com/karrick/dep/internal/gps"), NewVersion("v0.10.0"), []string{"gps"}) - p2 := NewLockedProject(mkPI("github.com/karrick/dep/internal/gps"), NewVersion("v0.10.0"), []string{"gps"}) + p1 := NewLockedProject(mkPI("github.com/golang/dep/internal/gps"), NewVersion("v0.10.0"), []string{"gps"}) + p2 := NewLockedProject(mkPI("github.com/golang/dep/internal/gps"), NewVersion("v0.10.0"), []string{"gps"}) diff := DiffProjects(p1, p2) if diff != nil { diff --git a/internal/gps/pkgtree/pkgtree.go b/internal/gps/pkgtree/pkgtree.go index 1b2d9a23fd..dd5b539ae3 100644 --- a/internal/gps/pkgtree/pkgtree.go +++ b/internal/gps/pkgtree/pkgtree.go @@ -17,7 +17,7 @@ import ( "strings" "unicode" - "github.com/karrick/dep/internal/fs" + "github.com/golang/dep/internal/fs" "github.com/pkg/errors" ) diff --git a/internal/gps/pkgtree/pkgtree_test.go b/internal/gps/pkgtree/pkgtree_test.go index 2eb0afe86d..e1987a5285 100644 --- a/internal/gps/pkgtree/pkgtree_test.go +++ b/internal/gps/pkgtree/pkgtree_test.go @@ -18,8 +18,8 @@ import ( "strings" "testing" - "github.com/karrick/dep/internal/fs" - "github.com/karrick/dep/internal/gps/paths" + "github.com/golang/dep/internal/fs" + "github.com/golang/dep/internal/gps/paths" ) // PackageTree.ToReachMap() uses an easily separable algorithm, wmToReach(), @@ -511,7 +511,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", }, }, @@ -531,7 +531,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", }, }, @@ -593,7 +593,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", }, TestImports: []string{ @@ -617,7 +617,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", }, TestImports: []string{ @@ -641,7 +641,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", }, TestImports: []string{ @@ -666,7 +666,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "os", "sort", }, @@ -687,7 +687,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", }, }, @@ -698,7 +698,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "os", "sort", }, @@ -746,7 +746,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "os", "sort", }, @@ -758,7 +758,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", }, }, @@ -778,7 +778,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "base", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "go/parser", }, }, @@ -800,7 +800,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "os", "sort", }, @@ -821,7 +821,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "base", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "go/parser", }, }, @@ -843,7 +843,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "os", "sort", }, @@ -864,7 +864,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", "unicode", }, @@ -885,7 +885,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", "unicode", }, @@ -906,7 +906,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", "unicode", }, @@ -927,7 +927,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", "unicode", }, @@ -974,7 +974,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "missing/missing", "sort", }, @@ -986,7 +986,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "os", "sort", }, @@ -1011,7 +1011,7 @@ func TestListPackages(t *testing.T) { Name: "cycle", Imports: []string{ "cycle/one", - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", }, }, }, @@ -1022,7 +1022,7 @@ func TestListPackages(t *testing.T) { Name: "one", Imports: []string{ "cycle/two", - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", }, }, }, @@ -1033,7 +1033,7 @@ func TestListPackages(t *testing.T) { Name: "two", Imports: []string{ "cycle", - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", }, }, }, @@ -1054,7 +1054,7 @@ func TestListPackages(t *testing.T) { Name: "disallow", Imports: []string{ "disallow/testdata", - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", }, }, @@ -1122,7 +1122,7 @@ func TestListPackages(t *testing.T) { Dir: j("relimport/dotdotslash"), ImportPath: "relimport/dotdotslash", LocalImports: []string{ - "../github.com/karrick/dep/internal/gps", + "../github.com/golang/dep/internal/gps", }, }, }, @@ -1141,7 +1141,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "skip", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", }, }, @@ -1187,7 +1187,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "simple", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "go/parser", "varied/simple/another", }, @@ -1224,7 +1224,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "os", "sort", }, @@ -1284,7 +1284,7 @@ func TestListPackages(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "os", "sort", }, @@ -1408,7 +1408,7 @@ func TestListPackagesNoPerms(t *testing.T) { CommentPath: "", Name: "m1p", Imports: []string{ - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "sort", }, }, @@ -1502,12 +1502,12 @@ func TestToReachMap(t *testing.T) { // maps of each internal package, and their expected external and internal // imports in the maximal case. allex := map[string][]string{ - b(""): {"encoding/binary", "github.com/Masterminds/semver", "github.com/karrick/dep/internal/gps", "go/parser", "hash", "net/http", "os", "sort"}, - b("m1p"): {"github.com/karrick/dep/internal/gps", "os", "sort"}, + b(""): {"encoding/binary", "github.com/Masterminds/semver", "github.com/golang/dep/internal/gps", "go/parser", "hash", "net/http", "os", "sort"}, + b("m1p"): {"github.com/golang/dep/internal/gps", "os", "sort"}, b("namemismatch"): {"github.com/Masterminds/semver", "os"}, - b("otherpath"): {"github.com/karrick/dep/internal/gps", "os", "sort"}, - b("simple"): {"encoding/binary", "github.com/karrick/dep/internal/gps", "go/parser", "hash", "os", "sort"}, - b("simple/another"): {"encoding/binary", "github.com/karrick/dep/internal/gps", "hash", "os", "sort"}, + b("otherpath"): {"github.com/golang/dep/internal/gps", "os", "sort"}, + b("simple"): {"encoding/binary", "github.com/golang/dep/internal/gps", "go/parser", "hash", "os", "sort"}, + b("simple/another"): {"encoding/binary", "github.com/golang/dep/internal/gps", "hash", "os", "sort"}, } allin := map[string][]string{ @@ -1649,7 +1649,7 @@ func TestToReachMap(t *testing.T) { b("")+" encoding/binary", b("simple")+" encoding/binary", b("simple/another")+" encoding/binary", - b("otherpath")+" github.com/karrick/dep/internal/gps os sort", + b("otherpath")+" github.com/golang/dep/internal/gps os sort", ) // almost the same as previous, but varied just goes away completely @@ -1659,7 +1659,7 @@ func TestToReachMap(t *testing.T) { b(""), b("simple")+" encoding/binary", b("simple/another")+" encoding/binary", - bl("otherpath", "m1p")+" github.com/karrick/dep/internal/gps os sort", + bl("otherpath", "m1p")+" github.com/golang/dep/internal/gps os sort", ) validate() @@ -1690,7 +1690,7 @@ func TestToReachMap(t *testing.T) { } except( // root pkg loses on everything in varied/simple/another and varied/m1p - bl("", "simple", "simple/another", "m1p", "otherpath")+" hash encoding/binary go/parser github.com/karrick/dep/internal/gps sort", + bl("", "simple", "simple/another", "m1p", "otherpath")+" hash encoding/binary go/parser github.com/golang/dep/internal/gps sort", b("otherpath"), b("simple"), ) @@ -1701,7 +1701,7 @@ func TestToReachMap(t *testing.T) { ignore[b("namemismatch")] = true except( // root pkg loses on everything in varied/simple/another and varied/m1p - bl("", "simple", "simple/another", "m1p", "otherpath", "namemismatch")+" hash encoding/binary go/parser github.com/karrick/dep/internal/gps sort os github.com/Masterminds/semver", + bl("", "simple", "simple/another", "m1p", "otherpath", "namemismatch")+" hash encoding/binary go/parser github.com/golang/dep/internal/gps sort os github.com/Masterminds/semver", b("otherpath"), b("simple"), b("namemismatch"), @@ -1719,7 +1719,7 @@ func TestFlattenReachMap(t *testing.T) { all := []string{ "encoding/binary", "github.com/Masterminds/semver", - "github.com/karrick/dep/internal/gps", + "github.com/golang/dep/internal/gps", "go/parser", "hash", "net/http", @@ -1813,7 +1813,7 @@ func TestFlattenReachMap(t *testing.T) { }, }, // now drop a more interesting one - // we get github.com/karrick/dep/internal/gps from m1p, too, so it should still be there + // we get github.com/golang/dep/internal/gps from m1p, too, so it should still be there { name: "ignore simple", expect: except("go/parser"), @@ -1873,7 +1873,7 @@ func TestFlattenReachMap(t *testing.T) { // ignore two that should knock out gps { name: "ignore both importers", - expect: except("sort", "github.com/karrick/dep/internal/gps", "go/parser"), + expect: except("sort", "github.com/golang/dep/internal/gps", "go/parser"), isStdLibFn: nil, main: true, tests: true, @@ -1885,14 +1885,14 @@ func TestFlattenReachMap(t *testing.T) { // finally, directly ignore some external packages { name: "ignore external", - expect: except("sort", "github.com/karrick/dep/internal/gps", "go/parser"), + expect: except("sort", "github.com/golang/dep/internal/gps", "go/parser"), isStdLibFn: nil, main: true, tests: true, ignore: map[string]bool{ - "github.com/karrick/dep/internal/gps": true, - "go/parser": true, - "sort": true, + "github.com/golang/dep/internal/gps": true, + "go/parser": true, + "sort": true, }, }, } { @@ -1907,7 +1907,7 @@ func TestFlattenReachMap(t *testing.T) { t.Run("disallowed", testFlattenReachMap(&ptree, &flattenReachMapCase{ name: "disallowed", - expect: []string{"github.com/karrick/dep/internal/gps", "hash", "sort"}, + expect: []string{"github.com/golang/dep/internal/gps", "hash", "sort"}, isStdLibFn: nil, main: false, tests: false, diff --git a/internal/gps/rootdata.go b/internal/gps/rootdata.go index 13d9b74803..d783174cb4 100644 --- a/internal/gps/rootdata.go +++ b/internal/gps/rootdata.go @@ -8,7 +8,7 @@ import ( "sort" "github.com/armon/go-radix" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps/pkgtree" ) // rootdata holds static data and constraining rules from the root project for diff --git a/internal/gps/solve_basic_test.go b/internal/gps/solve_basic_test.go index 4d0c9c4fc7..6c47815008 100644 --- a/internal/gps/solve_basic_test.go +++ b/internal/gps/solve_basic_test.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/Masterminds/semver" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps/pkgtree" ) var regfrom = regexp.MustCompile(`^(\w*) from (\w*) ([0-9\.\*]*)`) diff --git a/internal/gps/solve_bimodal_test.go b/internal/gps/solve_bimodal_test.go index 95bb180eaf..a348ecfbf8 100644 --- a/internal/gps/solve_bimodal_test.go +++ b/internal/gps/solve_bimodal_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps/pkgtree" ) // dsp - "depspec with packages" diff --git a/internal/gps/solve_test.go b/internal/gps/solve_test.go index 68096fb74c..b2ccc087d3 100644 --- a/internal/gps/solve_test.go +++ b/internal/gps/solve_test.go @@ -18,7 +18,7 @@ import ( "testing" "unicode" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps/pkgtree" ) var fixtorun string diff --git a/internal/gps/solver.go b/internal/gps/solver.go index 4abaf6e745..fd8695fd13 100644 --- a/internal/gps/solver.go +++ b/internal/gps/solver.go @@ -12,8 +12,8 @@ import ( "strings" "github.com/armon/go-radix" - "github.com/karrick/dep/internal/gps/paths" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps/paths" + "github.com/golang/dep/internal/gps/pkgtree" ) var rootRev = Revision("") diff --git a/internal/gps/source.go b/internal/gps/source.go index faf4bd84be..d687a1b687 100644 --- a/internal/gps/source.go +++ b/internal/gps/source.go @@ -10,7 +10,7 @@ import ( "fmt" "sync" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps/pkgtree" ) // sourceState represent the states that a source can be in, depending on how @@ -144,7 +144,7 @@ func (sc *sourceCoordinator) getSourceGatewayFor(ctx context.Context, id Project srcGate = newSourceGateway(pd.mb, sc.supervisor, sc.cachedir) // The normalized name is usually different from the source URL- e.g. - // github.com/karrick/dep/internal/gps vs. https://github.com/karrick/dep/internal/gps. But it's + // github.com/golang/dep/internal/gps vs. https://github.com/golang/dep/internal/gps. But it's // possible to arrive here with a full URL as the normalized name - and // both paths *must* lead to the same sourceGateway instance in order to // ensure disk access is correctly managed. diff --git a/internal/gps/source_cache.go b/internal/gps/source_cache.go index d4433ee8f0..b0b5e073aa 100644 --- a/internal/gps/source_cache.go +++ b/internal/gps/source_cache.go @@ -8,7 +8,7 @@ import ( "fmt" "sync" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps/pkgtree" ) // singleSourceCache provides a method set for storing and retrieving data about diff --git a/internal/gps/source_manager.go b/internal/gps/source_manager.go index 5e86385d7f..9eabb19354 100644 --- a/internal/gps/source_manager.go +++ b/internal/gps/source_manager.go @@ -18,7 +18,7 @@ import ( "sync/atomic" "time" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps/pkgtree" "github.com/pkg/errors" "github.com/sdboyer/constext" ) diff --git a/internal/gps/source_manager_test.go b/internal/gps/source_manager_test.go index 8e9839a4ff..bdd4709f3a 100644 --- a/internal/gps/source_manager_test.go +++ b/internal/gps/source_manager_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/karrick/dep/internal/test" + "github.com/golang/dep/internal/test" ) func TestSourceManager_InferConstraint(t *testing.T) { diff --git a/internal/gps/source_test.go b/internal/gps/source_test.go index 93f3f76949..b5679761a8 100644 --- a/internal/gps/source_test.go +++ b/internal/gps/source_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps/pkgtree" ) // Executed in parallel by TestSlowVcs diff --git a/internal/gps/trace.go b/internal/gps/trace.go index 55f12bc006..67be521491 100644 --- a/internal/gps/trace.go +++ b/internal/gps/trace.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps/pkgtree" ) const ( diff --git a/internal/gps/vcs_source.go b/internal/gps/vcs_source.go index 3c237efc69..397cfd1b32 100644 --- a/internal/gps/vcs_source.go +++ b/internal/gps/vcs_source.go @@ -15,8 +15,8 @@ import ( "time" "github.com/Masterminds/semver" - "github.com/karrick/dep/internal/fs" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/fs" + "github.com/golang/dep/internal/gps/pkgtree" ) type baseVCSSource struct { diff --git a/internal/gps/version_unifier_test.go b/internal/gps/version_unifier_test.go index 4ae1152291..f044347188 100644 --- a/internal/gps/version_unifier_test.go +++ b/internal/gps/version_unifier_test.go @@ -7,7 +7,7 @@ package gps import ( "testing" - "github.com/karrick/dep/internal/gps/pkgtree" + "github.com/golang/dep/internal/gps/pkgtree" ) type lvFixBridge []Version