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

Commit 80e94e8

Browse files
authored
Merge pull request #1349 from tamalsaha/gomvpkg
Move gps package out of internal
2 parents a5f10f1 + e966965 commit 80e94e8

File tree

241 files changed

+294
-292
lines changed

Some content is hidden

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

241 files changed

+294
-292
lines changed

.codeclimate.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ratings:
1010
- "**.go"
1111
exclude_paths:
1212
- vendor/
13-
- internal/gps/_testdata
13+
- gps/_testdata
1414
- cmd/dep/testdata
1515
- testdata
16-
- internal/gps/internal/pb
16+
- gps/internal/pb

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
/cmd/dep/graphviz* @darkowlzz
2323

2424
# gps caching
25-
/internal/gps/source_cache* @jmank88
25+
/gps/source_cache* @jmank88

CHANGELOG.md

+1

analyzer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"os"
99
"path/filepath"
1010

11+
"github.com/golang/dep/gps"
1112
"github.com/golang/dep/internal/fs"
12-
"github.com/golang/dep/internal/gps"
1313
)
1414

1515
// Analyzer implements gps.ProjectAnalyzer.

appveyor.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
version: "{build}"
22

33
# Source Config
4+
45
clone_folder: c:\gopath\src\github.com\golang\dep
56

67
# Build host

cmd/dep/ensure.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"sync"
2020

2121
"github.com/golang/dep"
22-
"github.com/golang/dep/internal/gps"
23-
"github.com/golang/dep/internal/gps/paths"
24-
"github.com/golang/dep/internal/gps/pkgtree"
22+
"github.com/golang/dep/gps"
23+
"github.com/golang/dep/gps/paths"
24+
"github.com/golang/dep/gps/pkgtree"
2525
"github.com/pkg/errors"
2626
)
2727

cmd/dep/ensure_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"testing"
1515

1616
"github.com/golang/dep"
17-
"github.com/golang/dep/internal/gps"
18-
"github.com/golang/dep/internal/gps/pkgtree"
17+
"github.com/golang/dep/gps"
18+
"github.com/golang/dep/gps/pkgtree"
1919
"github.com/golang/dep/internal/test"
2020
)
2121

cmd/dep/gopath_scanner.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
"sync"
1212

1313
"github.com/golang/dep"
14+
"github.com/golang/dep/gps"
15+
"github.com/golang/dep/gps/paths"
16+
"github.com/golang/dep/gps/pkgtree"
1417
fb "github.com/golang/dep/internal/feedback"
1518
"github.com/golang/dep/internal/fs"
16-
"github.com/golang/dep/internal/gps"
17-
"github.com/golang/dep/internal/gps/paths"
18-
"github.com/golang/dep/internal/gps/pkgtree"
1919
"github.com/pkg/errors"
2020
)
2121

cmd/dep/gopath_scanner_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"testing"
1212

1313
"github.com/golang/dep"
14-
"github.com/golang/dep/internal/gps"
14+
"github.com/golang/dep/gps"
1515
"github.com/golang/dep/internal/test"
1616
)
1717

cmd/dep/hash_in.go

+2-2
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/internal/gps"
12-
"github.com/golang/dep/internal/gps/pkgtree"
11+
"github.com/golang/dep/gps"
12+
"github.com/golang/dep/gps/pkgtree"
1313
"github.com/pkg/errors"
1414
)
1515

cmd/dep/init.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"time"
1515

1616
"github.com/golang/dep"
17+
"github.com/golang/dep/gps"
18+
"github.com/golang/dep/gps/paths"
19+
"github.com/golang/dep/gps/pkgtree"
1720
"github.com/golang/dep/internal/fs"
18-
"github.com/golang/dep/internal/gps"
19-
"github.com/golang/dep/internal/gps/paths"
20-
"github.com/golang/dep/internal/gps/pkgtree"
2121
"github.com/pkg/errors"
2222
)
2323

cmd/dep/init_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010

1111
"github.com/golang/dep"
12-
"github.com/golang/dep/internal/gps"
12+
"github.com/golang/dep/gps"
1313
"github.com/golang/dep/internal/test"
1414
)
1515

cmd/dep/prune.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"strings"
1616

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

cmd/dep/root_analyzer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"golang.org/x/sync/errgroup"
1313

1414
"github.com/golang/dep"
15+
"github.com/golang/dep/gps"
1516
fb "github.com/golang/dep/internal/feedback"
16-
"github.com/golang/dep/internal/gps"
1717
"github.com/golang/dep/internal/importers"
1818
)
1919

cmd/dep/status.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
"text/tabwriter"
1818

1919
"github.com/golang/dep"
20-
"github.com/golang/dep/internal/gps"
21-
"github.com/golang/dep/internal/gps/paths"
22-
"github.com/golang/dep/internal/gps/pkgtree"
20+
"github.com/golang/dep/gps"
21+
"github.com/golang/dep/gps/paths"
22+
"github.com/golang/dep/gps/pkgtree"
2323
"github.com/pkg/errors"
2424
)
2525

cmd/dep/status_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"strings"
1313

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

1818
func TestStatusFormatVersion(t *testing.T) {

context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"path/filepath"
1111
"runtime"
1212

13+
"github.com/golang/dep/gps"
1314
"github.com/golang/dep/internal/fs"
14-
"github.com/golang/dep/internal/gps"
1515
"github.com/pkg/errors"
1616
)
1717

docs/FAQ.md

+1-1
File renamed without changes.
File renamed without changes.
File renamed without changes.

internal/gps/_testdata/src/cycle/a.go gps/_testdata/src/cycle/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package cycle
77
import (
88
"cycle/one"
99

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

1313
var (

internal/gps/_testdata/src/cycle/one/a.go gps/_testdata/src/cycle/one/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package one
77
import (
88
"cycle/two"
99

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

1313
var (

internal/gps/_testdata/src/cycle/two/a.go gps/_testdata/src/cycle/two/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package two
77
import (
88
"cycle"
99

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

1313
var (

internal/gps/_testdata/src/disallow/a.go gps/_testdata/src/disallow/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"disallow/testdata"
99
"sort"
1010

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

1414
var (

internal/gps/_testdata/src/dotgodir/.m1p/a.go gps/_testdata/src/dotgodir/.m1p/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package m1p
77
import (
88
"sort"
99

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

1313
var (

internal/gps/_testdata/src/doublenest/a.go gps/_testdata/src/doublenest/a.go

+1-1
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/internal/gps"
10+
"github.com/golang/dep/gps"
1111
)
1212

1313
var (

internal/gps/_testdata/src/m1p/a.go gps/_testdata/src/doublenest/namemismatch/m1p/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package m1p
77
import (
88
"sort"
99

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

1313
var (
File renamed without changes.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package m1p
77
import (
88
"sort"
99

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

1313
var (

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

+1-1
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/internal/gps"
10+
"github.com/golang/dep/gps"
1111
)
1212

1313
var (

internal/gps/_testdata/src/igmaint/a.go gps/_testdata/src/igmain/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"sort"
99

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

1313
var (
File renamed without changes.

internal/gps/_testdata/src/igmainfirst/z.go gps/_testdata/src/igmainfirst/z.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"sort"
99

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

1313
var (

internal/gps/_testdata/src/igmainlong/a.go gps/_testdata/src/igmainlong/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"sort"
99

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

1313
var (

internal/gps/_testdata/src/nest/a.go gps/_testdata/src/igmaint/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"sort"
99

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

1313
var (

internal/gps/_testdata/src/missing/m1p/a.go gps/_testdata/src/m1p/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package m1p
77
import (
88
"sort"
99

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

1313
var (
File renamed without changes.

internal/gps/_testdata/src/missing/a.go gps/_testdata/src/missing/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"missing/missing"
1111

12-
"github.com/golang/dep/internal/gps"
12+
"github.com/golang/dep/gps"
1313
)
1414

1515
var (

internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go gps/_testdata/src/missing/m1p/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package m1p
77
import (
88
"sort"
99

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

1313
var (
File renamed without changes.

internal/gps/_testdata/src/igmain/a.go gps/_testdata/src/nest/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package simple
77
import (
88
"sort"
99

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

1313
var (

internal/gps/_testdata/src/nest/m1p/a.go gps/_testdata/src/nest/m1p/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package m1p
77
import (
88
"sort"
99

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

1313
var (
File renamed without changes.
File renamed without changes.

internal/gps/_testdata/src/relimport/dotdotslash/a.go gps/_testdata/src/relimport/dotdotslash/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package dotslash
66

77
import (
8-
"../github.com/golang/dep/internal/gps"
8+
"../github.com/golang/dep/gps"
99
)
1010

1111
var (

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

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Copyright 2017 The Go Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style
3+
// license that can be found in the LICENSE file.
4+
5+
package m1p
6+
7+
import (
8+
"sort"
9+
10+
"github.com/golang/dep/gps"
11+
)
12+
13+
var (
14+
_ = sort.Strings
15+
_ = gps.Solve
16+
)
File renamed without changes.

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

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Copyright 2017 The Go Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style
3+
// license that can be found in the LICENSE file.
4+
5+
package simple
6+
7+
import (
8+
"sort"
9+
10+
"github.com/golang/dep/gps"
11+
)
12+
13+
var (
14+
_ = sort.Strings
15+
_ = gps.Solve
16+
)

0 commit comments

Comments
 (0)