X stop using local imports -> lab.nexedi.com/kirr/neo/go/*

da44885f · Kirill Smelkov · bbbf9091 · da44885f · da44885f · da44885f
Commit da44885f authored Jun 19, 2017 by Kirill Smelkov
27 changed files
--- a/go/neo/client/client.go
+++ b/go/neo/client/client.go
@@ -22,9 +22,9 @@ import (
 	"context"
 	"net/url"

-	"../../neo"
-	"../../zodb"
-	"../../xcommon/xnet"
+	"lab.nexedi.com/kirr/neo/go/neo"
+	"lab.nexedi.com/kirr/neo/go/zodb"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xnet"
 )

 // Client talks to NEO cluster and exposes access it via ZODB interfaces

--- a/go/neo/cmd/neo/neo.go
+++ b/go/neo/cmd/neo/neo.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"os"

-	"../../../neo/neotools"
+	"lab.nexedi.com/kirr/neo/go/neo/neotools"
 )

 func usage() {

--- a/go/neo/connection.go
+++ b/go/neo/connection.go
@@ -29,7 +29,7 @@ import (
 	"sync"
 	"sync/atomic"

-	"../xcommon/xnet"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xnet"
 )

 // NodeLink is a node-node link in NEO

--- a/go/neo/neo.go
+++ b/go/neo/neo.go
@@ -23,7 +23,7 @@
 package neo

 import (
-	"../zodb"
+	"lab.nexedi.com/kirr/neo/go/zodb"
 )

 const (

--- a/go/neo/neotools/command.go
+++ b/go/neo/neotools/command.go
@@ -18,7 +18,7 @@
 package neotools
 // registry of all commands & help topics

-import "../../zodb/zodbtools"
+import "lab.nexedi.com/kirr/neo/go/zodb/zodbtools"

 var Commands = zodbtools.CommandRegistry{
 	{"master",  masterSummary,  masterUsage,  masterMain},

--- a/go/neo/neotools/master.go
+++ b/go/neo/neotools/master.go
@@ -26,8 +26,8 @@ import (
 	"io"
 	"os"

-	"../../neo/server"
-	"../../xcommon/xnet"
+	"lab.nexedi.com/kirr/neo/go/neo/server"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xnet"
 )

 const masterSummary = "run master node"

--- a/go/neo/neotools/storage.go
+++ b/go/neo/neotools/storage.go
@@ -27,9 +27,9 @@ import (
 	"os"
 	"strings"

-	"../../neo/server"
-	"../../zodb/storage/fs1"
-	"../../xcommon/xnet"
+	"lab.nexedi.com/kirr/neo/go/neo/server"
+	"lab.nexedi.com/kirr/neo/go/zodb/storage/fs1"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xnet"
 )

 const storageSummary = "run storage node"

--- a/go/neo/protogen.go
+++ b/go/neo/protogen.go
@@ -166,7 +166,7 @@ import (
 	"reflect"
 	"sort"

-	"../zodb"
+	"lab.nexedi.com/kirr/neo/go/zodb"
 )`)

 	msgTypeRegistry := map[int]string{} // msgCode -> typename

--- a/go/neo/server/master.go
+++ b/go/neo/server/master.go
@@ -26,9 +26,9 @@ import (
 	"math"
 	"sync"

-	"../../neo"
-	"../../zodb"
-	"../../xcommon/xnet"
+	"lab.nexedi.com/kirr/neo/go/neo"
+	"lab.nexedi.com/kirr/neo/go/zodb"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xnet"

 	"lab.nexedi.com/kirr/go123/xerr"
 )

--- a/go/neo/server/server.go
+++ b/go/neo/server/server.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"net"

-	"../../neo"
+	"lab.nexedi.com/kirr/neo/go/neo"

 	"lab.nexedi.com/kirr/go123/xerr"
 )

--- a/go/neo/server/storage.go
+++ b/go/neo/server/storage.go
@@ -24,9 +24,9 @@ import (
 	"sync"
 	"time"

-	"../../neo"
-	"../../zodb"
-	"../../xcommon/xnet"
+	"lab.nexedi.com/kirr/neo/go/neo"
+	"lab.nexedi.com/kirr/neo/go/zodb"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xnet"
 )

 // XXX fmt -> log

--- a/go/neo/server/trace.go
+++ b/go/neo/server/trace.go
@@ -19,8 +19,8 @@ package server
 // tracepoints

 import (
-	"../../neo"
-	"../../xcommon/tracing"
+	"lab.nexedi.com/kirr/neo/go/neo"
+	"lab.nexedi.com/kirr/neo/go/xcommon/tracing"

 	_ "unsafe"
 )

--- a/go/neo/trace.go
+++ b/go/neo/trace.go
@@ -21,7 +21,7 @@ package neo
 import (
 	"unsafe"

-	"../xcommon/tracing"
+	"lab.nexedi.com/kirr/neo/go/xcommon/tracing"
 )

 // XXX put under 'build +tracedef'

--- a/go/xcommon/xbufio/xbufio.go
+++ b/go/xcommon/xbufio/xbufio.go
@@ -22,7 +22,7 @@ import (
 	"bufio"
 	"io"

-	"../xio"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xio"
 )

 // Reader is a bufio.Reader + bell & whistles

--- a/go/xcommon/xnet/pipenet/pipenet.go
+++ b/go/xcommon/xnet/pipenet/pipenet.go
@@ -43,7 +43,7 @@ import (
 	"strconv"
 	"sync"

-	"../../../xcommon/xnet"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xnet"
 )

 const NetPrefix = "pipe" // pipenet package creates only "pipe*" networks

--- a/go/zodb/cmd/zodb/zodb.go
+++ b/go/zodb/cmd/zodb/zodb.go
@@ -23,9 +23,9 @@ import (
 	"fmt"
 	"os"

-	"../../../zodb/zodbtools"
+	"lab.nexedi.com/kirr/neo/go/zodb/zodbtools"

-	_ "../../../zodb/wks"
+	_ "lab.nexedi.com/kirr/neo/go/zodb/wks"
 )

 func usage() {

--- a/go/zodb/storage/fs1/cmd/fstail/fstail.go
+++ b/go/zodb/storage/fs1/cmd/fstail/fstail.go
@@ -34,9 +34,9 @@ import (
 	"log"
 	"os"

-	"../../../../../zodb/storage/fs1"
+	"lab.nexedi.com/kirr/neo/go/zodb/storage/fs1"

-	"../../../../../xcommon/xbufio"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xbufio"

 	"lab.nexedi.com/kirr/go123/xbytes"
 	"lab.nexedi.com/kirr/go123/xfmt"

--- a/go/zodb/storage/fs1/filestorage.go
+++ b/go/zodb/storage/fs1/filestorage.go
@@ -28,8 +28,8 @@ import (
 	"io"
 	"os"

-	"../../../zodb"
-	"../../../xcommon/xbufio"
+	"lab.nexedi.com/kirr/neo/go/zodb"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xbufio"

 	"lab.nexedi.com/kirr/go123/xbytes"
 )

--- a/go/zodb/storage/fs1/fsb/fsb.go
+++ b/go/zodb/storage/fs1/fsb/fsb.go
@@ -4,7 +4,7 @@ package fsb

 //go:generate ./gen-fsbtree

-import "../../../../zodb"
+import "lab.nexedi.com/kirr/neo/go/zodb"

 // comparison function for fsbTree
 // kept short & inlineable

--- a/go/zodb/storage/fs1/fsb/fsbtree.go
+++ b/go/zodb/storage/fs1/fsb/fsbtree.go
@@ -8,7 +8,7 @@

 package fsb

-import "../../../../zodb"
+import "lab.nexedi.com/kirr/neo/go/zodb"

 import (
 	"fmt"

--- a/go/zodb/storage/fs1/fsb/gen-fsbtree
+++ b/go/zodb/storage/fs1/fsb/gen-fsbtree
@@ -19,7 +19,7 @@ echo "// KEY=$KEY  VALUE=$VALUE" >>$out
 echo "// ---- 8< ----" >>$out
 echo >>$out
 make -s -C $Bdir generic |sed	\
-	-e '/package b/a \\nimport "../../../../zodb"'	\
+	-e '/package b/a \\nimport "lab.nexedi.com/kirr/neo/go/zodb"'	\
 	-e 's/package b/package fsb/g'	\
 	-e "s/KEY/$KEY/g"	\
 	-e "s/VALUE/$VALUE/g"	\

--- a/go/zodb/storage/fs1/index.go
+++ b/go/zodb/storage/fs1/index.go
@@ -30,15 +30,15 @@ import (
 	"os"
 	"strconv"

-	"../../../zodb"
-	"./fsb"
+	"lab.nexedi.com/kirr/neo/go/zodb"
+	"lab.nexedi.com/kirr/neo/go/zodb/storage/fs1/fsb"

 	pickle "github.com/kisielk/og-rek"

 	"lab.nexedi.com/kirr/go123/mem"

-	"../../../xcommon/xbufio"
-	"../../../xcommon/xio"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xbufio"
+	"lab.nexedi.com/kirr/neo/go/xcommon/xio"
 )

 // fsIndex is Oid -> Data record position mapping used to associate Oid with

--- a/go/zodb/storage/fs1/url.go
+++ b/go/zodb/storage/fs1/url.go
@@ -22,7 +22,7 @@ import (
 	"context"
 	"net/url"

-	"../../../zodb"
+	"lab.nexedi.com/kirr/neo/go/zodb"
 )

 // TODO read-only support

--- a/go/zodb/wks/wks.go
+++ b/go/zodb/wks/wks.go
@@ -25,7 +25,7 @@
 package wks

 import (
-	_ "../../zodb/storage/mem"
-	_ "../../zodb/storage/fs1"
-	_ "../../neo/client"
+	_ "lab.nexedi.com/kirr/neo/go/zodb/storage/mem"
+	_ "lab.nexedi.com/kirr/neo/go/zodb/storage/fs1"
+	_ "lab.nexedi.com/kirr/neo/go/neo/client"
 )
--- a/go/zodb/zodbtools/catobj.go
+++ b/go/zodb/zodbtools/catobj.go
@@ -26,7 +26,7 @@ import (
 	"log"
 	"os"

-	"../../zodb"
+	"lab.nexedi.com/kirr/neo/go/zodb"
 )



--- a/go/zodb/zodbtools/dump.go
+++ b/go/zodb/zodbtools/dump.go
@@ -47,7 +47,7 @@ import (

 	"lab.nexedi.com/kirr/go123/xfmt"

-	"../../zodb"
+	"lab.nexedi.com/kirr/neo/go/zodb"
 )



--- a/go/zodb/zodbtools/info.go
+++ b/go/zodb/zodbtools/info.go
@@ -27,7 +27,7 @@ import (
 	"log"
 	"os"

-	"../../zodb"
+	"lab.nexedi.com/kirr/neo/go/zodb"
 )

 // paramFunc is a function to retrieve 1 storage parameter