Merge pull request #579 from rustic-rs/fix-changed-dir

backup: only show changed dirs if there are changes

Author: aawsome

changelog/new.txt

@@ -11,6 +11,7 @@ Bugs fixed:
 - restore: Setting ownership/permissons/times for symlinks failed. This has been fixed.
 - Spaces in paths did not work when given in the config file. This has been fixed.
 - backup --stdin-filename did not use the given filename. This has been fixed.
+- backup always displayed at least 1 dir as changed. This has been corrected.
 
 New features:
 - REST backend: Set User-Agent header

src/archiver/mod.rs

@@ -17,12 +17,14 @@ use log::*;
 
 use crate::backend::{DecryptWriteBackend, ReadSource, ReadSourceEntry};
 use crate::blob::BlobType;
+use crate::id::Id;
 use crate::index::{IndexedBackend, Indexer, SharedIndexer};
 use crate::repofile::{ConfigFile, SnapshotFile};
 
 pub struct Archiver<BE: DecryptWriteBackend, I: IndexedBackend> {
     file_archiver: FileArchiver<BE, I>,
     tree_archiver: TreeArchiver<BE, I>,
+    parent_tree: Option<Id>,
     parent: Parent<I>,
     indexer: SharedIndexer<BE>,
     be: BE,
@@ -34,18 +36,22 @@ impl<BE: DecryptWriteBackend, I: IndexedBackend> Archiver<BE, I> {
         be: BE,
         index: I,
         config: &ConfigFile,
-        parent: Parent<I>,
+        parent_tree: Option<Id>,
+        ignore_ctime: bool,
+        ignore_inode: bool,
         mut snap: SnapshotFile,
     ) -> Result<Self> {
         let indexer = Indexer::new(be.clone()).into_shared();
         let mut summary = snap.summary.take().unwrap();
         summary.backup_start = Local::now();
 
+        let parent = Parent::new(&index, parent_tree, ignore_ctime, ignore_inode);
         let file_archiver = FileArchiver::new(be.clone(), index.clone(), indexer.clone(), config)?;
         let tree_archiver = TreeArchiver::new(be.clone(), index, indexer.clone(), config, summary)?;
         Ok(Self {
             file_archiver,
             tree_archiver,
+            parent_tree,
             parent,
             be,
             indexer,
@@ -121,14 +127,8 @@ impl<BE: DecryptWriteBackend, I: IndexedBackend> Archiver<BE, I> {
             self.tree_archiver.add(item)?;
         }
 
-        let snap = self.finalize_snapshot()?;
-        p.finish_with_message("done");
-        Ok(snap)
-    }
-
-    pub fn finalize_snapshot(mut self) -> Result<SnapshotFile> {
         let stats = self.file_archiver.finalize()?;
-        let (id, mut summary) = self.tree_archiver.finalize()?;
+        let (id, mut summary) = self.tree_archiver.finalize(self.parent_tree)?;
         stats.apply(&mut summary, BlobType::Data);
         self.snap.tree = id;
 
@@ -140,6 +140,7 @@ impl<BE: DecryptWriteBackend, I: IndexedBackend> Archiver<BE, I> {
         let id = self.be.save_file(&self.snap)?;
         self.snap.id = id;
 
+        p.finish_with_message("done");
         Ok(self.snap)
     }
 }

src/archiver/tree_archiver.rs

@@ -127,8 +127,12 @@ impl<BE: DecryptWriteBackend, I: IndexedBackend> TreeArchiver<BE, I> {
         Ok(id)
     }
 
-    pub fn finalize(mut self) -> Result<(Id, SnapshotSummary)> {
-        let id = self.backup_tree(&PathBuf::new(), ParentResult::NotMatched)?;
+    pub fn finalize(mut self, parent_tree: Option<Id>) -> Result<(Id, SnapshotSummary)> {
+        let parent = match parent_tree {
+            None => ParentResult::NotMatched,
+            Some(id) => ParentResult::Matched(id),
+        };
+        let id = self.backup_tree(&PathBuf::new(), parent)?;
         let stats = self.tree_packer.finalize()?;
         stats.apply(&mut self.summary, BlobType::Tree);
 

src/commands/backup.rs

@@ -11,7 +11,7 @@ use serde::Deserialize;
 use toml::Value;
 
 use super::{bytes, progress_bytes, progress_counter, RusticConfig};
-use crate::archiver::{Archiver, Parent};
+use crate::archiver::Archiver;
 use crate::backend::{DryRunBackend, LocalSource, LocalSourceOptions, StdinSource};
 use crate::index::IndexBackend;
 use crate::repofile::{
@@ -206,9 +206,15 @@ pub(super) fn execute(
             }
         };
 
-        let parent = Parent::new(&index, parent_tree, opts.ignore_ctime, opts.ignore_inode);
-
-        let archiver = Archiver::new(be, index, &repo.config, parent, snap)?;
+        let archiver = Archiver::new(
+            be,
+            index,
+            &repo.config,
+            parent_tree,
+            opts.ignore_ctime,
+            opts.ignore_inode,
+            snap,
+        )?;
         let p = progress_bytes("determining size...");
 
         let snap = if backup_stdin {