s|karrick/dep|golang/dep|g before merge

golang · Aug 4, 2017 · 27c0c77 · 27c0c77
1 parent f6606ee
commit 27c0c77
Show file tree

Hide file tree

Showing 47 changed files with 100 additions and 100 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -17,7 +17,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/karrick/dep/internal/fs"
+	"github.com/golang/dep/internal/fs"
 	"github.com/pkg/errors"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ package two @@
     import (
     	"cycle"
-    	"github.com/karrick/dep/internal/gps"
+    	"github.com/golang/dep/internal/gps"
     )
     var (
@@ Expand Down @@