Move restic package to internal/restic

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"