amorfo77/restic
1
0 Fork 0
mirror of https://github.com/restic/restic.git synced 2026-10-08 11:27:12 +00:00
Code Issues Projects Releases Wiki Activity

repository: extract LoadTree/SaveTree

Browse Source 
The repository has no real idea what a Tree is. So these methods never
belonged there.
This commit is contained in:
Michael Eischer committed 2022-07-17 13:11:28 +02:00
1 parent d9ea1e9ee2
commit fbcbd5318c
22 files changed
+150 -133
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/archiver/archiver.go
+2 -2
View File
@@ -218,7 +218,7 @@ func (arch *Archiver) loadSubtree(ctx context.Context, node *restic.Node) (*rest
return nil, nil
}
tree, err := arch.Repo.LoadTree(ctx, *node.Subtree)
tree, err := restic.LoadTree(ctx, arch.Repo, *node.Subtree)
if err != nil {
debug.Log("unable to load tree %v: %v", node.Subtree.Str(), err)
// a tree in the repository is not readable -> warn the user
@@ -762,7 +762,7 @@ func (arch *Archiver) loadParentTree(ctx context.Context, snapshotID restic.ID)
}
debug.Log("load parent tree %v", *sn.Tree)
tree, err := arch.Repo.LoadTree(ctx, *sn.Tree)
tree, err := restic.LoadTree(ctx, arch.Repo, *sn.Tree)
if err != nil {
debug.Log("unable to load tree %v: %v", *sn.Tree, err)
_ = arch.error("/", nil, arch.wrapLoadTreeError(*sn.Tree, err))
internal/archiver/archiver_test.go
+4 -4
View File
@@ -431,7 +431,7 @@ func (repo *blobCountingRepo) SaveBlob(ctx context.Context, t restic.BlobType, b
}
func (repo *blobCountingRepo) SaveTree(ctx context.Context, t *restic.Tree) (restic.ID, error) {
id, err := repo.Repository.SaveTree(ctx, t)
id, err := restic.SaveTree(ctx, repo.Repository, t)
h := restic.BlobHandle{ID: id, Type: restic.TreeBlob}
repo.m.Lock()
repo.saved[h]++
@@ -875,7 +875,7 @@ func TestArchiverSaveDir(t *testing.T) {
node.Name = targetNodeName
tree := &restic.Tree{Nodes: []*restic.Node{node}}
treeID, err := repo.SaveTree(ctx, tree)
treeID, err := restic.SaveTree(ctx, repo, tree)
if err != nil {
t.Fatal(err)
}
@@ -1123,7 +1123,7 @@ func TestArchiverSaveTree(t *testing.T) {
t.Fatal(err)
}
treeID, err := repo.SaveTree(ctx, tree)
treeID, err := restic.SaveTree(ctx, repo, tree)
if err != nil {
t.Fatal(err)
}
@@ -2076,7 +2076,7 @@ func snapshot(t testing.TB, repo restic.Repository, fs fs.FS, parent restic.ID,
t.Fatal(err)
}
tree, err := repo.LoadTree(ctx, *snapshot.Tree)
tree, err := restic.LoadTree(ctx, repo, *snapshot.Tree)
if err != nil {
t.Fatal(err)
}
internal/archiver/testing.go
+1 -1
View File
@@ -250,7 +250,7 @@ func TestEnsureFileContent(ctx context.Context, t testing.TB, repo restic.Reposi
func TestEnsureTree(ctx context.Context, t testing.TB, prefix string, repo restic.Repository, treeID restic.ID, dir TestDir) {
t.Helper()
tree, err := repo.LoadTree(ctx, treeID)
tree, err := restic.LoadTree(ctx, repo, treeID)
if err != nil {
t.Fatal(err)
return