Move top level packages to internal.

build.go

@@ -233,11 +233,11 @@ func setBuildEnv() {
 }
 
 func assets() {
-	runPipe("auto/gui.files.go", "godep", "go", "run", "cmd/genassets/main.go", "gui")
+	runPipe("internal/auto/gui.files.go", "godep", "go", "run", "cmd/genassets/main.go", "gui")
 }
 
 func xdr() {
-	for _, f := range []string{"discover/packets", "files/leveldb", "protocol/message"} {
+	for _, f := range []string{"internal/discover/packets", "internal/files/leveldb", "internal/protocol/message"} {
 		runPipe(f+"_xdr.go", "go", "run", "./Godeps/_workspace/src/github.com/calmh/xdr/cmd/genxdr/main.go", "--", f+".go")
 	}
 }

cmd/stindex/main.go

@@ -10,8 +10,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/syncthing/syncthing/files"
+	"github.com/syncthing/syncthing/internal/files"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

cmd/syncthing/gui.go

@@ -21,13 +21,13 @@ import (
 	"time"
 
 	"code.google.com/p/go.crypto/bcrypt"
-	"github.com/syncthing/syncthing/auto"
+	"github.com/syncthing/syncthing/internal/auto"
-	"github.com/syncthing/syncthing/config"
+	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/events"
+	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
-	"github.com/syncthing/syncthing/model"
+	"github.com/syncthing/syncthing/internal/model"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
-	"github.com/syncthing/syncthing/upgrade"
+	"github.com/syncthing/syncthing/internal/upgrade"
 	"github.com/vitrun/qart/qr"
 )
 

cmd/syncthing/gui_auth.go

@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"code.google.com/p/go.crypto/bcrypt"
-	"github.com/syncthing/syncthing/config"
+	"github.com/syncthing/syncthing/internal/config"
 )
 
 var (

cmd/syncthing/gui_csrf.go

@@ -16,7 +16,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/syncthing/syncthing/osutil"
+	"github.com/syncthing/syncthing/internal/osutil"
 )
 
 var csrfTokens []string

cmd/syncthing/main.go

@@ -27,15 +27,15 @@ import (
 
 	"code.google.com/p/go.crypto/bcrypt"
 	"github.com/juju/ratelimit"
-	"github.com/syncthing/syncthing/config"
+	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/discover"
+	"github.com/syncthing/syncthing/internal/discover"
-	"github.com/syncthing/syncthing/events"
+	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/files"
+	"github.com/syncthing/syncthing/internal/files"
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
-	"github.com/syncthing/syncthing/model"
+	"github.com/syncthing/syncthing/internal/model"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
-	"github.com/syncthing/syncthing/upgrade"
+	"github.com/syncthing/syncthing/internal/upgrade"
-	"github.com/syncthing/syncthing/upnp"
+	"github.com/syncthing/syncthing/internal/upnp"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )

cmd/syncthing/usage_report.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/syncthing/syncthing/model"
+	"github.com/syncthing/syncthing/internal/model"
 )
 
 // Current version number of the usage report, for acceptance purposes. If

internal/auto/auto_test.go

@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/syncthing/syncthing/auto"
+	"github.com/syncthing/syncthing/internal/auto"
 )
 
 func TestAssets(t *testing.T) {

internal/beacon/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/config/config.go

@@ -14,10 +14,10 @@ import (
 	"strconv"
 
 	"code.google.com/p/go.crypto/bcrypt"
-	"github.com/syncthing/syncthing/events"
+	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
-	"github.com/syncthing/syncthing/osutil"
+	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 var l = logger.DefaultLogger

internal/config/config_test.go

@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 var node1, node2, node3, node4 protocol.NodeID

internal/discover/PROTOCOL.md

@@ -136,4 +136,3 @@ This is the XDR encoding of:
         unsigned int MagicNumber;
         string NodeID<>;
     }
-

internal/discover/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/discover/discover.go

@@ -14,9 +14,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/syncthing/syncthing/beacon"
+	"github.com/syncthing/syncthing/internal/beacon"
-	"github.com/syncthing/syncthing/events"
+	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 type Discoverer struct {

internal/events/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/events/events_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/syncthing/syncthing/events"
+	"github.com/syncthing/syncthing/internal/events"
 )
 
 var timeout = 100 * time.Millisecond

internal/files/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/files/leveldb.go

@@ -10,8 +10,8 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/syncthing/syncthing/lamport"
+	"github.com/syncthing/syncthing/internal/lamport"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/iterator"
 	"github.com/syndtr/goleveldb/leveldb/opt"
@@ -77,8 +77,8 @@ keyTypeNode (1 byte)
     repository (64 bytes)
         node (32 bytes)
             name (variable size)
-            	|
+		|
-            	scanner.File
+		scanner.File
 
 keyTypeGlobal (1 byte)
 	repository (64 bytes)

internal/files/set.go

@@ -13,8 +13,8 @@ package files
 import (
 	"sync"
 
-	"github.com/syncthing/syncthing/lamport"
+	"github.com/syncthing/syncthing/internal/lamport"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

internal/files/set_test.go

@@ -11,9 +11,9 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/syncthing/syncthing/files"
+	"github.com/syncthing/syncthing/internal/files"
-	"github.com/syncthing/syncthing/lamport"
+	"github.com/syncthing/syncthing/internal/lamport"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
 )

internal/ignore/ignore.go

@@ -13,7 +13,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/syncthing/syncthing/fnmatch"
+	"github.com/syncthing/syncthing/internal/fnmatch"
 )
 
 type Pattern struct {

internal/ignore/ignore_test.go

@@ -10,7 +10,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/syncthing/syncthing/ignore"
+	"github.com/syncthing/syncthing/internal/ignore"
 )
 
 func TestIgnore(t *testing.T) {

internal/luhn/luhn_test.go

@@ -7,7 +7,7 @@ package luhn_test
 import (
 	"testing"
 
-	"github.com/syncthing/syncthing/luhn"
+	"github.com/syncthing/syncthing/internal/luhn"
 )
 
 func TestGenerate(t *testing.T) {

internal/model/blockqueue.go

@@ -4,7 +4,7 @@
 
 package model
 
-import "github.com/syncthing/syncthing/protocol"
+import "github.com/syncthing/syncthing/internal/protocol"
 
 type bqAdd struct {
 	file protocol.FileInfo

internal/model/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/model/model.go

@@ -19,15 +19,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/syncthing/syncthing/config"
+	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/events"
+	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/files"
+	"github.com/syncthing/syncthing/internal/files"
-	"github.com/syncthing/syncthing/ignore"
+	"github.com/syncthing/syncthing/internal/ignore"
-	"github.com/syncthing/syncthing/lamport"
+	"github.com/syncthing/syncthing/internal/lamport"
-	"github.com/syncthing/syncthing/osutil"
+	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
-	"github.com/syncthing/syncthing/scanner"
+	"github.com/syncthing/syncthing/internal/scanner"
-	"github.com/syncthing/syncthing/stats"
+	"github.com/syncthing/syncthing/internal/stats"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

internal/model/model_test.go

@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/syncthing/syncthing/config"
+	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
 )

internal/model/puller.go

@@ -32,12 +32,12 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/syncthing/syncthing/config"
+	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/events"
+	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/osutil"
+	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
-	"github.com/syncthing/syncthing/scanner"
+	"github.com/syncthing/syncthing/internal/scanner"
-	"github.com/syncthing/syncthing/versioner"
+	"github.com/syncthing/syncthing/internal/versioner"
 )
 
 type requestResult struct {

internal/protocol/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/protocol/nodeid.go

@@ -13,7 +13,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/syncthing/syncthing/luhn"
+	"github.com/syncthing/syncthing/internal/luhn"
 )
 
 type NodeID [32]byte

internal/scanner/blockqueue.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"sync"
 
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 // The parallell hasher reads FileInfo structures from the inbox, hashes the

internal/scanner/blocks.go

@@ -9,7 +9,7 @@ import (
 	"crypto/sha256"
 	"io"
 
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 const StandardBlockSize = 128 * 1024

internal/scanner/blocks_test.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 var blocksTestData = []struct {

internal/scanner/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (