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

Commit b200080

Browse files
sqssqs
authored
use github.com/sourcegraph/go-diff import path instead of custom sourcegraph.com/... import path (#2961)
follows sourcegraph/go-diff#30
1 parent 612f313 commit b200080

File tree

6 files changed

+42
-10
lines changed

6 files changed

+42
-10
lines changed

‎cmd/frontend/graphqlbackend/repository_comparison.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"strings"
1010
"sync"
1111

12+
"github.com/sourcegraph/go-diff/diff"
1213
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
1314
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
1415
"github.com/sourcegraph/sourcegraph/pkg/gitserver"
1516
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
16-
"sourcegraph.com/sourcegraph/go-diff/diff"
1717
)
1818

1919
// 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is `git hash-object -t tree /dev/null`, which is used as the base

‎cmd/frontend/internal/pkg/search/query/syntax/tokentype_string.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ require (
4040
github.com/go-delve/delve v1.2.0 // indirect
4141
github.com/go-redsync/redsync v1.0.1
4242
github.com/gobwas/glob v0.2.3
43+
github.com/gogo/protobuf v1.2.1 // indirect
4344
github.com/golang-migrate/migrate/v4 v4.2.3
4445
github.com/golang/gddo v0.0.0-20181116215533-9bd4a3295021
4546
github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7
@@ -76,6 +77,7 @@ require (
7677
github.com/keegancsmith/tmpfriend v0.0.0-20180423180255-86e88902a513
7778
github.com/kevinburke/differ v0.0.0-20181006040839-bdfd927653c8
7879
github.com/kevinburke/go-bindata v3.12.0+incompatible
80+
github.com/kisielk/errcheck v1.2.0 // indirect
7981
github.com/kr/text v0.1.0
8082
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348
8183
github.com/lib/pq v1.0.0
@@ -113,6 +115,7 @@ require (
113115
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
114116
github.com/sourcegraph/ctxvfs v0.0.0-20180418081416-2b65f1b1ea81
115117
github.com/sourcegraph/docsite v0.0.0-20190303064655-ad3087aa6352
118+
github.com/sourcegraph/go-diff v0.5.1-0.20190324182542-c825d9a1a0ca
116119
github.com/sourcegraph/go-jsonschema v0.0.0-20190205151546-7939fa138765
117120
github.com/sourcegraph/go-langserver v2.0.1-0.20181108233942-4a51fa2e1238+incompatible
118121
github.com/sourcegraph/go-lsp v0.0.0-20181119182933-0c7d621186c1
@@ -133,13 +136,13 @@ require (
133136
github.com/zenazn/goji v0.9.0 // indirect
134137
go.opencensus.io v0.19.0 // indirect
135138
go.uber.org/atomic v1.3.2 // indirect
136-
golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67
137-
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd
139+
golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576
140+
golang.org/x/net v0.0.0-20190322120337-addf6b3196f6
138141
golang.org/x/oauth2 v0.0.0-20190212230446-3e8b2be13635
139142
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4
140-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a
143+
golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc
141144
golang.org/x/time v0.0.0-20190104202802-85acf8d2951c
142-
golang.org/x/tools v0.0.0-20190110211028-68c5ac90f574
145+
golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89
143146
google.golang.org/api v0.1.0 // indirect
144147
google.golang.org/genproto v0.0.0-20190215211957-bd968387e4aa // indirect
145148
google.golang.org/grpc v1.18.0 // indirect
@@ -149,7 +152,6 @@ require (
149152
gopkg.in/square/go-jose.v2 v2.1.9 // indirect
150153
gopkg.in/src-d/go-git.v4 v4.8.0
151154
gopkg.in/yaml.v2 v2.2.2
152-
sourcegraph.com/sourcegraph/go-diff v0.5.0
153155
sourcegraph.com/sqs/pbtypes v1.0.0 // indirect
154156
)
155157

‎go.sum

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
190190
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
191191
github.com/gogo/protobuf v1.2.0 h1:xU6/SpYbvkNYiptHJYEDRseDLvYE7wSqhYYNy0QSUzI=
192192
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
193+
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
194+
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
193195
github.com/golang-migrate/migrate/v4 v4.2.3 h1:Bc+xynPuLKqk/U1BjIFLxXPbW4tzlf9oMR35BUZRTdI=
194196
github.com/golang-migrate/migrate/v4 v4.2.3/go.mod h1:zt+104di20bTWX9M3cCcERBkS/6mncciH5sAjcn6kBU=
195197
github.com/golang/gddo v0.0.0-20181116215533-9bd4a3295021 h1:HYV500jCgk+IC68L5sWrLFIWMpaUFfXXpJSAb7XOoBk=
@@ -343,6 +345,8 @@ github.com/kevinburke/differ v0.0.0-20181006040839-bdfd927653c8/go.mod h1:I7eBHo
343345
github.com/kevinburke/go-bindata v3.12.0+incompatible h1:D7FWZ35UwzkoC+MEcR8Kgo9Dh/7lmHQUT4VDtAuNGaU=
344346
github.com/kevinburke/go-bindata v3.12.0+incompatible/go.mod h1:/pEEZ72flUW2p0yi30bslSp9YqD9pysLxunQDdb2CPM=
345347
github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
348+
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
349+
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
346350
github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
347351
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
348352
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
@@ -491,6 +495,9 @@ github.com/sourcegraph/ctxvfs v0.0.0-20180418081416-2b65f1b1ea81 h1:v4/JVxZSPWif
491495
github.com/sourcegraph/ctxvfs v0.0.0-20180418081416-2b65f1b1ea81/go.mod h1:xIvvI5FiHLxhv8prbzVpaMHaaGPFPFQSuTcxC91ryOo=
492496
github.com/sourcegraph/docsite v0.0.0-20190303064655-ad3087aa6352 h1:9s/xIkg2iSZU3SImrLPOqFYMys6p3X44tNjbpLTV2YQ=
493497
github.com/sourcegraph/docsite v0.0.0-20190303064655-ad3087aa6352/go.mod h1:1eElRn/gHZ24upi+Fh9WHahVE21CtCcZukPRLIe7FGg=
498+
github.com/sourcegraph/go-diff v0.5.0 h1:yw0xJ6sSYjOKvRfOkZyeeUsuQlFLg8l4KlBK2yKztpM=
499+
github.com/sourcegraph/go-diff v0.5.1-0.20190324182542-c825d9a1a0ca h1:bHqd+XDLw3BN00DDpkmSaeWOQS5N+U+0dqiIzW2hf8s=
500+
github.com/sourcegraph/go-diff v0.5.1-0.20190324182542-c825d9a1a0ca/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE=
494501
github.com/sourcegraph/go-jsonschema v0.0.0-20190205151546-7939fa138765 h1:bFHV2WYU7J7MPdKTyaR6M7Ahhbn4cIdvbTRIRXprenM=
495502
github.com/sourcegraph/go-jsonschema v0.0.0-20190205151546-7939fa138765/go.mod h1:6DfNy4BLIggAeittTJ8o9z/6d1ly+YujBTSnv03i7Bk=
496503
github.com/sourcegraph/go-langserver v2.0.1-0.20181108233942-4a51fa2e1238+incompatible h1:EX1bSaIbVia2U/Pt/2Z62y8wJS4Z4iNiK5VCeUKuBx8=
@@ -579,6 +586,9 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
579586
golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
580587
golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67 h1:ng3VDlRp5/DHpSWl02R4rM9I+8M2rhmsuLwAMmkLQWE=
581588
golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
589+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
590+
golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576 h1:aUX/1G2gFSs4AsJJg2cL3HuoRhCSCz733FE5GUSuaT4=
591+
golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
582592
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
583593
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
584594
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -596,6 +606,9 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r
596606
golang.org/x/net v0.0.0-20190110200230-915654e7eabc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
597607
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd h1:HuTn7WObtcDo9uEEU7rEqL0jYthdXAmZ6PP+meazmaU=
598608
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
609+
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
610+
golang.org/x/net v0.0.0-20190322120337-addf6b3196f6 h1:78jEq2G3J16aXneH23HSnTQQTCwMHoyO8VEiUH+bpPM=
611+
golang.org/x/net v0.0.0-20190322120337-addf6b3196f6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
599612
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
600613
golang.org/x/oauth2 v0.0.0-20181120190819-8f65e3013eba/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
601614
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -620,6 +633,8 @@ golang.org/x/sys v0.0.0-20190108104531-7fbe1cd0fcc2/go.mod h1:STP8DvDyc/dI5b8T5h
620633
golang.org/x/sys v0.0.0-20190109145017-48ac38b7c8cb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
621634
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
622635
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
636+
golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc h1:4gbWbmmPFp4ySWICouJl6emP0MyS31yy9SrTlAGFT+g=
637+
golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
623638
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
624639
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
625640
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -629,13 +644,16 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm
629644
golang.org/x/tools v0.0.0-20180826000951-f6ba57429505/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
630645
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
631646
golang.org/x/tools v0.0.0-20180924175601-e93be7f42f9f/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
647+
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
632648
golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
633649
golang.org/x/tools v0.0.0-20181120060634-fc4f04983f62/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
634650
golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
635651
golang.org/x/tools v0.0.0-20181220024903-92cdcd90bf52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
636652
golang.org/x/tools v0.0.0-20190108222858-421f03a57a64/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
637653
golang.org/x/tools v0.0.0-20190110211028-68c5ac90f574 h1:sNWcmYE7tNFTCVg/HrEF29VgTSwiTN4xxhc0i2dhJ44=
638654
golang.org/x/tools v0.0.0-20190110211028-68c5ac90f574/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
655+
golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89 h1:iWXXYN3edZ3Nd/7I6Rt1sXrWVmhF9bgVtlEJ7BbH124=
656+
golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
639657
google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
640658
google.golang.org/api v0.0.0-20180921000521-920bb1beccf7/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
641659
google.golang.org/api v0.0.0-20181015145326-625cd1887957/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
@@ -697,8 +715,6 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
697715
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
698716
honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
699717
sourcegraph.com/sourcegraph/go-diff v0.0.0-20171119081133-3f415a150aec/go.mod h1:R09mWeb9JcPbO+A3cYDc11xjz0wp6r9+KnqdqROAoRU=
700-
sourcegraph.com/sourcegraph/go-diff v0.5.0 h1:eTiIR0CoWjGzJcnQ3OkhIl/b9GJovq4lSAVRt0ZFEG8=
701-
sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
702718
sourcegraph.com/sqs/pbtypes v0.0.0-20160107090929-4d1b9dc7ffc3/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
703719
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
704720
sourcegraph.com/sqs/pbtypes v1.0.0 h1:f7lAwqviDEGvON4kRv0o5V7FT/IQK+tbkF664XMbP3o=

‎pkg/vcs/git/diff_filter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"regexp"
88
"unicode/utf8"
99

10+
"github.com/sourcegraph/go-diff/diff"
1011
"github.com/sourcegraph/sourcegraph/pkg/pathmatch"
11-
"sourcegraph.com/sourcegraph/go-diff/diff"
1212
)
1313

1414
// compilePathMatcher compiles the path options into a PathMatcher.

‎pkg/vcs/git/diff_filter_test.go

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

10-
"sourcegraph.com/sourcegraph/go-diff/diff"
10+
"github.com/sourcegraph/go-diff/diff"
1111
)
1212

1313
func TestFilterAndHighlightDiff(t *testing.T) {

0 commit comments

Comments
 (0)