Fix restore

engine/src/handlers/restore/handlers.rs

@@ -4,6 +4,7 @@ use crate::index::{FileMode, index_entry::IndexEntry, stage::Stage};
 use crate::objects::{MevaBlob, MevaObject, ObjectEntry};
 use crate::{CommitTreeWalker, Index, ObjectStorage, RevisionResolver, WorkingDir};
 use chrono::Utc;
+use path_absolutize::Absolutize;
 use shared::{PathToString, StripBase};
 use std::collections::{HashMap, HashSet};
 use std::fs;
@@ -135,6 +136,8 @@ impl RestoreHandler {
         let index_entries_to_remove =
             Self::build_index_entries_to_remove(&index_entries_map, &source_files_map);
 
+        drop(index_read_guard);
+
         let mut index_write_guard = self.index.write().unwrap();
         index_write_guard.insert_entries(index_entries_to_add);
         index_write_guard.remove_entries(index_entries_to_remove);
@@ -152,10 +155,14 @@ impl RestoreHandler {
                 .working_dir
                 .collect_files(path, false)
                 .into_iter()
-                .map(|(entry_path, _)| {
+                .filter_map(|(entry_path, _)| {
                     entry_path
-                        .strip_base(&self.working_dir.layout().working_dir())
-                        .to_path_buf()
+                        .absolutize()
+                        .map(|path| {
+                            path.strip_base(&self.working_dir.layout().working_dir())
+                                .to_path_buf()
+                        })
+                        .ok()
                 })
                 .collect();
             workdir_files.extend(collected_files);

engine/src/index/working_dir.rs

@@ -65,7 +65,7 @@ pub trait WorkingDir: Send + Sync {
     /// # Returns
     ///
     /// A vector of tuples of type `(PathBuf, bool)`:
-    /// - `PathBuf`: the absolute file path.
+    /// - `PathBuf`: file path.
     /// - `bool`: whether the file is ignored (`true` if ignored).
     fn collect_files(&self, path: &Path, include_ignored: bool) -> Vec<(PathBuf, bool)>;
 

engine/src/traversal/meva_commit_tree_walker.rs

@@ -2,8 +2,11 @@ use super::CommitTreeWalker;
 use crate::errors::EngineResult;
 use crate::object_storage::ObjectStorage;
 use crate::objects::{MevaBlob, MevaCommit, MevaTree, ObjectEntry, TreeEntry, TreeEntryType};
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
+use shared::IsWithin;
+use std::{
+    path::{Path, PathBuf},
+    sync::Arc,
+};
 
 /// A concrete implementation of [`CommitTreeWalker`] for traversing commits
 /// stored in a local Meva object database.
@@ -36,9 +39,9 @@ impl MevaCommitTreeWalker {
     /// - The current entry path **starts with** or **is a prefix of** any of the filters.
     fn should_traverse(&self, entry_path: &Path, path_filter: Option<&[PathBuf]>) -> bool {
         match path_filter {
-            Some(filters) => filters
-                .iter()
-                .any(|f| f.starts_with(entry_path) || entry_path.starts_with(f)),
+            Some(filters) => filters.iter().any(|f| {
+                f.is_within(entry_path).unwrap_or(false) || entry_path.is_within(f).unwrap_or(false)
+            }),
             None => true,
         }
     }
@@ -49,7 +52,9 @@ impl MevaCommitTreeWalker {
     /// should be **included** in the traversal result.
     fn matches_entry(&self, entry_path: &Path, path_filter: Option<&[PathBuf]>) -> bool {
         match path_filter {
-            Some(filters) => filters.iter().any(|f| entry_path.starts_with(f)),
+            Some(filters) => filters
+                .iter()
+                .any(|f| entry_path.is_within(f).unwrap_or(false)),
             None => true,
         }
     }