adapt to changes in gix-traverse

Author: Byron

gitoxide-core/src/repository/tree.rs

@@ -58,6 +58,9 @@ mod entries {
         }
 
         fn push_element(&mut self, name: &BStr) {
+            if name.is_empty() {
+                return;
+            }
             if !self.path.is_empty() {
                 self.path.push(b'/');
             }
@@ -66,6 +69,10 @@ mod entries {
     }
 
     impl gix::traverse::tree::Visit for Traverse<'_, '_> {
+        fn pop_back_tracked_path_and_set_current(&mut self) {
+            self.path = self.path_deque.pop_back().unwrap_or_default();
+        }
+
         fn pop_front_tracked_path_and_set_current(&mut self) {
             self.path = self.path_deque.pop_front().expect("every parent is set only once");
         }
@@ -96,7 +103,7 @@ mod entries {
                 format_entry(out, entry, self.path.as_bstr(), size).ok();
             }
             if let Some(size) = size {
-                self.stats.num_bytes += size as u64;
+                self.stats.num_bytes += size;
             }
 
             use gix::object::tree::EntryKind::*;

gix-diff/src/tree/recorder.rs

@@ -89,6 +89,9 @@ impl Recorder {
     }
 
     fn push_element(&mut self, name: &BStr) {
+        if name.is_empty() {
+            return;
+        }
         if !self.path.is_empty() {
             self.path.push(b'/');
         }

gix-diff/src/tree_with_rewrites/function.rs

@@ -239,6 +239,10 @@ mod tree_to_changes {
     }
 
     impl gix_traverse::tree::Visit for Delegate<'_> {
+        fn pop_back_tracked_path_and_set_current(&mut self) {
+            self.recorder.pop_back_tracked_path_and_set_current();
+        }
+
         fn pop_front_tracked_path_and_set_current(&mut self) {
             self.recorder.pop_front_tracked_path_and_set_current();
         }

gix-index/src/init.rs

@@ -126,6 +126,9 @@ pub mod from_tree {
         }
 
         fn push_element(&mut self, name: &BStr) {
+            if name.is_empty() {
+                return;
+            }
             if !self.path.is_empty() {
                 self.path.push(b'/');
             }
@@ -182,6 +185,10 @@ pub mod from_tree {
     }
 
     impl Visit for CollectEntries {
+        fn pop_back_tracked_path_and_set_current(&mut self) {
+            self.path = self.path_deque.pop_back().unwrap_or_default();
+        }
+
         fn pop_front_tracked_path_and_set_current(&mut self) {
             self.path = self
                 .path_deque

gix-pack/src/data/output/count/objects/tree.rs

@@ -94,6 +94,8 @@ pub mod traverse {
     where
         H: InsertImmutable,
     {
+        fn pop_back_tracked_path_and_set_current(&mut self) {}
+
         fn pop_front_tracked_path_and_set_current(&mut self) {}
 
         fn push_back_tracked_path_component(&mut self, _component: &BStr) {}

gix-worktree-stream/src/from_tree/traverse.rs

@@ -39,6 +39,9 @@ where
     }
 
     fn push_element(&mut self, name: &BStr) {
+        if name.is_empty() {
+            return;
+        }
         if !self.path.is_empty() {
             self.path.push(b'/');
         }
@@ -105,6 +108,10 @@ where
     AttributesFn:
         FnMut(&BStr, gix_object::tree::EntryMode, &mut gix_attributes::search::Outcome) -> Result<(), Error> + 'static,
 {
+    fn pop_back_tracked_path_and_set_current(&mut self) {
+        self.path = self.path_deque.pop_back().unwrap_or_default();
+    }
+
     fn pop_front_tracked_path_and_set_current(&mut self) {
         self.path = self
             .path_deque

gix/examples/stats.rs

@@ -39,7 +39,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let mut delegate = visit::Tree::new(repo.clone());
     tree.traverse().breadthfirst(&mut delegate)?;
-    let _files = tree.traverse().breadthfirst.files()?;
 
     println!("num trees: {}", delegate.num_trees);
     println!("num blobs: {}", delegate.num_blobs);
@@ -105,6 +104,8 @@ mod visit {
         }
     }
     impl gix_traverse::tree::Visit for Tree {
+        fn pop_back_tracked_path_and_set_current(&mut self) {}
+
         fn pop_front_tracked_path_and_set_current(&mut self) {}
 
         fn push_back_tracked_path_component(&mut self, _component: &BStr) {}