Move restic package to internal/restic

internal/backend/b2/b2.go

@@ -6,11 +6,10 @@ import (
 	"path"
 	"strings"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/backend"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/kurin/blazer/b2"
 )

internal/backend/b2/b2_test.go

@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/backend/b2"
 	"github.com/restic/restic/internal/backend/test"
+	"github.com/restic/restic/internal/restic"
 
 	. "github.com/restic/restic/internal/test"
 )

internal/backend/layout.go

@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 	"regexp"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/fs"
+	"github.com/restic/restic/internal/restic"
 )
 
 // Layout computes paths for file name storage.

internal/backend/layout_default.go

@@ -3,7 +3,7 @@ package backend
 import (
 	"encoding/hex"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
 )
 
 // DefaultLayout implements the default layout for local and sftp backends, as

internal/backend/layout_rest.go

@@ -1,6 +1,6 @@
 package backend
 
-import "github.com/restic/restic/internal"
+import "github.com/restic/restic/internal/restic"
 
 // RESTLayout implements the default layout for the REST protocol.
 type RESTLayout struct {

internal/backend/layout_s3legacy.go

@@ -1,6 +1,6 @@
 package backend
 
-import "github.com/restic/restic/internal"
+import "github.com/restic/restic/internal/restic"
 
 // S3LegacyLayout implements the old layout used for s3 cloud storage backends, as
 // described in the Design document.

internal/backend/layout_test.go

@@ -8,7 +8,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 )
 

internal/backend/local/layout_test.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 )
 

internal/backend/local/local.go

@@ -6,9 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/backend"
 	"github.com/restic/restic/internal/debug"

internal/backend/local/local_test.go

@@ -4,10 +4,9 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/backend/local"
 	"github.com/restic/restic/internal/backend/test"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 )
 

internal/backend/mem/mem_backend.go

@@ -7,9 +7,8 @@ import (
 	"io/ioutil"
 	"sync"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/debug"
 )

internal/backend/mem/mem_backend_test.go

@@ -4,9 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/backend/mem"
 	"github.com/restic/restic/internal/backend/test"

internal/backend/rest/rest.go

@@ -11,12 +11,11 @@ import (
 	"path"
 	"strings"
 
-	"github.com/restic/restic/internal"
-
 	"golang.org/x/net/context/ctxhttp"
 
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/backend"
 )

internal/backend/rest/rest_test.go

@@ -10,10 +10,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/backend/rest"
 	"github.com/restic/restic/internal/backend/test"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 )
 

internal/backend/s3/s3.go

@@ -10,10 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/backend"
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/minio/minio-go"
 	"github.com/minio/minio-go/pkg/credentials"

internal/backend/s3/s3_test.go

@@ -14,10 +14,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/backend/s3"
 	"github.com/restic/restic/internal/backend/test"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 )
 

internal/backend/sftp/layout_test.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/backend/sftp"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 )
 

internal/backend/sftp/sftp.go

@@ -11,9 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/backend"
 	"github.com/restic/restic/internal/debug"

internal/backend/sftp/sftp_test.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/backend/sftp"
 	"github.com/restic/restic/internal/backend/test"
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	. "github.com/restic/restic/internal/test"
 )

internal/backend/swift/swift.go

@@ -10,10 +10,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/backend"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/ncw/swift"
 )

internal/backend/swift/swift_test.go

@@ -7,9 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 
 	"github.com/restic/restic/internal/backend/swift"

internal/backend/test/benchmarks.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
 	"github.com/restic/restic/internal/test"
 )
 

internal/backend/test/suite.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
 	"github.com/restic/restic/internal/test"
 )
 

internal/backend/test/tests.go

@@ -14,8 +14,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/test"
 

internal/backend/test/tests_test.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/backend/mem"
 	"github.com/restic/restic/internal/backend/test"

internal/backend/utils.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
 )
 
 // LoadAll reads all data stored in the backend for the handle.

internal/backend/utils_test.go

@@ -6,10 +6,9 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/backend"
 	"github.com/restic/restic/internal/backend/mem"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 )