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"