blind replace kbfs to new repo

go/bind/keybase.go

@@ -32,11 +32,11 @@ import (
 	"github.com/keybase/client/go/service"
 	"github.com/keybase/client/go/uidmap"
 	"github.com/keybase/go-framed-msgpack-rpc/rpc"
-	"github.com/keybase/kbfs/env"
-	"github.com/keybase/kbfs/fsrpc"
-	"github.com/keybase/kbfs/libgit"
-	"github.com/keybase/kbfs/libkbfs"
-	"github.com/keybase/kbfs/simplefs"
+	"github.com/keybase/client/go/kbfs/env"
+	"github.com/keybase/client/go/kbfs/fsrpc"
+	"github.com/keybase/client/go/kbfs/libgit"
+	"github.com/keybase/client/go/kbfs/libkbfs"
+	"github.com/keybase/client/go/kbfs/simplefs"
 	context "golang.org/x/net/context"
 )
 

go/kbfs/.circleci/config.yml

@@ -7,7 +7,7 @@
 version: 2
 jobs:
   build:
-    working_directory: ~/go-path/src/github.com/keybase/kbfs
+    working_directory: ~/go-path/src/github.com/keybase/client/go/kbfs
 
     docker:
     - image: keybaseprivate/circleci-kbfs@sha256:6e95999341a551ca9d175f497abc6f99e42583d977e26489471a86895327cd28

go/kbfs/Jenkinsfile

@@ -43,7 +43,7 @@ helpers.rootLinuxNode(env, {
     env.GOPATH="${env.BASEDIR}/go"
     env.GO15VENDOREXPERIMENT=1
 
-    ws("${env.GOPATH}/src/github.com/keybase/kbfs") {
+    ws("${env.GOPATH}/src/github.com/keybase/client/go/kbfs") {
         def mysqlImage = docker.image("keybaseprivate/mysql")
         def gregorImage = docker.image("keybaseprivate/kbgregor")
         def kbwebImage = docker.image("keybaseprivate/kbweb")
@@ -140,7 +140,7 @@ helpers.rootLinuxNode(env, {
                                 "TMPDIR=${mountDir}",
                                 "GOTRACEBACK=all",
                             ]) {
-                                ws("${GOPATH}/src/github.com/keybase/kbfs") {
+                                ws("${GOPATH}/src/github.com/keybase/client/go/kbfs") {
                                     println "Checkout OS X"
                                     checkout scm
 
@@ -152,9 +152,9 @@ helpers.rootLinuxNode(env, {
                     },
                     test_kbfs: {
                         // Install kbfsfuse first so we can start on dockerizing.
-                        sh "go install github.com/keybase/kbfs/kbfsfuse"
+                        sh "go install github.com/keybase/client/go/kbfs/kbfsfuse"
                         sh "cp ${env.GOPATH}/bin/kbfsfuse ./kbfsfuse/kbfsfuse"
-                        sh "go install github.com/keybase/kbfs/kbfsgit/git-remote-keybase"
+                        sh "go install github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase"
                         sh "cp ${env.GOPATH}/bin/git-remote-keybase ./kbfsgit/git-remote-keybase/git-remote-keybase"
                         withCredentials([[$class: 'StringBinding', credentialsId: 'kbfs-docker-cert-b64-new', variable: 'KBFS_DOCKER_CERT_B64']]) {
                             println "Building Docker"
@@ -256,7 +256,7 @@ def runNixTest(prefix) {
     }
     tests[prefix+'notestingdep'] = {
         // Make sure we don't accidentally pull in the testing package.
-        sh '! go list -f \'{{ join .Deps "\\n" }}\' github.com/keybase/kbfs/kbfsfuse | grep testing'
+        sh '! go list -f \'{{ join .Deps "\\n" }}\' github.com/keybase/client/go/kbfs/kbfsfuse | grep testing'
     }
     tests[prefix+'vet'] = {
         sh 'make -s lint'
@@ -284,7 +284,7 @@ def runNixTest(prefix) {
     // races.
     sh 'go test -i -tags fuse ./...'
 
-    sh 'go install github.com/keybase/kbfs/...'
+    sh 'go install github.com/keybase/client/go/kbfs/...'
 
     // Keep the list below in sync with the result of
     //

go/kbfs/README.md

@@ -136,7 +136,7 @@ precommit hooks to make sure your code passes `gofmt` and `govet`:
 
 ```bash
 go get golang.org/x/tools/cmd/vet
-ln -s $GOPATH/src/github.com/keybase/client/git-hooks/pre-commit $GOPATH/src/github.com/keybase/kbfs/.git/hooks/pre-commit
+ln -s $GOPATH/src/github.com/keybase/client/git-hooks/pre-commit $GOPATH/src/github.com/keybase/client/go/kbfs/.git/hooks/pre-commit
 ```
 
 Though it doesn't happen automatically, we also expect your code to be

go/kbfs/appveyor.yml

@@ -70,26 +70,26 @@ build_script:
   #
   #   for x in $(find . -mindepth 1 \( -wholename ./vendor -o -wholename ./.git \) -prune -o -type d -print); do [ -n "$(ls -A $x/*_test.go 2>/dev/null)" ] && echo $x; done | sort
   # dokan dir is tested above.
-  - echo github.com/keybase/kbfs/kbfsblock >> testlist.txt
-  - echo github.com/keybase/kbfs/kbfscodec >> testlist.txt
-  - echo github.com/keybase/kbfs/kbfscrypto >> testlist.txt
-  - echo github.com/keybase/kbfs/kbfsedits >> testlist.txt
-  - echo github.com/keybase/kbfs/kbfsgit >> testlist.txt
-  - echo github.com/keybase/kbfs/kbfshash >> testlist.txt
-  - echo github.com/keybase/kbfs/kbfsmd >> testlist.txt
-  - echo github.com/keybase/kbfs/kbfssync >> testlist.txt
-  - echo github.com/keybase/kbfs/kbpagesconfig >> testlist.txt
-  - echo github.com/keybase/kbfs/libdokan >> testlist.txt
-  - echo github.com/keybase/kbfs/libfs >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/kbfsblock >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/kbfscodec >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/kbfscrypto >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/kbfsedits >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/kbfsgit >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/kbfshash >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/kbfsmd >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/kbfssync >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/kbpagesconfig >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/libdokan >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/libfs >> testlist.txt
   # libfuse is non-Windows-only.
-  - echo github.com/keybase/kbfs/libgit >> testlist.txt
-  - echo github.com/keybase/kbfs/libhttpserver >> testlist.txt
-  - echo github.com/keybase/kbfs/libkbfs >> testlist.txt
-  - echo github.com/keybase/kbfs/libpages >> testlist.txt
-  - echo github.com/keybase/kbfs/libpages/config >> testlist.txt
-  - echo github.com/keybase/kbfs/simplefs >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/libgit >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/libhttpserver >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/libkbfs >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/libpages >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/libpages/config >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/simplefs >> testlist.txt
   # test dir is tested below.
-  - echo github.com/keybase/kbfs/tlf >> testlist.txt
+  - echo github.com/keybase/client/go/kbfs/tlf >> testlist.txt
 # TODO: Run the below tests with env KEYBASE_TEST_BSERVER_ADDR=tempdir.
   - for /f %%i in (testlist.txt) do (appveyor AddTest %%i -Outcome Running -Framework gotest -Filename %%i & go test -timeout 5m %%i && appveyor UpdateTest %%i -Outcome Passed -Framework gotest -Filename %%i -Duration 0) || (appveyor UpdateTest %%i -Outcome Failed -Framework gotest -Filename %%i -Duration 0 & exit /b 1) 
   - cd test && go test -tags dokan -timeout 300s

go/kbfs/dokan/cgo.go

@@ -23,7 +23,7 @@ import (
 	"unicode/utf16"
 	"unsafe"
 
-	"github.com/keybase/kbfs/dokan/winacl"
+	"github.com/keybase/client/go/kbfs/dokan/winacl"
 	"golang.org/x/sys/windows"
 )
 

go/kbfs/dokan/dokan.go

@@ -5,7 +5,7 @@
 package dokan
 
 import (
-	"github.com/keybase/kbfs/dokan/winacl"
+	"github.com/keybase/client/go/kbfs/dokan/winacl"
 )
 
 // MountHandle holds a reference to a mounted filesystem.

go/kbfs/dokan/dummy.go

@@ -11,7 +11,7 @@ import "C"
 import (
 	"errors"
 
-	"github.com/keybase/kbfs/dokan/winacl"
+	"github.com/keybase/client/go/kbfs/dokan/winacl"
 )
 
 var errNotWindows = errors.New("dokan not supported outside Windows")

go/kbfs/dokan/error_file.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/keybase/kbfs/dokan/winacl"
+	"github.com/keybase/client/go/kbfs/dokan/winacl"
 )
 
 type errorFile struct {

go/kbfs/dokan/filesystem.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/keybase/kbfs/dokan/winacl"
+	"github.com/keybase/client/go/kbfs/dokan/winacl"
 )
 
 // Config is the configuration used for a mount.

go/kbfs/dokan/testfs_test.go

@@ -18,8 +18,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/keybase/kbfs/dokan/winacl"
-	"github.com/keybase/kbfs/ioutil"
+	"github.com/keybase/client/go/kbfs/dokan/winacl"
+	"github.com/keybase/client/go/kbfs/ioutil"
 	"golang.org/x/sys/windows"
 )
 

go/kbfs/fsrpc/fs.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/keybase/client/go/logger"
 	"github.com/keybase/client/go/protocol/keybase1"
-	"github.com/keybase/kbfs/libkbfs"
+	"github.com/keybase/client/go/kbfs/libkbfs"
 	"golang.org/x/net/context"
 )
 

go/kbfs/fsrpc/path.go

@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/keybase/kbfs/libkbfs"
-	"github.com/keybase/kbfs/tlf"
+	"github.com/keybase/client/go/kbfs/libkbfs"
+	"github.com/keybase/client/go/kbfs/tlf"
 	"github.com/pkg/errors"
 	"golang.org/x/net/context"
 )

go/kbfs/kbfsblock/context.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 
 	"github.com/keybase/client/go/protocol/keybase1"
-	"github.com/keybase/kbfs/kbfscrypto"
+	"github.com/keybase/client/go/kbfs/kbfscrypto"
 )
 
 // RefNonce is a 64-bit unique sequence of bytes for identifying this

go/kbfs/kbfsblock/id.go

@@ -10,8 +10,8 @@ import (
 	"errors"
 	"math"
 
-	"github.com/keybase/kbfs/kbfscrypto"
-	"github.com/keybase/kbfs/kbfshash"
+	"github.com/keybase/client/go/kbfs/kbfscrypto"
+	"github.com/keybase/client/go/kbfs/kbfshash"
 )
 
 // ID is the (usually content-based) ID for a data block.

go/kbfs/kbfsblock/id_test.go

@@ -9,8 +9,8 @@ import (
 	"math"
 	"testing"
 
-	"github.com/keybase/kbfs/kbfscodec"
-	"github.com/keybase/kbfs/kbfshash"
+	"github.com/keybase/client/go/kbfs/kbfscodec"
+	"github.com/keybase/client/go/kbfs/kbfshash"
 	"github.com/stretchr/testify/require"
 )
 

go/kbfs/kbfsblock/protocol_utils.go

@@ -11,9 +11,9 @@ import (
 	"github.com/keybase/backoff"
 	"github.com/keybase/client/go/logger"
 	"github.com/keybase/client/go/protocol/keybase1"
-	"github.com/keybase/kbfs/kbfscodec"
-	"github.com/keybase/kbfs/kbfscrypto"
-	"github.com/keybase/kbfs/tlf"
+	"github.com/keybase/client/go/kbfs/kbfscodec"
+	"github.com/keybase/client/go/kbfs/kbfscrypto"
+	"github.com/keybase/client/go/kbfs/tlf"
 )
 
 func makeIDCombo(id ID, context Context) keybase1.BlockIdCombo {

go/kbfs/kbfsblock/quota.go

@@ -4,7 +4,7 @@
 
 package kbfsblock
 
-import "github.com/keybase/kbfs/kbfscodec"
+import "github.com/keybase/client/go/kbfs/kbfscodec"
 
 // UsageType indicates the type of usage that quota manager is keeping stats of
 type UsageType int

go/kbfs/kbfscodec/codec.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"reflect"
 
-	"github.com/keybase/kbfs/ioutil"
+	"github.com/keybase/client/go/kbfs/ioutil"
 )
 
 // ExtCode is used to register codec extensions

go/kbfs/kbfscrypto/crypto_key_types.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/keybase/client/go/libkb"
 	"github.com/keybase/client/go/protocol/keybase1"
-	"github.com/keybase/kbfs/kbfshash"
+	"github.com/keybase/client/go/kbfs/kbfshash"
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/nacl/box"
 )

go/kbfs/kbfscrypto/crypto_key_types_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/keybase/client/go/protocol/keybase1"
-	"github.com/keybase/kbfs/kbfscodec"
+	"github.com/keybase/client/go/kbfs/kbfscodec"
 	"github.com/stretchr/testify/require"
 )
 

go/kbfs/kbfscrypto/encrypted_data.go

@@ -11,9 +11,9 @@ import (
 	"reflect"
 
 	"github.com/keybase/client/go/libkb"
-	"github.com/keybase/kbfs/cache"
-	"github.com/keybase/kbfs/kbfscodec"
-	"github.com/keybase/kbfs/kbfshash"
+	"github.com/keybase/client/go/kbfs/cache"
+	"github.com/keybase/client/go/kbfs/kbfscodec"
+	"github.com/keybase/client/go/kbfs/kbfshash"
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/nacl/box"
 	"golang.org/x/crypto/nacl/secretbox"

go/kbfs/kbfsdokan/main.go

@@ -12,11 +12,11 @@ import (
 	"os"
 
 	"github.com/keybase/client/go/libkb"
-	"github.com/keybase/kbfs/dokan"
-	"github.com/keybase/kbfs/env"
-	"github.com/keybase/kbfs/libdokan"
-	"github.com/keybase/kbfs/libfs"
-	"github.com/keybase/kbfs/libkbfs"
+	"github.com/keybase/client/go/kbfs/dokan"
+	"github.com/keybase/client/go/kbfs/env"
+	"github.com/keybase/client/go/kbfs/libdokan"
+	"github.com/keybase/client/go/kbfs/libfs"
+	"github.com/keybase/client/go/kbfs/libkbfs"
 )
 
 var runtimeDir = flag.String("runtime-dir", os.Getenv("KEYBASE_RUNTIME_DIR"), "runtime directory")

go/kbfs/kbfsedits/data_types.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/keybase/client/go/protocol/chat1"
 	"github.com/keybase/client/go/protocol/keybase1"
-	"github.com/keybase/kbfs/kbfscrypto"
-	"github.com/keybase/kbfs/kbfsmd"
-	"github.com/keybase/kbfs/tlf"
+	"github.com/keybase/client/go/kbfs/kbfscrypto"
+	"github.com/keybase/client/go/kbfs/kbfsmd"
+	"github.com/keybase/client/go/kbfs/tlf"
 )
 
 // NotificationVersion is the numeric version of the edit notification

go/kbfs/kbfsedits/tlf_history.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/keybase/kbfs/kbfsmd"
+	"github.com/keybase/client/go/kbfs/kbfsmd"
 )
 
 const (

go/kbfs/kbfsedits/tlf_history_test.go

@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/keybase/client/go/protocol/keybase1"
-	"github.com/keybase/kbfs/kbfsmd"
-	"github.com/keybase/kbfs/tlf"
+	"github.com/keybase/client/go/kbfs/kbfsmd"
+	"github.com/keybase/client/go/kbfs/tlf"
 	"github.com/stretchr/testify/require"
 )
 

go/kbfs/kbfsedits/user_history.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 
 	"github.com/keybase/client/go/protocol/keybase1"
-	"github.com/keybase/kbfs/tlf"
+	"github.com/keybase/client/go/kbfs/tlf"
 )
 
 const (

go/kbfs/kbfsedits/user_history_test.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/keybase/client/go/protocol/keybase1"
-	"github.com/keybase/kbfs/tlf"
+	"github.com/keybase/client/go/kbfs/tlf"
 	"github.com/stretchr/testify/require"
 )
 

go/kbfs/kbfsfuse/main.go

@@ -14,10 +14,10 @@ import (
 	"bazil.org/fuse"
 
 	"github.com/keybase/client/go/logger"
-	"github.com/keybase/kbfs/env"
-	"github.com/keybase/kbfs/libfs"
-	"github.com/keybase/kbfs/libfuse"
-	"github.com/keybase/kbfs/libkbfs"
+	"github.com/keybase/client/go/kbfs/env"
+	"github.com/keybase/client/go/kbfs/libfs"
+	"github.com/keybase/client/go/kbfs/libfuse"
+	"github.com/keybase/client/go/kbfs/libkbfs"
 )
 
 var runtimeDir = flag.String("runtime-dir", os.Getenv("KEYBASE_RUNTIME_DIR"), "runtime directory")

go/kbfs/kbfsgit/git-remote-keybase/main.go

@@ -15,12 +15,12 @@ import (
 
 	"github.com/keybase/client/go/kbconst"
 	"github.com/keybase/client/go/libkb"
-	"github.com/keybase/kbfs/env"
-	"github.com/keybase/kbfs/kbfsgit"
-	"github.com/keybase/kbfs/libfs"
-	"github.com/keybase/kbfs/libgit"
-	"github.com/keybase/kbfs/libkbfs"
-	"github.com/keybase/kbfs/stderrutils"
+	"github.com/keybase/client/go/kbfs/env"
+	"github.com/keybase/client/go/kbfs/kbfsgit"
+	"github.com/keybase/client/go/kbfs/libfs"
+	"github.com/keybase/client/go/kbfs/libgit"
+	"github.com/keybase/client/go/kbfs/libkbfs"
+	"github.com/keybase/client/go/kbfs/stderrutils"
 )
 
 var version = flag.Bool("version", false, "Print version")