gps: move gps to internal/gps

Fixes #300 Fixes #519
golang · May 10, 2017 · 9ea8489 · 9ea8489
1 parent 09b46aa
commit 9ea8489
Show file tree

Hide file tree

Showing 178 changed files with 261 additions and 262 deletions.
diff --git a/analyzer.go b/analyzer.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 type Analyzer struct{}

diff --git a/cmd/dep/ensure.go b/cmd/dep/ensure.go
@@ -16,8 +16,8 @@ import (
 	"strings"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

diff --git a/cmd/dep/ensure_test.go b/cmd/dep/ensure_test.go
@@ -7,7 +7,7 @@ package main
 import (
 	"testing"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 func TestDeduceConstraint(t *testing.T) {

diff --git a/cmd/dep/hash_in.go b/cmd/dep/hash_in.go
@@ -8,8 +8,8 @@ import (
 	"flag"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

diff --git a/cmd/dep/init.go b/cmd/dep/init.go
@@ -12,9 +12,9 @@ import (
 	"sync"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal"
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

diff --git a/cmd/dep/init_test.go b/cmd/dep/init_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 func TestContains(t *testing.T) {

diff --git a/cmd/dep/prune.go b/cmd/dep/prune.go
@@ -10,9 +10,8 @@ import (
 	"fmt"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
-
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

diff --git a/cmd/dep/remove.go b/cmd/dep/remove.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

diff --git a/cmd/dep/status.go b/cmd/dep/status.go
@@ -15,8 +15,8 @@ import (
 	"text/tabwriter"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

diff --git a/cmd/dep/status_test.go b/cmd/dep/status_test.go
@@ -7,7 +7,7 @@ package main
 import (
 	"testing"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 func TestStatusFormatVersion(t *testing.T) {

diff --git a/context.go b/context.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	"github.com/Masterminds/vcs"
-	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal"
+	"github.com/golang/dep/internal/gps"
 	"github.com/pkg/errors"
 )
 

diff --git a/context_test.go b/context_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"unicode"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 	"github.com/golang/dep/test"
 )
 

diff --git a/gps/_testdata/src/ren/m1p/a.go b/gps/_testdata/src/ren/m1p/a.go
diff --git a/gps/_testdata/src/ren/simple/a.go b/gps/_testdata/src/ren/simple/a.go
diff --git a/gps/_testdata/src/simple/a.go b/gps/_testdata/src/simple/a.go
diff --git a/gps/_testdata/src/simpleallt/a.go b/gps/_testdata/src/simpleallt/a.go
diff --git a/gps/_testdata/src/simplet/a.go b/gps/_testdata/src/simplet/a.go
diff --git a/gps/_testdata/src/simplext/a.go b/gps/_testdata/src/simplext/a.go
diff --git a/gps/_testdata/src/twopkgs/a.go b/gps/_testdata/src/twopkgs/a.go
diff --git a/gps/_testdata/cmd/echosleep.go → internal/gps/_testdata/cmd/echosleep.go b/gps/_testdata/cmd/echosleep.go → internal/gps/_testdata/cmd/echosleep.go
diff --git a/gps/_testdata/src/bad/bad.go → internal/gps/_testdata/src/bad/bad.go b/gps/_testdata/src/bad/bad.go → internal/gps/_testdata/src/bad/bad.go
diff --git a/gps/_testdata/src/buildtag/invalid.go → ...nal/gps/_testdata/src/buildtag/invalid.go b/gps/_testdata/src/buildtag/invalid.go → ...nal/gps/_testdata/src/buildtag/invalid.go
diff --git a/gps/_testdata/src/cycle/a.go → internal/gps/_testdata/src/cycle/a.go b/gps/_testdata/src/cycle/a.go → internal/gps/_testdata/src/cycle/a.go
@@ -6,7 +6,7 @@ package cycle
 
 import (
 	"cycle/one"
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/cycle/one/a.go → internal/gps/_testdata/src/cycle/one/a.go b/gps/_testdata/src/cycle/one/a.go → internal/gps/_testdata/src/cycle/one/a.go
@@ -6,7 +6,7 @@ package one
 
 import (
 	"cycle/two"
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/cycle/two/a.go → internal/gps/_testdata/src/cycle/two/a.go b/gps/_testdata/src/cycle/two/a.go → internal/gps/_testdata/src/cycle/two/a.go
@@ -6,7 +6,7 @@ package two
 
 import (
 	"cycle"
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/disallow/.m1p/a.go → ...rnal/gps/_testdata/src/disallow/.m1p/a.go b/gps/_testdata/src/disallow/.m1p/a.go → ...rnal/gps/_testdata/src/disallow/.m1p/a.go
diff --git a/gps/_testdata/src/disallow/.m1p/b.go → ...rnal/gps/_testdata/src/disallow/.m1p/b.go b/gps/_testdata/src/disallow/.m1p/b.go → ...rnal/gps/_testdata/src/disallow/.m1p/b.go
diff --git a/gps/_testdata/src/disallow/a.go → internal/gps/_testdata/src/disallow/a.go b/gps/_testdata/src/disallow/a.go → internal/gps/_testdata/src/disallow/a.go
@@ -8,7 +8,7 @@ import (
 	"disallow/testdata"
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/...testdata/src/disallow/testdata/another.go → ...testdata/src/disallow/testdata/another.go b/...testdata/src/disallow/testdata/another.go → ...testdata/src/disallow/testdata/another.go
diff --git a/gps/_testdata/src/doublenest/a.go → internal/gps/_testdata/src/doublenest/a.go b/gps/_testdata/src/doublenest/a.go → internal/gps/_testdata/src/doublenest/a.go
@@ -7,7 +7,7 @@ package base
 import (
 	"go/parser"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/m1p/a.go → ...data/src/doublenest/namemismatch/m1p/a.go b/gps/_testdata/src/m1p/a.go → ...data/src/doublenest/namemismatch/m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/...data/src/doublenest/namemismatch/m1p/b.go → ...data/src/doublenest/namemismatch/m1p/b.go b/...data/src/doublenest/namemismatch/m1p/b.go → ...data/src/doublenest/namemismatch/m1p/b.go
diff --git a/...estdata/src/doublenest/namemismatch/nm.go → ...estdata/src/doublenest/namemismatch/nm.go b/...estdata/src/doublenest/namemismatch/nm.go → ...estdata/src/doublenest/namemismatch/nm.go
diff --git a/gps/_testdata/src/empty/.gitkeep → internal/gps/_testdata/src/empty/.gitkeep b/gps/_testdata/src/empty/.gitkeep → internal/gps/_testdata/src/empty/.gitkeep
diff --git a/...a/src/github.com/example/varied/locals.go → ...a/src/github.com/example/varied/locals.go b/...a/src/github.com/example/varied/locals.go → ...a/src/github.com/example/varied/locals.go
diff --git a/gps/_testdata/src/varied/m1p/a.go → ...ta/src/github.com/example/varied/m1p/a.go b/gps/_testdata/src/varied/m1p/a.go → ...ta/src/github.com/example/varied/m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/...ta/src/github.com/example/varied/m1p/b.go → ...ta/src/github.com/example/varied/m1p/b.go b/...ta/src/github.com/example/varied/m1p/b.go → ...ta/src/github.com/example/varied/m1p/b.go
diff --git a/...ata/src/github.com/example/varied/main.go → ...ata/src/github.com/example/varied/main.go b/...ata/src/github.com/example/varied/main.go → ...ata/src/github.com/example/varied/main.go
diff --git a/...hub.com/example/varied/namemismatch/nm.go → ...hub.com/example/varied/namemismatch/nm.go b/...hub.com/example/varied/namemismatch/nm.go → ...hub.com/example/varied/namemismatch/nm.go
diff --git a/...xample/varied/otherpath/otherpath_test.go → ...xample/varied/otherpath/otherpath_test.go b/...xample/varied/otherpath/otherpath_test.go → ...xample/varied/otherpath/otherpath_test.go
diff --git a/.../example/varied/simple/another/another.go → .../example/varied/simple/another/another.go b/.../example/varied/simple/another/another.go → .../example/varied/simple/another/another.go
diff --git a/...ple/varied/simple/another/another_test.go → ...ple/varied/simple/another/another_test.go b/...ple/varied/simple/another/another_test.go → ...ple/varied/simple/another/another_test.go
diff --git a/...m/example/varied/simple/another/locals.go → ...m/example/varied/simple/another/locals.go b/...m/example/varied/simple/another/locals.go → ...m/example/varied/simple/another/locals.go
diff --git a/...ithub.com/example/varied/simple/locals.go → ...ithub.com/example/varied/simple/locals.go b/...ithub.com/example/varied/simple/locals.go → ...ithub.com/example/varied/simple/locals.go
diff --git a/gps/_testdata/src/varied/simple/simple.go → ...ithub.com/example/varied/simple/simple.go b/gps/_testdata/src/varied/simple/simple.go → ...ithub.com/example/varied/simple/simple.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"go/parser"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/igmain/a.go → internal/gps/_testdata/src/igmain/a.go b/gps/_testdata/src/igmain/a.go → internal/gps/_testdata/src/igmain/a.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/igmain/igmain.go → internal/gps/_testdata/src/igmain/igmain.go b/gps/_testdata/src/igmain/igmain.go → internal/gps/_testdata/src/igmain/igmain.go
diff --git a/gps/_testdata/src/igmainfirst/igmain.go → ...l/gps/_testdata/src/igmainfirst/igmain.go b/gps/_testdata/src/igmainfirst/igmain.go → ...l/gps/_testdata/src/igmainfirst/igmain.go
diff --git a/gps/_testdata/src/igmainfirst/z.go → internal/gps/_testdata/src/igmainfirst/z.go b/gps/_testdata/src/igmainfirst/z.go → internal/gps/_testdata/src/igmainfirst/z.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/nest/a.go → internal/gps/_testdata/src/igmainlong/a.go b/gps/_testdata/src/nest/a.go → internal/gps/_testdata/src/igmainlong/a.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/igmainlong/igmain.go → ...al/gps/_testdata/src/igmainlong/igmain.go b/gps/_testdata/src/igmainlong/igmain.go → ...al/gps/_testdata/src/igmainlong/igmain.go
diff --git a/gps/_testdata/src/igmaint/a.go → internal/gps/_testdata/src/igmaint/a.go b/gps/_testdata/src/igmaint/a.go → internal/gps/_testdata/src/igmaint/a.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/igmaint/igmain.go → internal/gps/_testdata/src/igmaint/igmain.go b/gps/_testdata/src/igmaint/igmain.go → internal/gps/_testdata/src/igmaint/igmain.go
diff --git a/gps/_testdata/src/igmaint/t_test.go → internal/gps/_testdata/src/igmaint/t_test.go b/gps/_testdata/src/igmaint/t_test.go → internal/gps/_testdata/src/igmaint/t_test.go
diff --git a/...data/src/doublenest/namemismatch/m1p/a.go → internal/gps/_testdata/src/m1p/a.go b/...data/src/doublenest/namemismatch/m1p/a.go → internal/gps/_testdata/src/m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/m1p/b.go → internal/gps/_testdata/src/m1p/b.go b/gps/_testdata/src/m1p/b.go → internal/gps/_testdata/src/m1p/b.go
diff --git a/gps/_testdata/src/missing/a.go → internal/gps/_testdata/src/missing/a.go b/gps/_testdata/src/missing/a.go → internal/gps/_testdata/src/missing/a.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 	"missing/missing"
 )
 

diff --git a/gps/_testdata/src/missing/m1p/a.go → internal/gps/_testdata/src/missing/m1p/a.go b/gps/_testdata/src/missing/m1p/a.go → internal/gps/_testdata/src/missing/m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/missing/m1p/b.go → internal/gps/_testdata/src/missing/m1p/b.go b/gps/_testdata/src/missing/m1p/b.go → internal/gps/_testdata/src/missing/m1p/b.go
diff --git a/gps/_testdata/src/igmainlong/a.go → internal/gps/_testdata/src/nest/a.go b/gps/_testdata/src/igmainlong/a.go → internal/gps/_testdata/src/nest/a.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/nest/m1p/a.go → internal/gps/_testdata/src/nest/m1p/a.go b/gps/_testdata/src/nest/m1p/a.go → internal/gps/_testdata/src/nest/m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

diff --git a/gps/_testdata/src/nest/m1p/b.go → internal/gps/_testdata/src/nest/m1p/b.go b/gps/_testdata/src/nest/m1p/b.go → internal/gps/_testdata/src/nest/m1p/b.go
diff --git a/gps/_testdata/src/relimport/a.go → internal/gps/_testdata/src/relimport/a.go b/gps/_testdata/src/relimport/a.go → internal/gps/_testdata/src/relimport/a.go
diff --git a/gps/_testdata/src/relimport/dot/a.go → ...rnal/gps/_testdata/src/relimport/dot/a.go b/gps/_testdata/src/relimport/dot/a.go → ...rnal/gps/_testdata/src/relimport/dot/a.go
diff --git a/gps/_testdata/src/relimport/dotdot/a.go → ...l/gps/_testdata/src/relimport/dotdot/a.go b/gps/_testdata/src/relimport/dotdot/a.go → ...l/gps/_testdata/src/relimport/dotdot/a.go