.

go/internal/README

+// internal/ is a staging place for common utilities not yet sorted out
+// to their proper homes.

go/xcommon/log/log.go → go/internal/log/log.go

@@ -29,7 +29,7 @@ import (
 
 	"github.com/golang/glog"
 
-	"lab.nexedi.com/kirr/neo/go/xcommon/xcontext/task"
+	"lab.nexedi.com/kirr/neo/go/internal/xcontext/task"
 )
 
 // withTask prepends string describing current operational task stack to argv and returns it

go/xcommon/task/task.go → go/internal/task/task.go

@@ -24,8 +24,8 @@ import (
         "context"
         "fmt"
 
-        taskctx "lab.nexedi.com/kirr/neo/go/xcommon/xcontext/task"
-        "lab.nexedi.com/kirr/neo/go/xcommon/log"
+        taskctx "lab.nexedi.com/kirr/neo/go/internal/xcontext/task"
+        "lab.nexedi.com/kirr/neo/go/internal/log"
 )
 
 // Running is syntactic sugar to push new task to operational stack, log it and

go/xcommon/xio/xio.go → go/internal/xio/xio.go

@@ -24,8 +24,8 @@ import (
 	"context"
 	"io"
 
-	"lab.nexedi.com/kirr/neo/go/xcommon/log"
-	"lab.nexedi.com/kirr/neo/go/xcommon/xcontext"
+	"lab.nexedi.com/kirr/neo/go/internal/log"
+	"lab.nexedi.com/kirr/neo/go/internal/xcontext"
 )
 
 // CloseWhenDone arranges for c to be closed either when ctx is cancelled or

go/neo/client.go

@@ -38,9 +38,9 @@ import (
 	"lab.nexedi.com/kirr/neo/go/neo/neonet"
 	"lab.nexedi.com/kirr/neo/go/neo/proto"
 	"lab.nexedi.com/kirr/neo/go/zodb"
-	"lab.nexedi.com/kirr/neo/go/xcommon/log"
-	"lab.nexedi.com/kirr/neo/go/xcommon/task"
-	"lab.nexedi.com/kirr/neo/go/xcommon/xio"
+	"lab.nexedi.com/kirr/neo/go/internal/log"
+	"lab.nexedi.com/kirr/neo/go/internal/task"
+	"lab.nexedi.com/kirr/neo/go/internal/xio"
 )
 
 // Client is NEO node that talks to NEO cluster and exposes access to it via ZODB interfaces.

go/neo/cmd/neo/misc.go

@@ -33,7 +33,7 @@ import (
 	"github.com/soheilhy/cmux"
 
 	"lab.nexedi.com/kirr/go123/xnet"
-	"lab.nexedi.com/kirr/neo/go/xcommon/log"
+	"lab.nexedi.com/kirr/neo/go/internal/log"
 
 
 	// for http://.../debug/pprof

go/neo/master.go

@@ -37,10 +37,10 @@ import (
 	"lab.nexedi.com/kirr/neo/go/neo/neonet"
 	"lab.nexedi.com/kirr/neo/go/neo/proto"
 	"lab.nexedi.com/kirr/neo/go/zodb"
-	"lab.nexedi.com/kirr/neo/go/xcommon/log"
-	"lab.nexedi.com/kirr/neo/go/xcommon/task"
-	"lab.nexedi.com/kirr/neo/go/xcommon/xcontext"
-	"lab.nexedi.com/kirr/neo/go/xcommon/xio"
+	"lab.nexedi.com/kirr/neo/go/internal/log"
+	"lab.nexedi.com/kirr/neo/go/internal/task"
+	"lab.nexedi.com/kirr/neo/go/internal/xcontext"
+	"lab.nexedi.com/kirr/neo/go/internal/xio"
 )
 
 // Master is a node overseeing and managing how whole NEO cluster works.

go/neo/neo.go

@@ -33,9 +33,9 @@ import (
 	"lab.nexedi.com/kirr/go123/xerr"
 	"lab.nexedi.com/kirr/go123/xnet"
 
-	"lab.nexedi.com/kirr/neo/go/xcommon/log"
-	"lab.nexedi.com/kirr/neo/go/xcommon/task"
-	//"lab.nexedi.com/kirr/neo/go/xcommon/xio"
+	"lab.nexedi.com/kirr/neo/go/internal/log"
+	"lab.nexedi.com/kirr/neo/go/internal/task"
+	//"lab.nexedi.com/kirr/neo/go/internal/xio"
 
 	"lab.nexedi.com/kirr/neo/go/neo/neonet"
 	"lab.nexedi.com/kirr/neo/go/neo/proto"

go/neo/neo_test.go

@@ -36,7 +36,7 @@ import (
 
 	"lab.nexedi.com/kirr/neo/go/zodb"
 
-	"lab.nexedi.com/kirr/neo/go/xcommon/xtracing/tracetest"
+	"lab.nexedi.com/kirr/neo/go/internal/xtracing/tracetest"
 
 	"lab.nexedi.com/kirr/go123/exc"
 	"lab.nexedi.com/kirr/go123/tracing"

go/neo/neonet/connection.go

@@ -57,7 +57,7 @@ import (
 	"time"
 
 	"lab.nexedi.com/kirr/neo/go/neo/proto"
-	"lab.nexedi.com/kirr/neo/go/xcommon/packed"
+	"lab.nexedi.com/kirr/neo/go/internal/packed"
 
 	"github.com/someonegg/gocontainer/rbuf"
 

go/neo/neonet/connection_test.go

@@ -34,7 +34,7 @@ import (
 	"lab.nexedi.com/kirr/go123/exc"
 	"lab.nexedi.com/kirr/go123/xerr"
 
-	"lab.nexedi.com/kirr/neo/go/xcommon/packed"
+	"lab.nexedi.com/kirr/neo/go/internal/packed"
 
 	"lab.nexedi.com/kirr/neo/go/zodb"
 	"lab.nexedi.com/kirr/neo/go/neo/proto"

go/neo/neonet/pkt.go

@@ -29,7 +29,7 @@ import (
 	"lab.nexedi.com/kirr/go123/xbytes"
 
 	"lab.nexedi.com/kirr/neo/go/neo/proto"
-	"lab.nexedi.com/kirr/neo/go/xcommon/packed"
+	"lab.nexedi.com/kirr/neo/go/internal/packed"
 )
 
 // pktBuf is a buffer with full raw packet (header + data).

go/neo/nodetab.go

@@ -30,8 +30,8 @@ import (
 	"lab.nexedi.com/kirr/neo/go/neo/neonet"
 	"lab.nexedi.com/kirr/neo/go/neo/proto"
 
-	"lab.nexedi.com/kirr/neo/go/xcommon/log"
-	"lab.nexedi.com/kirr/neo/go/xcommon/task"
+	"lab.nexedi.com/kirr/neo/go/internal/log"
+	"lab.nexedi.com/kirr/neo/go/internal/task"
 )
 
 // NodeTable represents known nodes in a cluster.

go/neo/proto/proto.go

@@ -70,7 +70,7 @@ import (
 	"lab.nexedi.com/kirr/neo/go/zodb"
 	"lab.nexedi.com/kirr/go123/mem"
 
-	"lab.nexedi.com/kirr/neo/go/xcommon/packed"
+	"lab.nexedi.com/kirr/neo/go/internal/packed"
 
 	"encoding/binary"
 	"errors"

go/neo/server.go

@@ -29,7 +29,7 @@ import (
 
 	"lab.nexedi.com/kirr/neo/go/neo/neonet"
 	"lab.nexedi.com/kirr/neo/go/neo/proto"
-	"lab.nexedi.com/kirr/neo/go/xcommon/log"
+	"lab.nexedi.com/kirr/neo/go/internal/log"
 
 	"lab.nexedi.com/kirr/go123/xerr"
 )

go/neo/storage.go

@@ -33,10 +33,10 @@ import (
 	"lab.nexedi.com/kirr/neo/go/neo/proto"
 	"lab.nexedi.com/kirr/neo/go/neo/storage"
 	"lab.nexedi.com/kirr/neo/go/zodb"
-	"lab.nexedi.com/kirr/neo/go/xcommon/log"
-	"lab.nexedi.com/kirr/neo/go/xcommon/task"
-	xxcontext "lab.nexedi.com/kirr/neo/go/xcommon/xcontext"
-	"lab.nexedi.com/kirr/neo/go/xcommon/xio"
+	"lab.nexedi.com/kirr/neo/go/internal/log"
+	"lab.nexedi.com/kirr/neo/go/internal/task"
+	xxcontext "lab.nexedi.com/kirr/neo/go/internal/xcontext"
+	"lab.nexedi.com/kirr/neo/go/internal/xio"
 
 	"lab.nexedi.com/kirr/go123/xcontext"
 	"lab.nexedi.com/kirr/go123/xerr"

go/neo/t/tzodb.go

@@ -42,8 +42,8 @@ import (
 
 	"lab.nexedi.com/kirr/go123/prog"
 	"lab.nexedi.com/kirr/go123/xerr"
-	"lab.nexedi.com/kirr/neo/go/xcommon/log"
-	"lab.nexedi.com/kirr/neo/go/xcommon/task"
+	"lab.nexedi.com/kirr/neo/go/internal/log"
+	"lab.nexedi.com/kirr/neo/go/internal/task"
 
 	"lab.nexedi.com/kirr/neo/go/zodb"
 	_ "lab.nexedi.com/kirr/neo/go/zodb/wks"

go/neo/t_cluster_test.go

@@ -29,7 +29,7 @@ import (
 	"lab.nexedi.com/kirr/go123/xnet"
 	"lab.nexedi.com/kirr/go123/xnet/pipenet"
 
-	"lab.nexedi.com/kirr/neo/go/xcommon/xtracing/tracetest"
+	"lab.nexedi.com/kirr/neo/go/internal/xtracing/tracetest"
 
 	"lab.nexedi.com/kirr/neo/go/neo/storage"
 	"lab.nexedi.com/kirr/neo/go/zodb"

go/neo/t_events_test.go

@@ -25,7 +25,7 @@ import (
 	"net"
 	"sync"
 
-	"lab.nexedi.com/kirr/neo/go/xcommon/xtracing/tracetest"
+	"lab.nexedi.com/kirr/neo/go/internal/xtracing/tracetest"
 
 	"lab.nexedi.com/kirr/neo/go/neo/proto"
 )

go/neo/util.go

@@ -24,7 +24,7 @@ import (
 	"io"
 
 	"lab.nexedi.com/kirr/neo/go/zodb"
-	"lab.nexedi.com/kirr/neo/go/xcommon/log"
+	"lab.nexedi.com/kirr/neo/go/internal/log"
 )
 
 // lclose closes c and logs closing error if there was any.

go/xcommon/xcommon.go

-// Copyright (C) 2017  Nexedi SA and Contributors.
-//                     Kirill Smelkov <kirr@nexedi.com>
-//
-// This program is free software: you can Use, Study, Modify and Redistribute
-// it under the terms of the GNU General Public License version 3, or (at your
-// option) any later version, as published by the Free Software Foundation.
-//
-// You can also Link and Combine this program with other software covered by
-// the terms of any of the Free Software licenses or any of the Open Source
-// Initiative approved licenses and Convey the resulting work. Corresponding
-// source of such a combination shall include the source code for all other
-// software used.
-//
-// This program is distributed WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//
-// See COPYING file for full licensing terms.
-// See https://www.nexedi.com/licensing for rationale and options.
-
-// Package xcommon is a staging place for common utilities not yet sorted out
-// to their proper homes.
-package xcommon