Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 9ea8489

Browse files
davecheneydavecheney
committed
gps: move gps to internal/gps
Fixes #300 Fixes #519
1 parent 09b46aa commit 9ea8489

File tree

178 files changed

+261
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+261
-262
lines changed

‎analyzer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99
"path/filepath"
1010

11-
"github.com/golang/dep/gps"
11+
"github.com/golang/dep/internal/gps"
1212
)
1313

1414
type Analyzer struct{}

‎cmd/dep/ensure.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"strings"
1717

1818
"github.com/golang/dep"
19-
"github.com/golang/dep/gps"
20-
"github.com/golang/dep/gps/pkgtree"
19+
"github.com/golang/dep/internal/gps"
20+
"github.com/golang/dep/internal/gps/pkgtree"
2121
"github.com/pkg/errors"
2222
)
2323

‎cmd/dep/ensure_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package main
77
import (
88
"testing"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
func TestDeduceConstraint(t *testing.T) {

‎cmd/dep/hash_in.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"flag"
99

1010
"github.com/golang/dep"
11-
"github.com/golang/dep/gps"
12-
"github.com/golang/dep/gps/pkgtree"
11+
"github.com/golang/dep/internal/gps"
12+
"github.com/golang/dep/internal/gps/pkgtree"
1313
"github.com/pkg/errors"
1414
)
1515

‎cmd/dep/init.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"sync"
1313

1414
"github.com/golang/dep"
15-
"github.com/golang/dep/gps"
16-
"github.com/golang/dep/gps/pkgtree"
1715
"github.com/golang/dep/internal"
16+
"github.com/golang/dep/internal/gps"
17+
"github.com/golang/dep/internal/gps/pkgtree"
1818
"github.com/pkg/errors"
1919
)
2020

‎cmd/dep/init_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"reflect"
99
"testing"
1010

11-
"github.com/golang/dep/gps"
11+
"github.com/golang/dep/internal/gps"
1212
)
1313

1414
func TestContains(t *testing.T) {

‎cmd/dep/prune.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ import (
1010
"fmt"
1111

1212
"github.com/golang/dep"
13-
"github.com/golang/dep/gps"
14-
"github.com/golang/dep/gps/pkgtree"
15-
13+
"github.com/golang/dep/internal/gps"
14+
"github.com/golang/dep/internal/gps/pkgtree"
1615
"github.com/pkg/errors"
1716
)
1817

‎cmd/dep/remove.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strings"
1010

1111
"github.com/golang/dep"
12-
"github.com/golang/dep/gps"
13-
"github.com/golang/dep/gps/pkgtree"
12+
"github.com/golang/dep/internal/gps"
13+
"github.com/golang/dep/internal/gps/pkgtree"
1414
"github.com/pkg/errors"
1515
)
1616

‎cmd/dep/status.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"text/tabwriter"
1616

1717
"github.com/golang/dep"
18-
"github.com/golang/dep/gps"
19-
"github.com/golang/dep/gps/pkgtree"
18+
"github.com/golang/dep/internal/gps"
19+
"github.com/golang/dep/internal/gps/pkgtree"
2020
"github.com/pkg/errors"
2121
)
2222

‎cmd/dep/status_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package main
77
import (
88
"testing"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
func TestStatusFormatVersion(t *testing.T) {

‎context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"strings"
1212

1313
"github.com/Masterminds/vcs"
14-
"github.com/golang/dep/gps"
1514
"github.com/golang/dep/internal"
15+
"github.com/golang/dep/internal/gps"
1616
"github.com/pkg/errors"
1717
)
1818

‎context_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"testing"
1313
"unicode"
1414

15-
"github.com/golang/dep/gps"
15+
"github.com/golang/dep/internal/gps"
1616
"github.com/golang/dep/test"
1717
)
1818

‎gps/_testdata/src/ren/m1p/a.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎gps/_testdata/src/ren/simple/a.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎gps/_testdata/src/simple/a.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎gps/_testdata/src/simpleallt/a.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎gps/_testdata/src/simplet/a.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎gps/_testdata/src/simplext/a.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎gps/_testdata/src/twopkgs/a.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎gps/_testdata/cmd/echosleep.go renamed to ‎internal/gps/_testdata/cmd/echosleep.go

File renamed without changes.

‎gps/_testdata/src/bad/bad.go renamed to ‎internal/gps/_testdata/src/bad/bad.go

File renamed without changes.

‎gps/_testdata/src/buildtag/invalid.go renamed to ‎internal/gps/_testdata/src/buildtag/invalid.go

File renamed without changes.

‎gps/_testdata/src/cycle/a.go renamed to ‎internal/gps/_testdata/src/cycle/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package cycle
66

77
import (
88
"cycle/one"
9-
"github.com/golang/dep/gps"
9+
"github.com/golang/dep/internal/gps"
1010
)
1111

1212
var (

‎gps/_testdata/src/cycle/one/a.go renamed to ‎internal/gps/_testdata/src/cycle/one/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package one
66

77
import (
88
"cycle/two"
9-
"github.com/golang/dep/gps"
9+
"github.com/golang/dep/internal/gps"
1010
)
1111

1212
var (

‎gps/_testdata/src/cycle/two/a.go renamed to ‎internal/gps/_testdata/src/cycle/two/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package two
66

77
import (
88
"cycle"
9-
"github.com/golang/dep/gps"
9+
"github.com/golang/dep/internal/gps"
1010
)
1111

1212
var (

‎gps/_testdata/src/disallow/.m1p/a.go renamed to ‎internal/gps/_testdata/src/disallow/.m1p/a.go

File renamed without changes.

‎gps/_testdata/src/disallow/.m1p/b.go renamed to ‎internal/gps/_testdata/src/disallow/.m1p/b.go

File renamed without changes.

‎gps/_testdata/src/disallow/a.go renamed to ‎internal/gps/_testdata/src/disallow/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"disallow/testdata"
99
"sort"
1010

11-
"github.com/golang/dep/gps"
11+
"github.com/golang/dep/internal/gps"
1212
)
1313

1414
var (

‎gps/_testdata/src/disallow/testdata/another.go renamed to ‎internal/gps/_testdata/src/disallow/testdata/another.go

File renamed without changes.

‎gps/_testdata/src/doublenest/a.go renamed to ‎internal/gps/_testdata/src/doublenest/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package base
77
import (
88
"go/parser"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/m1p/a.go renamed to ‎internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package m1p
77
import (
88
"sort"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/doublenest/namemismatch/m1p/b.go renamed to ‎internal/gps/_testdata/src/doublenest/namemismatch/m1p/b.go

File renamed without changes.

‎gps/_testdata/src/doublenest/namemismatch/nm.go renamed to ‎internal/gps/_testdata/src/doublenest/namemismatch/nm.go

File renamed without changes.

‎gps/_testdata/src/empty/.gitkeep renamed to ‎internal/gps/_testdata/src/empty/.gitkeep

File renamed without changes.

‎gps/_testdata/src/github.com/example/varied/locals.go renamed to ‎internal/gps/_testdata/src/github.com/example/varied/locals.go

File renamed without changes.

‎gps/_testdata/src/varied/m1p/a.go renamed to ‎internal/gps/_testdata/src/github.com/example/varied/m1p/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package m1p
77
import (
88
"sort"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/github.com/example/varied/m1p/b.go renamed to ‎internal/gps/_testdata/src/github.com/example/varied/m1p/b.go

File renamed without changes.

‎gps/_testdata/src/github.com/example/varied/main.go renamed to ‎internal/gps/_testdata/src/github.com/example/varied/main.go

File renamed without changes.

‎gps/_testdata/src/github.com/example/varied/namemismatch/nm.go renamed to ‎internal/gps/_testdata/src/github.com/example/varied/namemismatch/nm.go

File renamed without changes.

‎gps/_testdata/src/github.com/example/varied/otherpath/otherpath_test.go renamed to ‎internal/gps/_testdata/src/github.com/example/varied/otherpath/otherpath_test.go

File renamed without changes.

‎gps/_testdata/src/github.com/example/varied/simple/another/another.go renamed to ‎internal/gps/_testdata/src/github.com/example/varied/simple/another/another.go

File renamed without changes.

‎gps/_testdata/src/github.com/example/varied/simple/another/another_test.go renamed to ‎internal/gps/_testdata/src/github.com/example/varied/simple/another/another_test.go

File renamed without changes.

‎gps/_testdata/src/github.com/example/varied/simple/another/locals.go renamed to ‎internal/gps/_testdata/src/github.com/example/varied/simple/another/locals.go

File renamed without changes.

‎gps/_testdata/src/github.com/example/varied/simple/locals.go renamed to ‎internal/gps/_testdata/src/github.com/example/varied/simple/locals.go

File renamed without changes.

‎gps/_testdata/src/varied/simple/simple.go renamed to ‎internal/gps/_testdata/src/github.com/example/varied/simple/simple.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"go/parser"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/igmain/a.go renamed to ‎internal/gps/_testdata/src/igmain/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"sort"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/igmain/igmain.go renamed to ‎internal/gps/_testdata/src/igmain/igmain.go

File renamed without changes.

‎gps/_testdata/src/igmainfirst/igmain.go renamed to ‎internal/gps/_testdata/src/igmainfirst/igmain.go

File renamed without changes.

‎gps/_testdata/src/igmainfirst/z.go renamed to ‎internal/gps/_testdata/src/igmainfirst/z.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"sort"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/nest/a.go renamed to ‎internal/gps/_testdata/src/igmainlong/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"sort"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/igmainlong/igmain.go renamed to ‎internal/gps/_testdata/src/igmainlong/igmain.go

File renamed without changes.

‎gps/_testdata/src/igmaint/a.go renamed to ‎internal/gps/_testdata/src/igmaint/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"sort"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/igmaint/igmain.go renamed to ‎internal/gps/_testdata/src/igmaint/igmain.go

File renamed without changes.

‎gps/_testdata/src/igmaint/t_test.go renamed to ‎internal/gps/_testdata/src/igmaint/t_test.go

File renamed without changes.

‎gps/_testdata/src/doublenest/namemismatch/m1p/a.go renamed to ‎internal/gps/_testdata/src/m1p/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package m1p
77
import (
88
"sort"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/m1p/b.go renamed to ‎internal/gps/_testdata/src/m1p/b.go

File renamed without changes.

‎gps/_testdata/src/missing/a.go renamed to ‎internal/gps/_testdata/src/missing/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"sort"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
"missing/missing"
1212
)
1313

‎gps/_testdata/src/missing/m1p/a.go renamed to ‎internal/gps/_testdata/src/missing/m1p/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package m1p
77
import (
88
"sort"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/missing/m1p/b.go renamed to ‎internal/gps/_testdata/src/missing/m1p/b.go

File renamed without changes.

‎gps/_testdata/src/igmainlong/a.go renamed to ‎internal/gps/_testdata/src/nest/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"sort"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/nest/m1p/a.go renamed to ‎internal/gps/_testdata/src/nest/m1p/a.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package m1p
77
import (
88
"sort"
99

10-
"github.com/golang/dep/gps"
10+
"github.com/golang/dep/internal/gps"
1111
)
1212

1313
var (

‎gps/_testdata/src/nest/m1p/b.go renamed to ‎internal/gps/_testdata/src/nest/m1p/b.go

File renamed without changes.

‎gps/_testdata/src/relimport/a.go renamed to ‎internal/gps/_testdata/src/relimport/a.go

File renamed without changes.

‎gps/_testdata/src/relimport/dot/a.go renamed to ‎internal/gps/_testdata/src/relimport/dot/a.go

File renamed without changes.

‎gps/_testdata/src/relimport/dotdot/a.go renamed to ‎internal/gps/_testdata/src/relimport/dotdot/a.go

File renamed without changes.

0 commit comments

Comments
 (0)