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

gps: move gps to internal/gps #540

Merged
merged 3 commits into from
May 10, 2017
Merged

gps: move gps to internal/gps #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ea8489
gps: move gps to internal/gps
davecheney May 10, 2017
6cb4056
adjust codeclimate exclude path
davecheney May 10, 2017
5bd470e
adjust appveyor paths
davecheney May 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .codeclimate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ ratings:
- "**.go"
exclude_paths:
- vendor/
- gps/_testdata
- internal/gps/_testdata
2 changes: 1 addition & 1 deletion analyzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"path/filepath"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

type Analyzer struct{}
Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ test_script:
- go build
- go test .
- go test ./cmd/dep
- go test ./gps
- go test ./gps/internal
- go test ./gps/internal/fs
- go test ./gps/pkgtree
- go test ./internal/gps
- go test ./internal/gps/internal
- go test ./internal/gps/internal/fs
- go test ./internal/gps/pkgtree
- go test ./internal
- go test ./test
4 changes: 2 additions & 2 deletions cmd/dep/ensure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/ensure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package main
import (
"testing"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

func TestDeduceConstraint(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/hash_in.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"reflect"
"testing"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

func TestContains(t *testing.T) {
Expand Down
5 changes: 2 additions & 3 deletions cmd/dep/prune.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package main
import (
"testing"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

func TestStatusFormatVersion(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"unicode"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
"github.com/golang/dep/test"
)

Expand Down
16 changes: 0 additions & 16 deletions gps/_testdata/src/ren/m1p/a.go
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions gps/_testdata/src/ren/simple/a.go
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions gps/_testdata/src/simple/a.go
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions gps/_testdata/src/simpleallt/a.go
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions gps/_testdata/src/simplet/a.go
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions gps/_testdata/src/simplext/a.go
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions gps/_testdata/src/twopkgs/a.go
View file
Open in desktop

This file was deleted.

0 gps/_testdata/cmd/echosleep.go → internal/gps/_testdata/cmd/echosleep.go
View file
Open in desktop
File renamed without changes.
0 gps/_testdata/src/bad/bad.go → internal/gps/_testdata/src/bad/bad.go
View file
Open in desktop
File renamed without changes.
0 gps/_testdata/src/buildtag/invalid.go → ...nal/gps/_testdata/src/buildtag/invalid.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gps/_testdata/src/cycle/a.go → internal/gps/_testdata/src/cycle/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package cycle

import (
"cycle/one"
"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/cycle/one/a.go → internal/gps/_testdata/src/cycle/one/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package one

import (
"cycle/two"
"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/cycle/two/a.go → internal/gps/_testdata/src/cycle/two/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package two

import (
"cycle"
"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
0 gps/_testdata/src/disallow/.m1p/a.go → ...rnal/gps/_testdata/src/disallow/.m1p/a.go
View file
Open in desktop
File renamed without changes.
0 gps/_testdata/src/disallow/.m1p/b.go → ...rnal/gps/_testdata/src/disallow/.m1p/b.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gps/_testdata/src/disallow/a.go → internal/gps/_testdata/src/disallow/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"disallow/testdata"
"sort"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
0 ...testdata/src/disallow/testdata/another.go → ...testdata/src/disallow/testdata/another.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gps/_testdata/src/doublenest/a.go → internal/gps/_testdata/src/doublenest/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package base
import (
"go/parser"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/m1p/a.go → ...data/src/doublenest/namemismatch/m1p/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package m1p
import (
"sort"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
0 ...data/src/doublenest/namemismatch/m1p/b.go → ...data/src/doublenest/namemismatch/m1p/b.go
View file
Open in desktop
File renamed without changes.
0 ...estdata/src/doublenest/namemismatch/nm.go → ...estdata/src/doublenest/namemismatch/nm.go
View file
Open in desktop
File renamed without changes.
0 gps/_testdata/src/empty/.gitkeep → internal/gps/_testdata/src/empty/.gitkeep
View file
Open in desktop
File renamed without changes.
0 ...a/src/github.com/example/varied/locals.go → ...a/src/github.com/example/varied/locals.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gps/_testdata/src/varied/m1p/a.go → ...ta/src/github.com/example/varied/m1p/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package m1p
import (
"sort"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
0 ...ta/src/github.com/example/varied/m1p/b.go → ...ta/src/github.com/example/varied/m1p/b.go
View file
Open in desktop
File renamed without changes.
0 ...ata/src/github.com/example/varied/main.go → ...ata/src/github.com/example/varied/main.go
View file
Open in desktop
File renamed without changes.
0 ...hub.com/example/varied/namemismatch/nm.go → ...hub.com/example/varied/namemismatch/nm.go
View file
Open in desktop
File renamed without changes.
0 ...xample/varied/otherpath/otherpath_test.go → ...xample/varied/otherpath/otherpath_test.go
View file
Open in desktop
File renamed without changes.
0 .../example/varied/simple/another/another.go → .../example/varied/simple/another/another.go
View file
Open in desktop
File renamed without changes.
0 ...ple/varied/simple/another/another_test.go → ...ple/varied/simple/another/another_test.go
View file
Open in desktop
File renamed without changes.
0 ...m/example/varied/simple/another/locals.go → ...m/example/varied/simple/another/locals.go
View file
Open in desktop
File renamed without changes.
0 ...ithub.com/example/varied/simple/locals.go → ...ithub.com/example/varied/simple/locals.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gps/_testdata/src/varied/simple/simple.go → ...ithub.com/example/varied/simple/simple.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"go/parser"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/igmain/a.go → internal/gps/_testdata/src/igmain/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"sort"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
0 gps/_testdata/src/igmain/igmain.go → internal/gps/_testdata/src/igmain/igmain.go
View file
Open in desktop
File renamed without changes.
0 gps/_testdata/src/igmainfirst/igmain.go → ...l/gps/_testdata/src/igmainfirst/igmain.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gps/_testdata/src/igmainfirst/z.go → internal/gps/_testdata/src/igmainfirst/z.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"sort"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/nest/a.go → internal/gps/_testdata/src/igmainlong/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"sort"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
0 gps/_testdata/src/igmainlong/igmain.go → ...al/gps/_testdata/src/igmainlong/igmain.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gps/_testdata/src/igmaint/a.go → internal/gps/_testdata/src/igmaint/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"sort"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
0 gps/_testdata/src/igmaint/igmain.go → internal/gps/_testdata/src/igmaint/igmain.go
View file
Open in desktop
File renamed without changes.
0 gps/_testdata/src/igmaint/t_test.go → internal/gps/_testdata/src/igmaint/t_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...data/src/doublenest/namemismatch/m1p/a.go → internal/gps/_testdata/src/m1p/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package m1p
import (
"sort"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
0 gps/_testdata/src/m1p/b.go → internal/gps/_testdata/src/m1p/b.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gps/_testdata/src/missing/a.go → internal/gps/_testdata/src/missing/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package simple
import (
"sort"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
"missing/missing"
)

Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/missing/m1p/a.go → internal/gps/_testdata/src/missing/m1p/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package m1p
import (
"sort"

"github.com/golang/dep/gps"
"github.com/golang/dep/internal/gps"
)

var (
Expand Down
0 gps/_testdata/src/missing/m1p/b.go → internal/gps/_testdata/src/missing/m1p/b.go
View file
Open in desktop
File renamed without changes.
Loading