Update pijul

Author: fossdd

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "libpijul"
 description = "Core library of Pijul, a distributed version control system based on a sound theory of collaborative work."
-version = "1.0.0-alpha.48"
+version = "1.0.0-alpha.50"
 
 repository = "https://nest.pijul.com/pijul/libpijul"
 documentation = "https://docs.rs/libpijul"
@@ -30,6 +30,8 @@ include = [
 "src/change/change_file.rs",
 "src/change/text_changes.rs",
 "src/change/noenc.rs",
+"src/change/parse.rs",
+"src/change/printable.rs",
 "src/alive/tarjan.rs",
 "src/alive/debug.rs",
 "src/alive/retrieve.rs",
@@ -96,7 +98,7 @@ default = [ "ondisk-repos", "text-changes", "dump" ]
 tarball = [ "tar", "flate2" ]
 
 [dependencies]
-sanakirja = { version = "1.2.9", features = [ "crc32" ] }
+sanakirja = { version = "1.2.13", features = [ "crc32" ] }
 byteorder = "1.3"
 log = "0.4"
 serde = "1.0"
@@ -115,6 +117,7 @@ lazy_static = "1.4"
 twox-hash = "1.6"
 crossbeam-deque = "0.8"
 crossbeam-utils = "0.8"
+nom = "7"
 
 zstd-seekable = { version = "0.1.0", optional = true }
 cfg-if = "1.0"
@@ -150,3 +153,5 @@ anyhow = "1.0"
 detone = "1.0"
 rand = "0.7"
 rand_chacha = "0.2"
+quickcheck = "1"
+quickcheck_macros = "1"

libpijul/Cargo.toml

@@ -86,6 +86,7 @@ fn test4165() {
                 index: 0,
                 lowlink: 0,
                 scc: 0,
+                extra: Vec::new(),
             };
             13
         ],

libpijul/src/alive/dfs.rs

@@ -8,8 +8,14 @@ use chrono::{DateTime, Utc};
 #[cfg(feature = "zstd")]
 use std::io::Write;
 
+#[cfg(feature = "text-changes")]
+mod parse;
+#[cfg(feature = "text-changes")]
+mod printable;
 #[cfg(feature = "text-changes")]
 mod text_changes;
+pub use parse::*; // for testing
+pub use printable::*; // for testing
 pub use text_changes::{TextDeError, TextSerError, WriteChangeLine};
 
 mod change_file;
@@ -558,6 +564,14 @@ impl EdgeMap<Option<Hash>> {
 impl<L: Clone> Hunk<Option<Hash>, L> {
     pub fn inverse(&self, hash: &Hash) -> Self {
         match self {
+            Hunk::AddRoot { name, inode } => Hunk::DelRoot {
+                name: name.inverse(hash),
+                inode: inode.inverse(hash),
+            },
+            Hunk::DelRoot { name, inode } => Hunk::AddRoot {
+                name: name.inverse(hash),
+                inode: inode.inverse(hash),
+            },
             Hunk::FileMove { del, add, path } => Hunk::FileMove {
                 del: add.inverse(hash),
                 add: del.inverse(hash),
@@ -747,6 +761,14 @@ pub enum BaseHunk<Atom, Local> {
         local: Local,
         encoding: Option<Encoding>,
     },
+    AddRoot {
+        name: Atom,
+        inode: Atom,
+    },
+    DelRoot {
+        name: Atom,
+        inode: Atom,
+    },
 }
 
 #[doc(hidden)]
@@ -832,6 +854,10 @@ impl<Context, Local> Iterator for HunkIter<Hunk<Context, Local>, Atom<Context>>
                 Hunk::SolveOrderConflict { change, .. } => Some(change),
                 Hunk::UnsolveOrderConflict { change, .. } => Some(change),
                 Hunk::ResurrectZombies { change, .. } => Some(change),
+                Hunk::AddRoot { inode, name } | Hunk::DelRoot { inode, name } => {
+                    self.extra = Some(inode);
+                    Some(name)
+                }
             }
         } else {
             None
@@ -894,6 +920,17 @@ impl<'a, Context, Local> Iterator for HunkIter<&'a Hunk<Context, Local>, &'a Ato
                 Hunk::SolveOrderConflict { ref change, .. } => Some(change),
                 Hunk::UnsolveOrderConflict { ref change, .. } => Some(change),
                 Hunk::ResurrectZombies { ref change, .. } => Some(change),
+                Hunk::AddRoot {
+                    ref inode,
+                    ref name,
+                }
+                | Hunk::DelRoot {
+                    ref inode,
+                    ref name,
+                } => {
+                    self.extra = Some(inode);
+                    Some(name)
+                }
             }
         } else {
             None
@@ -975,6 +1012,17 @@ impl<'a, Context, Local> Iterator for RevHunkIter<&'a Hunk<Context, Local>, &'a
                 Hunk::SolveOrderConflict { ref change, .. } => Some(change),
                 Hunk::UnsolveOrderConflict { ref change, .. } => Some(change),
                 Hunk::ResurrectZombies { ref change, .. } => Some(change),
+                Hunk::AddRoot {
+                    ref name,
+                    ref inode,
+                }
+                | Hunk::DelRoot {
+                    ref name,
+                    ref inode,
+                } => {
+                    self.extra = Some(inode);
+                    Some(name)
+                }
             }
         } else {
             None
@@ -1093,6 +1141,7 @@ impl<H> Hunk<H, Local> {
             | Hunk::SolveOrderConflict { ref local, .. }
             | Hunk::UnsolveOrderConflict { ref local, .. }
             | Hunk::ResurrectZombies { ref local, .. } => &local.path,
+            Hunk::AddRoot { .. } | Hunk::DelRoot { .. } => "/",
         }
     }
 
@@ -1205,6 +1254,14 @@ impl<A, Local> BaseHunk<A, Local> {
                 local: l(local),
                 encoding,
             },
+            BaseHunk::AddRoot { name, inode } => BaseHunk::AddRoot {
+                name: f(name)?,
+                inode: f(inode)?,
+            },
+            BaseHunk::DelRoot { name, inode } => BaseHunk::DelRoot {
+                name: f(name)?,
+                inode: f(inode)?,
+            },
         })
     }
 }