From 5e0ea8fcfa2c762e56cd6846fe3f00a56945872f Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Fri, 24 May 2024 23:09:58 +0200 Subject: [PATCH] pack: move to repository package --- cmd/restic/cmd_debug.go | 2 +- internal/checker/checker.go | 2 +- internal/repository/check.go | 2 +- internal/{ => repository}/pack/doc.go | 0 internal/{ => repository}/pack/pack.go | 0 internal/{ => repository}/pack/pack_internal_test.go | 0 internal/{ => repository}/pack/pack_test.go | 2 +- internal/repository/packer_manager.go | 2 +- internal/repository/prune.go | 2 +- internal/repository/repair_index.go | 2 +- internal/repository/repository.go | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) rename internal/{ => repository}/pack/doc.go (100%) rename internal/{ => repository}/pack/pack.go (100%) rename internal/{ => repository}/pack/pack_internal_test.go (100%) rename internal/{ => repository}/pack/pack_test.go (98%) diff --git a/cmd/restic/cmd_debug.go b/cmd/restic/cmd_debug.go index ff1e4c28b..1a42995fd 100644 --- a/cmd/restic/cmd_debug.go +++ b/cmd/restic/cmd_debug.go @@ -22,9 +22,9 @@ import ( "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/errors" - "github.com/restic/restic/internal/pack" "github.com/restic/restic/internal/repository" "github.com/restic/restic/internal/repository/index" + "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" ) diff --git a/internal/checker/checker.go b/internal/checker/checker.go index fb6fbacd5..82348c7ea 100644 --- a/internal/checker/checker.go +++ b/internal/checker/checker.go @@ -12,9 +12,9 @@ import ( "github.com/restic/restic/internal/backend/s3" "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/errors" - "github.com/restic/restic/internal/pack" "github.com/restic/restic/internal/repository" "github.com/restic/restic/internal/repository/index" + "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/ui/progress" "golang.org/x/sync/errgroup" diff --git a/internal/repository/check.go b/internal/repository/check.go index f16cd7492..0bfc39084 100644 --- a/internal/repository/check.go +++ b/internal/repository/check.go @@ -14,7 +14,7 @@ import ( "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/errors" "github.com/restic/restic/internal/hashing" - "github.com/restic/restic/internal/pack" + "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" ) diff --git a/internal/pack/doc.go b/internal/repository/pack/doc.go similarity index 100% rename from internal/pack/doc.go rename to internal/repository/pack/doc.go diff --git a/internal/pack/pack.go b/internal/repository/pack/pack.go similarity index 100% rename from internal/pack/pack.go rename to internal/repository/pack/pack.go diff --git a/internal/pack/pack_internal_test.go b/internal/repository/pack/pack_internal_test.go similarity index 100% rename from internal/pack/pack_internal_test.go rename to internal/repository/pack/pack_internal_test.go diff --git a/internal/pack/pack_test.go b/internal/repository/pack/pack_test.go similarity index 98% rename from internal/pack/pack_test.go rename to internal/repository/pack/pack_test.go index 76ff5c127..5ac146348 100644 --- a/internal/pack/pack_test.go +++ b/internal/repository/pack/pack_test.go @@ -12,7 +12,7 @@ import ( "github.com/restic/restic/internal/backend" "github.com/restic/restic/internal/backend/mem" "github.com/restic/restic/internal/crypto" - "github.com/restic/restic/internal/pack" + "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" rtest "github.com/restic/restic/internal/test" ) diff --git a/internal/repository/packer_manager.go b/internal/repository/packer_manager.go index 76734fb87..8c7c0b9d5 100644 --- a/internal/repository/packer_manager.go +++ b/internal/repository/packer_manager.go @@ -16,7 +16,7 @@ import ( "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/fs" - "github.com/restic/restic/internal/pack" + "github.com/restic/restic/internal/repository/pack" "github.com/minio/sha256-simd" ) diff --git a/internal/repository/prune.go b/internal/repository/prune.go index 6f2182ac5..b8d3ba97b 100644 --- a/internal/repository/prune.go +++ b/internal/repository/prune.go @@ -7,8 +7,8 @@ import ( "sort" "github.com/restic/restic/internal/errors" - "github.com/restic/restic/internal/pack" "github.com/restic/restic/internal/repository/index" + "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/ui/progress" ) diff --git a/internal/repository/repair_index.go b/internal/repository/repair_index.go index 868b0a894..770809254 100644 --- a/internal/repository/repair_index.go +++ b/internal/repository/repair_index.go @@ -3,8 +3,8 @@ package repository import ( "context" - "github.com/restic/restic/internal/pack" "github.com/restic/restic/internal/repository/index" + "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/ui/progress" ) diff --git a/internal/repository/repository.go b/internal/repository/repository.go index 97fc0f506..f2c28cece 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -19,8 +19,8 @@ import ( "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/errors" - "github.com/restic/restic/internal/pack" "github.com/restic/restic/internal/repository/index" + "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/ui/progress"