From a8e1cc45efe4c80b84f185b257ae0254aee0af62 Mon Sep 17 00:00:00 2001 From: Olivier Date: Wed, 3 May 2023 21:03:33 +0100 Subject: [PATCH] CHECKPOINT overhaul 2 --- datman_cli_readme.txt | 12 ++++++++++++ docs.old/SUMMARY.md | 11 +++++++++++ {docs => docs.old}/datman/getting_started.md | 0 {docs => docs.old}/datman/index.md | 0 {docs => docs.old}/datman/remote_backups.md | 0 {docs => docs.old}/yama/getting_started.md | 0 {docs => docs.old}/yama/index.md | 0 {docs => docs.old}/yama/internals.md | 0 .../yama/internals/pointers-and-nodes.md | 0 {docs => docs.old}/yama/internals/raw-piles.md | 0 docs/SUMMARY.md | 11 ----------- docs/yama/zstd.md | 5 +++++ yama_pile/src/tree.rs | 2 +- 13 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 datman_cli_readme.txt create mode 100644 docs.old/SUMMARY.md rename {docs => docs.old}/datman/getting_started.md (100%) rename {docs => docs.old}/datman/index.md (100%) rename {docs => docs.old}/datman/remote_backups.md (100%) rename {docs => docs.old}/yama/getting_started.md (100%) rename {docs => docs.old}/yama/index.md (100%) rename {docs => docs.old}/yama/internals.md (100%) rename {docs => docs.old}/yama/internals/pointers-and-nodes.md (100%) rename {docs => docs.old}/yama/internals/raw-piles.md (100%) create mode 100644 docs/yama/zstd.md diff --git a/datman_cli_readme.txt b/datman_cli_readme.txt new file mode 100644 index 0000000..0db6fd6 --- /dev/null +++ b/datman_cli_readme.txt @@ -0,0 +1,12 @@ + +`datman backup-one ` +`datman backup-all ` + Backs up now (either just one source or all sources) to a destination. + + With `--config <>`, use a specified Datman config file; otherwise try current directory. + + + +.. +`datman extract ` with same filtering options as now. + (unimportant: Yama tools should be decent for this right now.) diff --git a/docs.old/SUMMARY.md b/docs.old/SUMMARY.md new file mode 100644 index 0000000..851c8cf --- /dev/null +++ b/docs.old/SUMMARY.md @@ -0,0 +1,11 @@ +# Summary + +- [Yama](./yama/index.md) + - [Getting Started](./yama/getting_started.md) + - [Internals](./yama/internals.md) + - [Raw Piles](./yama/internals/raw-piles.md) + - [Pointers and Nodes](./yama/internals/pointers-and-nodes.md) +- [Datman](./datman/index.md) + - [Getting Started](./datman/getting_started.md) + - [Remote Backups](./datman/remote_backups.md) + diff --git a/docs/datman/getting_started.md b/docs.old/datman/getting_started.md similarity index 100% rename from docs/datman/getting_started.md rename to docs.old/datman/getting_started.md diff --git a/docs/datman/index.md b/docs.old/datman/index.md similarity index 100% rename from docs/datman/index.md rename to docs.old/datman/index.md diff --git a/docs/datman/remote_backups.md b/docs.old/datman/remote_backups.md similarity index 100% rename from docs/datman/remote_backups.md rename to docs.old/datman/remote_backups.md diff --git a/docs/yama/getting_started.md b/docs.old/yama/getting_started.md similarity index 100% rename from docs/yama/getting_started.md rename to docs.old/yama/getting_started.md diff --git a/docs/yama/index.md b/docs.old/yama/index.md similarity index 100% rename from docs/yama/index.md rename to docs.old/yama/index.md diff --git a/docs/yama/internals.md b/docs.old/yama/internals.md similarity index 100% rename from docs/yama/internals.md rename to docs.old/yama/internals.md diff --git a/docs/yama/internals/pointers-and-nodes.md b/docs.old/yama/internals/pointers-and-nodes.md similarity index 100% rename from docs/yama/internals/pointers-and-nodes.md rename to docs.old/yama/internals/pointers-and-nodes.md diff --git a/docs/yama/internals/raw-piles.md b/docs.old/yama/internals/raw-piles.md similarity index 100% rename from docs/yama/internals/raw-piles.md rename to docs.old/yama/internals/raw-piles.md diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index 851c8cf..e69de29 100644 --- a/docs/SUMMARY.md +++ b/docs/SUMMARY.md @@ -1,11 +0,0 @@ -# Summary - -- [Yama](./yama/index.md) - - [Getting Started](./yama/getting_started.md) - - [Internals](./yama/internals.md) - - [Raw Piles](./yama/internals/raw-piles.md) - - [Pointers and Nodes](./yama/internals/pointers-and-nodes.md) -- [Datman](./datman/index.md) - - [Getting Started](./datman/getting_started.md) - - [Remote Backups](./datman/remote_backups.md) - diff --git a/docs/yama/zstd.md b/docs/yama/zstd.md new file mode 100644 index 0000000..477aa21 --- /dev/null +++ b/docs/yama/zstd.md @@ -0,0 +1,5 @@ +# Using a Zstd dictionary with Yama + +## Creating a Zstd dictionary + + diff --git a/yama_pile/src/tree.rs b/yama_pile/src/tree.rs index 3802953..757f216 100644 --- a/yama_pile/src/tree.rs +++ b/yama_pile/src/tree.rs @@ -874,7 +874,7 @@ mod tests { }; let mut child_full = child_diff.clone(); - integrate_node_in_place(&mut child_full, &parent).unwrap(); + integrate_node_in_place(&mut child_full, &parent); let expected_child_full = TreeNode::Directory { ownership: FilesystemOwnership { uid: 47, gid: 49 },