X t/ -> go/

t/neo/cmd/neostorage-go/neostorage.go → go/neo/cmd/neostorage-go/neostorage.go

@@ -14,8 +14,8 @@ import (
 	//_ "../../storage"	// XXX rel ok?
 	neo "../.."
 
-	zodb "../../zodb"
-	_ "../../zodb/wks"
+	zodb "../../../zodb"
+	_ "../../../zodb/wks"
 )
 
 

t/neo/marshal.go → go/neo/marshal.go

@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"sort"
 
-	"./zodb"
+	"../zodb"
 )
 
 // packets marshalling

t/neo/neo.go → go/neo/neo.go

@@ -5,7 +5,7 @@
 package neo
 
 import (
-	"./zodb"
+	"../zodb"
 )
 
 const (

t/neo/proto.go → go/neo/proto.go

@@ -6,7 +6,7 @@ package neo
 
 // XXX move imports out of here
 import (
-	"./zodb"
+	"../zodb"
 
 	"encoding/binary"
 	"errors"

t/neo/proto_test.go → go/neo/proto_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 	"unsafe"
 
-	"./zodb"
+	"../zodb"
 )
 
 // decode string as hex; panic on error

t/neo/protogen.go → go/neo/protogen.go

@@ -105,7 +105,7 @@ type localImporter struct {
 }
 
 func (li *localImporter) Import(path string) (*types.Package, error) {
-	xpath := strings.TrimPrefix(path, "./") // ./zodb -> zodb
+	xpath := strings.TrimPrefix(path, "../") // ../zodb -> zodb
 	pkg := pkgMap[xpath]
 	if pkg != nil {
 		return pkg, nil
@@ -146,7 +146,7 @@ func main() {
 	log.SetFlags(0)
 
 	// go through proto.go and AST'ify & typecheck it
-	loadPkg("zodb", "zodb/zodb.go")
+	loadPkg("zodb", "../zodb/zodb.go")
 	loadPkg("neo", "proto.go", "neo.go")
 	neoQualifier = types.RelativeTo(pkgMap["neo"])
 
@@ -161,7 +161,7 @@ import (
 	"reflect"
 	"sort"
 
-	"./zodb"
+	"../zodb"
 )`)
 
 	pktTypeRegistry := map[int]string{} // pktCode -> typename

t/neo/storage.go → go/neo/storage.go

@@ -19,7 +19,7 @@ import (
 	"context"
 	"fmt"
 
-	"./zodb"
+	"../zodb"
 )
 
 // NEO Storage application

t/neo/zodb/cmd/zodb/zodb.go → go/zodb/cmd/zodb/zodb.go

@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"os"
 
-	"../../zodbtools"
+	"../../../zodb/zodbtools"
 
 	_ "../../../zodb/wks"
 )

t/neo/storage/fs1/cmd/fstail/fstail.go → go/zodb/storage/fs1/cmd/fstail/fstail.go

@@ -29,9 +29,9 @@ import (
 	"log"
 	"os"
 
-	"../../../../storage/fs1"
+	"../../../../../zodb/storage/fs1"
 
-	"../../../../xcommon/xbufio"
+	"../../../../../xcommon/xbufio"
 
 	"lab.nexedi.com/kirr/go123/xbytes"
 	"lab.nexedi.com/kirr/go123/xfmt"

t/neo/storage/fs1/filestorage.go → go/zodb/storage/fs1/filestorage.go

@@ -22,8 +22,8 @@ import (
 	"io"
 	"os"
 
-	"../../zodb"
-	"../../xcommon/xbufio"
+	"../../../zodb"
+	"../../../xcommon/xbufio"
 
 	"lab.nexedi.com/kirr/go123/xbytes"
 )

t/neo/storage/fs1/filestorage_test.go → go/zodb/storage/fs1/filestorage_test.go

@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	"../../zodb"
+	"../../../zodb"
 
 	"lab.nexedi.com/kirr/go123/exc"
 )

t/neo/storage/fs1/fsb/cmp.go → go/zodb/storage/fs1/fsb/cmp.go

 package fsb
 
-import "../../../zodb"
+import "../../../../zodb"
 
 // comparison function for fsbTree
 // kept short & inlineable

t/neo/storage/fs1/fsb/fsbtree.go → go/zodb/storage/fs1/fsb/fsbtree.go

@@ -8,7 +8,7 @@
 
 package fsb
 
-import "../../../zodb"
+import "../../../../zodb"
 
 import (
 	"fmt"

t/neo/storage/fs1/fsb/gen-fsbtree → 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 "../../../../zodb"'	\
 	-e 's/package b/package fsb/g'	\
 	-e "s/KEY/$KEY/g"	\
 	-e "s/VALUE/$VALUE/g"	\

t/neo/storage/fs1/index.go → go/zodb/storage/fs1/index.go

@@ -25,15 +25,15 @@ import (
 	"os"
 	"strconv"
 
-	"../../zodb"
+	"../../../zodb"
 	"./fsb"
 
 	pickle "github.com/kisielk/og-rek"
 
 	"lab.nexedi.com/kirr/go123/mem"
 
-	"../../xcommon/xbufio"
-	"../../xcommon/xio"
+	"../../../xcommon/xbufio"
+	"../../../xcommon/xio"
 )
 
 // fsIndex is Oid -> Data record position mapping used to associate Oid with

t/neo/storage/fs1/index_test.go → go/zodb/storage/fs1/index_test.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 	"testing"
 
-	"../../zodb"
+	"../../../zodb"
 	"./fsb"
 )
 

t/neo/storage/fs1/py/gen-testdata → go/zodb/storage/fs1/py/gen-testdata

@@ -182,7 +182,7 @@ def main():
             print >>f, v
         emit("// DO NOT EDIT - AUTOGENERATED (by py/gen-testdata)")
         emit("package fs1\n")
-        emit("import \"../../zodb\"\n")
+        emit("import \"../../../zodb\"\n")
 
         # index
         emit("const _1fs_indexTopPos = %i" % stor._pos)

t/neo/storage/fs1/testdata_expect_test.go → go/zodb/storage/fs1/testdata_expect_test.go

 // DO NOT EDIT - AUTOGENERATED (by py/gen-testdata)
 package fs1
 
-import "../../zodb"
+import "../../../zodb"
 
 const _1fs_indexTopPos = 12226
 var _1fs_indexEntryv = [...]indexEntry{

t/neo/storage/fs1/url.go → go/zodb/storage/fs1/url.go

@@ -21,7 +21,7 @@ package fs1
 import (
 	"net/url"
 
-	"../../zodb"
+	"../../../zodb"
 )
 
 // TODO read-only support

t/neo/zodb/wks/wks.go → go/zodb/wks/wks.go

@@ -25,5 +25,5 @@
 package wks
 
 import (
-	_ "../../storage/fs1"
+	_ "../../zodb/storage/fs1"
 )

t/neo/zodb/zodbtools/dump_test.go → go/zodb/zodbtools/dump_test.go

@@ -25,7 +25,7 @@ import (
 	"regexp"
 	"testing"
 
-	"../../storage/fs1"
+	"../../zodb/storage/fs1"
 	"../../zodb"
 
 	"github.com/sergi/go-diff/diffmatchpatch"
@@ -72,7 +72,7 @@ func loadZdumpPy(t *testing.T, path string) string {
 
 func withTestdata1Fs(t testing.TB, f func(fs *fs1.FileStorage)) {
 	// XXX -> zodb.OpenURL
-	fs, err := fs1.Open("../../storage/fs1/testdata/1.fs")	// XXX read-only, path?
+	fs, err := fs1.Open("../../zodb/storage/fs1/testdata/1.fs")	// XXX read-only, path?
 	if err != nil {
 		t.Fatal(err)
 	}