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

Commit a955a58

Browse files
sdboyersdboyer
authored
Merge branch 'master' into appveyor
2 parents 52c7a5d + 3dc78df commit a955a58

File tree

181 files changed

+579
-305
lines changed

Some content is hidden

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

181 files changed

+579
-305
lines changed

‎.codeclimate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ ratings:
88
- "**.go"
99
exclude_paths:
1010
- vendor/
11-
- gps/_testdata
11+
- internal/gps/_testdata

‎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{}

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ deploy: false
3434

3535
test_script:
3636
- go build github.com/golang/dep/cmd/dep
37-
- for /f "" %%G in ('go list github.com/golang/dep/... ^| find /i /v "/vendor/"') do @go test %%G
37+
- for /f "" %%G in ('go list github.com/golang/dep/... ^| find /i /v "/vendor/"') do @go test %%G

‎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

0 commit comments

Comments
 (0)