Update pijul

Author: fossdd

libpijul/src/diff/mod.rs

@@ -96,7 +96,13 @@ fn make_old_lines<'a>(d: &'a vertex_buffer::Diff, r: &'a regex::bytes::Regex) ->
             } else {
                 false
             };
-            debug!("old = {:?}", l);
+            if log_enabled!(log::Level::Debug) {
+                if let Ok(l) = std::str::from_utf8(l) {
+                    debug!("old = {:?}", l);
+                } else {
+                    debug!("old = {:?}", l);
+                }
+            }
             Line {
                 l,
                 cyclic,
@@ -112,7 +118,13 @@ fn make_old_lines<'a>(d: &'a vertex_buffer::Diff, r: &'a regex::bytes::Regex) ->
 fn make_new_lines<'a>(b: &'a [u8], sep: &'a regex::bytes::Regex) -> Vec<Line<'a>> {
     split::LineSplit::from_bytes_with_sep(b, sep)
         .map(|l| {
-            debug!("new: {:?}", l);
+            if log_enabled!(log::Level::Debug) {
+                if let Ok(l) = std::str::from_utf8(l) {
+                    debug!("new = {:?}", l);
+                } else {
+                    debug!("new = {:?}", l);
+                }
+            }
             let next_index = l.as_ptr() as usize + l.len() - b.as_ptr() as usize;
             Line {
                 l,

libpijul/src/diff/replace.rs

@@ -136,21 +136,33 @@ pub(super) fn get_up_context(
     } else {
         diff.contents_a.len()
     };
-    debug!("old_bytes {:?}", old_bytes);
     let mut up_context_idx = diff.last_vertex_containing(old_bytes - 1);
     let mut seen_conflict_markers = false;
     loop {
-        debug!("up_context_idx = {:?}", up_context_idx);
-        debug!("{:?}", diff.marker.get(&diff.pos_a[up_context_idx].pos));
         match diff.marker.get(&diff.pos_a[up_context_idx].pos) {
             None if seen_conflict_markers => {
                 return vec![diff.pos_a[up_context_idx].vertex.end_pos().to_option()]
             }
             None => {
                 let change = diff.pos_a[up_context_idx].vertex.change;
                 let pos = diff.pos_a[up_context_idx].vertex.start;
-                let offset = old_bytes - diff.pos_a[up_context_idx].pos;
-                debug!("offset {:?} {:?}", pos.0, offset);
+                let mut offset = old_bytes - diff.pos_a[up_context_idx].pos;
+                // Here, in the case where one side of the conflict
+                // ended with a "last line without a `\n`", the offset
+                // might be off by one.
+                //
+                // We detect that case by testing whether the vertex
+                // length is the same as the length of the "line".
+
+                let v_end = diff.pos_a[up_context_idx].vertex.end.0.into();
+                if pos.0 + offset <= v_end {
+                    //
+                } else if pos.0 + offset == v_end + 1 {
+                    assert_eq!(diff.contents_a[old_bytes - 1], b'\n');
+                    offset -= 1
+                } else {
+                    panic!("{:?} {:?} {:?}", pos.0, offset, v_end);
+                }
                 return vec![Position {
                     change: Some(change),
                     pos: ChangePosition(pos.0 + offset),

libpijul/src/fs.rs

@@ -70,7 +70,7 @@ impl<C: std::error::Error + 'static, T: GraphTxnT> std::fmt::Debug for FsErrorC<
 #[error("Path not found: {0}")]
 pub struct FsNotFound(String);
 
-pub(crate) fn create_new_inode<T: TreeMutTxnT>(
+pub fn create_new_inode<T: TreeMutTxnT>(
     txn: &mut T,
     parent_id: &PathId,
     salt: u64,

libpijul/src/pristine/mod.rs

@@ -1890,7 +1890,7 @@ pub trait MutTxnT:
     fn set_current_channel(&mut self, cur: &str) -> Result<(), Self::GraphError>;
 }
 
-pub(crate) fn put_inodes_with_rev<T: TreeMutTxnT>(
+pub fn put_inodes_with_rev<T: TreeMutTxnT>(
     txn: &mut T,
     inode: &Inode,
     position: &Position<ChangeId>,
@@ -1900,7 +1900,7 @@ pub(crate) fn put_inodes_with_rev<T: TreeMutTxnT>(
     Ok(())
 }
 
-pub(crate) fn del_inodes_with_rev<T: TreeMutTxnT>(
+pub fn del_inodes_with_rev<T: TreeMutTxnT>(
     txn: &mut T,
     inode: &Inode,
     position: &Position<ChangeId>,
@@ -1913,7 +1913,7 @@ pub(crate) fn del_inodes_with_rev<T: TreeMutTxnT>(
     }
 }
 
-pub(crate) fn put_tree_with_rev<T: TreeMutTxnT>(
+pub fn put_tree_with_rev<T: TreeMutTxnT>(
     txn: &mut T,
     file_id: &PathId,
     inode: &Inode,
@@ -1924,7 +1924,7 @@ pub(crate) fn put_tree_with_rev<T: TreeMutTxnT>(
     Ok(())
 }
 
-pub(crate) fn del_tree_with_rev<T: TreeMutTxnT>(
+pub fn del_tree_with_rev<T: TreeMutTxnT>(
     txn: &mut T,
     file_id: &PathId,
     inode: &Inode,

libpijul/src/record.rs

@@ -808,6 +808,8 @@ impl Recorded {
             self.largest_file = self.largest_file.max(end.0.as_u64() - start.0.as_u64());
             contents.push(0);
             if end > start {
+>>>>>>> 0 [PDTUHOMV]
+<<<<<<< 0
                 (
                     Some(Atom::NewVertex(NewVertex {
                         up_context: vec![Position {
@@ -1583,8 +1585,10 @@ impl Recorded {
                     self.recorded_inodes
                         .lock()
                         .insert(*inode, vertex.start_pos().to_option());
-                    self.updatables
-                        .insert(self.actions.len(), InodeUpdate::Deleted { inode: *inode });
+                    self.updatables.insert(
+                        self.actions.len() + 1,
+                        InodeUpdate::Deleted { inode: *inode },
+                    );
                 }
                 self.delete_inode_vertex::<_, _, W>(
                     changes,

libpijul/src/tests/mod.rs

@@ -96,9 +96,11 @@ fn record_all<T: MutTxnT, R: WorkingCopy, P: ChangeStore>(
     prefix: &str,
 ) -> Result<Hash, anyhow::Error>
 where
+>>>>>>> 0 [SHSJ3Y53]
     T: MutTxnT + Send + Sync + 'static,
     R: WorkingCopy + Clone + Send + Sync + 'static,
     P: ChangeStore + Clone + Send + 'static,
+<<<<<<< 0
     R::Error: Send + Sync + 'static,
 {
     let (hash, _) = record_all_change(repo, store, txn, channel, prefix)?;

pijul/src/commands/change.rs

@@ -23,7 +23,11 @@ impl Change {
         let changes = repo.changes;
 
         let hash = if let Some(hash) = self.hash {
-            txn.hash_from_prefix(&hash)?.0
+            if let Some(h) = Hash::from_base32(hash.as_bytes()) {
+                h
+            } else {
+                txn.hash_from_prefix(&hash)?.0
+            }
         } else {
             let channel_name = txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL);
             let channel = if let Some(channel) = txn.load_channel(&channel_name)? {