Merge pull request #1129 from restic/move-restic-pkg

Move restic package to internal/restic

cmd/restic/cmd_backup.go

@@ -10,8 +10,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/spf13/cobra"
 
 	"github.com/restic/restic/internal/archiver"
@@ -19,6 +17,7 @@ import (
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/filter"
 	"github.com/restic/restic/internal/fs"
+	"github.com/restic/restic/internal/restic"
 )
 
 var cmdBackup = &cobra.Command{

cmd/restic/cmd_cat.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/backend"
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 )
 
 var cmdCat = &cobra.Command{

cmd/restic/cmd_check.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/checker"
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 )
 
 var cmdCheck = &cobra.Command{

cmd/restic/cmd_dump.go

@@ -11,10 +11,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/pack"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/worker"
 )

cmd/restic/cmd_find.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 )
 
 var cmdFind = &cobra.Command{

cmd/restic/cmd_forget.go

@@ -6,8 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
-
 	"github.com/spf13/cobra"
 )
 

cmd/restic/cmd_key.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/spf13/cobra"
 )

cmd/restic/cmd_list.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/index"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/spf13/cobra"
 )

cmd/restic/cmd_ls.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 )
 
 var cmdLs = &cobra.Command{

cmd/restic/cmd_migrate.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/migrations"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/spf13/cobra"
 )

cmd/restic/cmd_mount.go

@@ -7,12 +7,11 @@ import (
 	"context"
 	"os"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/spf13/cobra"
 
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
 	resticfs "github.com/restic/restic/internal/fs"
 	"github.com/restic/restic/internal/fuse"

cmd/restic/cmd_prune.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/index"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/spf13/cobra"
 )

cmd/restic/cmd_rebuild_index.go

@@ -3,8 +3,8 @@ package main
 import (
 	"context"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/index"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/spf13/cobra"
 )

cmd/restic/cmd_restore.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/filter"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/spf13/cobra"
 )

cmd/restic/cmd_snapshots.go

@@ -7,9 +7,8 @@ import (
 	"io"
 	"sort"
 
+	"github.com/restic/restic/internal/restic"
 	"github.com/spf13/cobra"
-
-	"github.com/restic/restic/internal"
 )
 
 var cmdSnapshots = &cobra.Command{

cmd/restic/cmd_tag.go

@@ -5,10 +5,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 )
 
 var cmdTag = &cobra.Command{

cmd/restic/cmd_unlock.go

@@ -3,8 +3,7 @@ package main
 import (
 	"context"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
-
 	"github.com/spf13/cobra"
 )
 

cmd/restic/find.go

@@ -3,8 +3,8 @@ package main
 import (
 	"context"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 )
 
 // FindFilteredSnapshots yields Snapshots, either given explicitly by `snapshotIDs` or filtered from the list of all snapshots.

cmd/restic/format.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
 )
 
 func formatBytes(c uint64) string {

cmd/restic/global.go

@@ -10,8 +10,6 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/backend/b2"
 	"github.com/restic/restic/internal/backend/local"
 	"github.com/restic/restic/internal/backend/location"
@@ -22,6 +20,7 @@ import (
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/options"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/errors"
 

cmd/restic/integration_fuse_test.go

@@ -12,8 +12,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 )
 

cmd/restic/integration_test.go

@@ -17,9 +17,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/debug"
 	"github.com/restic/restic/internal/filter"

cmd/restic/lock.go

@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 )
 
 var globalLocks struct {

cmd/restic/main.go

@@ -8,9 +8,9 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/options"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/spf13/cobra"
 

internal/archiver/archive_reader.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"time"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/errors"
 

internal/archiver/archive_reader_test.go

@@ -8,9 +8,9 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/checker"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 )
 
 func loadBlob(t *testing.T, repo restic.Repository, id restic.ID, buf []byte) int {

internal/archiver/archiver.go

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

internal/archiver/archiver_duplication_test.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/archiver"
 	"github.com/restic/restic/internal/mock"
 	"github.com/restic/restic/internal/repository"

internal/archiver/archiver_test.go

@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/archiver"
 	"github.com/restic/restic/internal/checker"
 	"github.com/restic/restic/internal/crypto"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 
 	"github.com/restic/restic/internal/errors"

internal/archiver/testing.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
 )
 
 // TestSnapshot creates a new snapshot of path.

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"
 )
 

internal/checker/checker.go

@@ -11,8 +11,8 @@ import (
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/fs"
 	"github.com/restic/restic/internal/hashing"
+	"github.com/restic/restic/internal/restic"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/pack"
 	"github.com/restic/restic/internal/repository"

internal/checker/checker_test.go

@@ -8,10 +8,10 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/archiver"
 	"github.com/restic/restic/internal/checker"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 	"github.com/restic/restic/internal/test"
 )
 

internal/checker/testing.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
 )
 
 // TestCheckRepo runs the checker on repo.

internal/fuse/blob_size_cache.go

@@ -4,8 +4,7 @@
 package fuse
 
 import (
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
-
 	"golang.org/x/net/context"
 )
 

internal/fuse/dir.go

@@ -10,8 +10,8 @@ import (
 	"bazil.org/fuse/fs"
 	"golang.org/x/net/context"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
+	"github.com/restic/restic/internal/restic"
 )
 
 // Statically ensure that *dir implement those interface

internal/fuse/file.go

@@ -5,8 +5,8 @@ package fuse
 
 import (
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
 
 	"bazil.org/fuse"

internal/fuse/file_test.go

@@ -12,11 +12,11 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
 
-	"github.com/restic/restic/internal"
 	. "github.com/restic/restic/internal/test"
 )
 

internal/fuse/link.go

@@ -4,10 +4,9 @@
 package fuse
 
 import (
-	"github.com/restic/restic/internal"
-
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
+	"github.com/restic/restic/internal/restic"
 	"golang.org/x/net/context"
 )
 

internal/fuse/root.go

@@ -4,8 +4,8 @@
 package fuse
 
 import (
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
+	"github.com/restic/restic/internal/restic"
 
 	"golang.org/x/net/context"
 

internal/fuse/snapshots_dir.go

@@ -8,8 +8,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
+	"github.com/restic/restic/internal/restic"
 
 	"golang.org/x/net/context"
 

internal/index/index.go

@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/list"
 	"github.com/restic/restic/internal/pack"
+	"github.com/restic/restic/internal/restic"
 	"github.com/restic/restic/internal/worker"
 
 	"github.com/restic/restic/internal/errors"

internal/index/index_test.go

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

internal/list/list.go

@@ -3,7 +3,7 @@ package list
 import (
 	"context"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
 	"github.com/restic/restic/internal/worker"
 )
 

internal/migrations/interface.go

@@ -3,7 +3,7 @@ package migrations
 import (
 	"context"
 
-	"github.com/restic/restic/internal"
+	"github.com/restic/restic/internal/restic"
 )
 
 // Migration implements a data migration.

internal/migrations/s3_layout.go

@@ -6,11 +6,11 @@ import (
 	"os"
 	"path"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/backend"
 	"github.com/restic/restic/internal/backend/s3"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 )
 
 func init() {

internal/mock/backend.go

@@ -4,9 +4,8 @@ import (
 	"context"
 	"io"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 )
 
 // Backend implements a mock backend.

internal/mock/repository.go

@@ -1,8 +1,8 @@
 package mock
 
 import (
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/crypto"
+	"github.com/restic/restic/internal/restic"
 )
 
 // Repository implements a mock Repository.

internal/pack/pack.go

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

internal/pack/pack_test.go

@@ -10,11 +10,10 @@ import (
 	"io"
 	"testing"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/backend/mem"
 	"github.com/restic/restic/internal/crypto"
 	"github.com/restic/restic/internal/pack"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 )
 

internal/repository/index.go

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

internal/repository/index_test.go

@@ -4,9 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 	. "github.com/restic/restic/internal/test"
 )
 

internal/repository/key.go

@@ -9,9 +9,8 @@ import (
 	"os/user"
 	"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/crypto"

internal/repository/master_index.go

@@ -4,9 +4,8 @@ import (
 	"context"
 	"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/repository/packer_manager.go

@@ -7,10 +7,9 @@ import (
 	"os"
 	"sync"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/errors"
 	"github.com/restic/restic/internal/hashing"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/crypto"
 	"github.com/restic/restic/internal/debug"

internal/repository/packer_manager_test.go

@@ -7,11 +7,11 @@ import (
 	"os"
 	"testing"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/backend/mem"
 	"github.com/restic/restic/internal/crypto"
 	"github.com/restic/restic/internal/fs"
 	"github.com/restic/restic/internal/mock"
+	"github.com/restic/restic/internal/restic"
 )
 
 type randReader struct {

internal/repository/parallel.go

@@ -4,9 +4,8 @@ import (
 	"context"
 	"sync"
 
-	"github.com/restic/restic/internal"
-
 	"github.com/restic/restic/internal/debug"
+	"github.com/restic/restic/internal/restic"
 )
 
 // ParallelWorkFunc gets one file ID to work on. If an error is returned,

internal/repository/parallel_test.go

@@ -6,9 +6,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/repository"
 	. "github.com/restic/restic/internal/test"

internal/repository/repack.go

@@ -5,11 +5,11 @@ import (
 	"crypto/sha256"
 	"io"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/debug"
 	"github.com/restic/restic/internal/fs"
 	"github.com/restic/restic/internal/hashing"
 	"github.com/restic/restic/internal/pack"
+	"github.com/restic/restic/internal/restic"
 
 	"github.com/restic/restic/internal/errors"
 )

internal/repository/repack_test.go

@@ -6,9 +6,9 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/index"
 	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 )
 
 func randomSize(min, max int) int {

internal/repository/repository.go

@@ -7,9 +7,8 @@ import (
 	"fmt"
 	"os"
 
-	"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/crypto"

internal/repository/repository_test.go

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

internal/repository/testing.go

@@ -5,10 +5,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/restic/restic/internal"
 	"github.com/restic/restic/internal/backend/local"
 	"github.com/restic/restic/internal/backend/mem"
 	"github.com/restic/restic/internal/crypto"
+	"github.com/restic/restic/internal/restic"
 	"github.com/restic/restic/internal/test"
 
 	"github.com/restic/chunker"

internal/restic/config_test.go

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