diff --git a/go.mod b/go.mod index 94c6ade3..c346e096 100644 --- a/go.mod +++ b/go.mod @@ -41,6 +41,7 @@ require ( github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7 github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect github.com/sirupsen/logrus v1.0.5 + github.com/sourcegraph/go-diff v0.5.1 github.com/spf13/afero v1.1.0 // indirect github.com/spf13/cast v1.2.0 // indirect github.com/spf13/cobra v0.0.2 @@ -58,5 +59,4 @@ require ( mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect mvdan.cc/unparam v0.0.0-20190124213536-fbb59629db34 - sourcegraph.com/sourcegraph/go-diff v0.5.1-0.20190210232911-dee78e514455 ) diff --git a/go.sum b/go.sum index 6e328cda..7c1599ab 100644 --- a/go.sum +++ b/go.sum @@ -130,6 +130,8 @@ github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041 h1:llrF3Fs4018ePo github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/sirupsen/logrus v1.0.5 h1:8c8b5uO0zS4X6RPl/sd1ENwSkIc0/H2PaHxE3udaE8I= github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/sourcegraph/go-diff v0.5.1 h1:gO6i5zugwzo1RVTvgvfwCOSVegNuvnNi6bAD1QCmkHs= +github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE= github.com/spf13/afero v1.1.0 h1:bopulORc2JeYaxfHLvJa5NzxviA9PoWhpiiJkru7Ji4= github.com/spf13/afero v1.1.0/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.2.0 h1:HHl1DSRbEQN2i8tJmtS6ViPyHx35+p51amrdsiTCrkg= @@ -192,7 +194,5 @@ mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphD mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/unparam v0.0.0-20190124213536-fbb59629db34 h1:B1LAOfRqg2QUyCdzfjf46quTSYUTAK5OCwbh6pljHbM= mvdan.cc/unparam v0.0.0-20190124213536-fbb59629db34/go.mod h1:H6SUd1XjIs+qQCyskXg5OFSrilMRUkD8ePJpHKDPaeY= -sourcegraph.com/sourcegraph/go-diff v0.5.1-0.20190210232911-dee78e514455 h1:qoQ5Kt+Zm+GXBtz49YwD3juBhr/E0U25jO6bBzxW6NI= -sourcegraph.com/sourcegraph/go-diff v0.5.1-0.20190210232911-dee78e514455/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4 h1:JPJh2pk3+X4lXAkZIk2RuE/7/FoK9maXw+TNPJhVS/c= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= diff --git a/pkg/golinters/gofmt.go b/pkg/golinters/gofmt.go index a2399cb9..0a760fab 100644 --- a/pkg/golinters/gofmt.go +++ b/pkg/golinters/gofmt.go @@ -10,8 +10,8 @@ import ( gofmtAPI "github.com/golangci/gofmt/gofmt" goimportsAPI "github.com/golangci/gofmt/goimports" "github.com/pkg/errors" + diffpkg "github.com/sourcegraph/go-diff/diff" "golang.org/x/tools/imports" - diffpkg "sourcegraph.com/sourcegraph/go-diff/diff" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/logutils" diff --git a/pkg/golinters/gofmt_test.go b/pkg/golinters/gofmt_test.go index f50b5a94..a34a122a 100644 --- a/pkg/golinters/gofmt_test.go +++ b/pkg/golinters/gofmt_test.go @@ -7,8 +7,8 @@ import ( "github.com/golangci/golangci-lint/pkg/result" + diffpkg "github.com/sourcegraph/go-diff/diff" "github.com/stretchr/testify/assert" - diffpkg "sourcegraph.com/sourcegraph/go-diff/diff" "github.com/golangci/golangci-lint/pkg/logutils" ) diff --git a/vendor/sourcegraph.com/sourcegraph/go-diff/LICENSE b/vendor/github.com/sourcegraph/go-diff/LICENSE similarity index 100% rename from vendor/sourcegraph.com/sourcegraph/go-diff/LICENSE rename to vendor/github.com/sourcegraph/go-diff/LICENSE diff --git a/vendor/sourcegraph.com/sourcegraph/go-diff/diff/diff.go b/vendor/github.com/sourcegraph/go-diff/diff/diff.go similarity index 100% rename from vendor/sourcegraph.com/sourcegraph/go-diff/diff/diff.go rename to vendor/github.com/sourcegraph/go-diff/diff/diff.go diff --git a/vendor/sourcegraph.com/sourcegraph/go-diff/diff/diff.pb.go b/vendor/github.com/sourcegraph/go-diff/diff/diff.pb.go similarity index 100% rename from vendor/sourcegraph.com/sourcegraph/go-diff/diff/diff.pb.go rename to vendor/github.com/sourcegraph/go-diff/diff/diff.pb.go diff --git a/vendor/sourcegraph.com/sourcegraph/go-diff/diff/diff.proto b/vendor/github.com/sourcegraph/go-diff/diff/diff.proto similarity index 100% rename from vendor/sourcegraph.com/sourcegraph/go-diff/diff/diff.proto rename to vendor/github.com/sourcegraph/go-diff/diff/diff.proto diff --git a/vendor/github.com/sourcegraph/go-diff/diff/doc.go b/vendor/github.com/sourcegraph/go-diff/diff/doc.go new file mode 100644 index 00000000..12fe96a0 --- /dev/null +++ b/vendor/github.com/sourcegraph/go-diff/diff/doc.go @@ -0,0 +1,2 @@ +// Package diff provides a parser for unified diffs. +package diff diff --git a/vendor/sourcegraph.com/sourcegraph/go-diff/diff/parse.go b/vendor/github.com/sourcegraph/go-diff/diff/parse.go similarity index 100% rename from vendor/sourcegraph.com/sourcegraph/go-diff/diff/parse.go rename to vendor/github.com/sourcegraph/go-diff/diff/parse.go diff --git a/vendor/sourcegraph.com/sourcegraph/go-diff/diff/print.go b/vendor/github.com/sourcegraph/go-diff/diff/print.go similarity index 100% rename from vendor/sourcegraph.com/sourcegraph/go-diff/diff/print.go rename to vendor/github.com/sourcegraph/go-diff/diff/print.go diff --git a/vendor/sourcegraph.com/sourcegraph/go-diff/diff/reader_util.go b/vendor/github.com/sourcegraph/go-diff/diff/reader_util.go similarity index 100% rename from vendor/sourcegraph.com/sourcegraph/go-diff/diff/reader_util.go rename to vendor/github.com/sourcegraph/go-diff/diff/reader_util.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 4ac00d39..3ba972ed 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -161,6 +161,8 @@ github.com/shirou/gopsutil/net github.com/shirou/w32 # github.com/sirupsen/logrus v1.0.5 github.com/sirupsen/logrus +# github.com/sourcegraph/go-diff v0.5.1 +github.com/sourcegraph/go-diff/diff # github.com/spf13/afero v1.1.0 github.com/spf13/afero github.com/spf13/afero/mem @@ -243,7 +245,5 @@ mvdan.cc/interfacer/check mvdan.cc/lint # mvdan.cc/unparam v0.0.0-20190124213536-fbb59629db34 mvdan.cc/unparam/check -# sourcegraph.com/sourcegraph/go-diff v0.5.1-0.20190210232911-dee78e514455 -sourcegraph.com/sourcegraph/go-diff/diff # sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4 sourcegraph.com/sqs/pbtypes diff --git a/vendor/sourcegraph.com/sourcegraph/go-diff/diff/doc.go b/vendor/sourcegraph.com/sourcegraph/go-diff/diff/doc.go deleted file mode 100644 index 01f06dd8..00000000 --- a/vendor/sourcegraph.com/sourcegraph/go-diff/diff/doc.go +++ /dev/null @@ -1,2 +0,0 @@ -// Package diff provides a parser for unified diffs. -package diff // import "sourcegraph.com/sourcegraph/go-diff/diff"