Update pijul

Author: fossdd

libpijul/src/alive/debug.rs

@@ -32,6 +32,7 @@ impl Graph {
         }
         let mut others = HashSet::default();
         for (line, i) in self.lines.iter().zip(0..) {
+            buf.resize(line.vertex.end - line.vertex.start, 0);
             changes
                 .get_contents(
                     |h| txn.get_external(&h).unwrap().map(|x| x.into()),

libpijul/src/find_alive.rs

@@ -23,7 +23,8 @@ pub(crate) fn find_alive_down<'a, T: GraphTxnT>(
             cache.insert(*vertex, Some(alive.clone()));
             if stack.is_empty() {
                 // Done!
-                return Ok(cache.get(&vertex0).unwrap());
+                assert_eq!(vertex0.start_pos(), vertex.start_pos());
+                return Ok(cache.get(&vertex).unwrap());
             }
             continue;
         } else {
@@ -117,7 +118,8 @@ pub fn find_alive_up<'a, T: GraphTxnT>(
             cache.insert(vertex, (Some(alive), files_));
             if stack.is_empty() {
                 // Done!
-                return Ok(&cache.get(&vertex0).unwrap().0);
+                assert_eq!(vertex.end_pos(), vertex0.end_pos());
+                return Ok(&cache.get(&vertex).unwrap().0);
             }
             continue;
         } else {

libpijul/src/record.rs

@@ -1104,7 +1104,7 @@ impl Recorded {
         if !moved.edges.is_empty() {
             // If there was exactly one alive name, this is a regular
             // move, i.e. not a conflict.
-            if moved.n_alive_names == 1 {
+            if moved.n_alive_names == 1 || (moved.need_new_name && !is_resurrected) {
                 debug!("need_new_name {:?}", item.v_papa);
                 let add = if moved.need_new_name && !is_resurrected {
                     moved.edges.extend(moved.alive.drain(..));