Updating with the latest Sanakirja

pmeunier

Nov 23, 2021, 11:13 AM

QDP3R3BG6HNETNP4ZZM2IGB6WRJKF5ZKE5SWZYMLK47ZDWFSLRFAC

Dependencies

• [2] FGIVSUFH Fixing conflicts with the new patch parsing code, and introducing AddRoot
• [3] YN63NUZO Sanakirja 1.0
• [4] X243Z3Y5 Recording only the required metadata (can even be changed later!)
• [5] QL6K2ZM3 Tags
• [6] SL45MHGV +contrib/pijul2svg.sh (license as usual: GPL-2.0-or-later)
• [7] A3RM526Y Integrating identity malleability
• [8] YE5WBHXB Fixing contrib permissions
• [9] SGXOEWHU Adding a patched chardetng (temporarily)
• [10] HSEYMLO2 Adding an untracked change iterator
• [11] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [12] DJ5JYH3K COPYING
• [13] TNN56XYK libpijul alpha.43
• [14] HYRH4E55 rustfmt.toml: init
• [15] G734WNM6 flake.nix: use crate2nix
• [16] GHO6DWPI Refactoring iterators
• [17] HDGRZISM Version updates
• [18] QQZNSB26 Permission update (after #X243)
• [19] YTQS4ES3 Fixing a parsing problem (related to permissions), and the associated permissions
• [20] 2RXOCWUW Making libpijul deterministic (and getting rid of `rand`)
• [*] I24UEJQL Various post-fire fixes
• [*] IIV3EL2X Cleanup, formatting, and fixing the Git feature

Change contents

• file move: libpijul (d--r------) → libpijul (d--r------)
  [1.0]

  [3.198139]
• replacement in libpijul/src/pristine/sanakirja.rs at line 15
  [3.22019]→[3.57053:57086](∅→∅),[3.57053]→[3.57053:57086](∅→∅)
  − type Db<K, V> = btree::Db<K, V>;
  [3.22019]

  [3.22020]
  + pub type Db<K, V> = btree::Db<K, V>;
• replacement in libpijul/src/pristine/sanakirja.rs at line 17
  [3.22080]→[3.57135:57180](∅→∅),[3.57135]→[3.57135:57180](∅→∅)
  − type UDb<K, V> = btree::Db_<K, V, UP<K, V>>;
  [3.22080]

  [3.531484]
  + pub type UDb<K, V> = btree::Db_<K, V, UP<K, V>>;
• replacement in libpijul/src/pristine/sanakirja.rs at line 261
  [3.22797]→[3.537121:537210](∅→∅),[3.30482]→[3.537121:537210](∅→∅),[3.60249]→[3.537121:537210](∅→∅),[3.537121]→[3.537121:537210](∅→∅)
  − inodes: Db<Inode, Position<ChangeId>>,

  − revinodes: Db<Position<ChangeId>, Inode>,
  [3.22797]

  [3.537210]
  + pub inodes: Db<Inode, Position<ChangeId>>,

  + pub revinodes: Db<Position<ChangeId>, Inode>,
• replacement in libpijul/src/pristine/sanakirja.rs at line 265
  [3.2888]→[3.60280:60313](∅→∅),[3.60280]→[3.60280:60313](∅→∅)
  − revtree: UDb<Inode, PathId>,
  [3.2888]

  [3.537284]
  + pub revtree: UDb<Inode, PathId>,
• replacement in libpijul/src/pristine/sanakirja.rs at line 294
  [3.538254]→[3.60601:60694](∅→∅)
  − pub fn check_database(&self) {

  − let mut refs = std::collections::BTreeMap::new();
  [3.538254]

  [3.60694]
  + pub fn check_database(&self, refs: &mut std::collections::BTreeMap<u64, usize>) {

  + use ::sanakirja::debug::Check;
• replacement in libpijul/src/pristine/sanakirja.rs at line 297
  [3.60754]→[3.60754:60839](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.internal, &mut refs).unwrap();
  [3.60754]

  [3.60839]
  + self.internal.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 299
  [3.60899]→[3.60899:60984](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.external, &mut refs).unwrap();
  [3.60899]

  [3.60984]
  + self.external.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 301
  [3.61040]→[3.61040:61123](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.inodes, &mut refs).unwrap();
  [3.61040]

  [3.61123]
  + self.inodes.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 303
  [3.61185]→[3.61185:61271](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.revinodes, &mut refs).unwrap();
  [3.61185]

  [3.61271]
  + self.revinodes.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 305
  [3.61323]→[3.61323:61404](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.tree, &mut refs).unwrap();
  [3.61323]

  [3.61404]
  + self.tree.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 307
  [3.61462]→[3.61462:61546](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.revtree, &mut refs).unwrap();
  [3.61462]

  [3.61546]
  + self.revtree.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 309
  [3.61602]→[3.61602:61685](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.revdep, &mut refs).unwrap();
  [3.61602]

  [3.61685]
  + self.revdep.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 311
  [3.61735]→[3.61735:61815](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.dep, &mut refs).unwrap();
  [3.61735]

  [3.61815]
  + self.dep.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 313
  [3.61885]→[3.61885:61975](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.touched_files, &mut refs).unwrap();
  [3.61885]

  [3.61975]
  + self.touched_files.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 315
  [3.62053]→[3.62053:62147](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.rev_touched_files, &mut refs).unwrap();
  [3.62053]

  [3.62147]
  + self.rev_touched_files.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 317
  [3.62207]→[3.62207:62292](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.partials, &mut refs).unwrap();
  [3.62207]

  [3.62292]
  + self.partials.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 319
  [3.62352]→[3.62352:62437](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.channels, &mut refs).unwrap();
  [3.62352]

  [3.62437]
  + self.channels.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 330
  [3.63032]→[3.63032:63113](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &graph, &mut refs).unwrap();
  [3.63032]

  [3.63113]
  + graph.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 332
  [3.63170]→[3.63170:63253](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &changes, &mut refs).unwrap();
  [3.63170]

  [3.63253]
  + changes.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 334
  [3.63316]→[3.63316:63402](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &revchanges, &mut refs).unwrap();
  [3.63316]

  [3.63402]
  + revchanges.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 336
  [3.63457]→[3.63457:63539](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &states, &mut refs).unwrap();
  [3.63457]

  [3.22915]
  + states.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 338
  [3.22966]→[3.22966:23046](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &tags, &mut refs).unwrap();
  [3.22966]

  [3.539904]
  + tags.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 341
  [3.63598]→[3.63598:63682](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &self.remotes, &mut refs).unwrap();
  [3.63598]

  [3.63682]
  + self.remotes.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 351
  [3.64158]→[3.64158:64240](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &remote, &mut refs).unwrap();
  [3.64158]

  [3.64240]
  + remote.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 353
  [3.64289]→[3.64289:64368](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &rev, &mut refs).unwrap();
  [3.64289]

  [3.64368]
  + rev.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 355
  [3.64423]→[3.64423:64505](∅→∅)
  − ::sanakirja::debug::add_refs(&self.txn, &states, &mut refs).unwrap();
  [3.64423]

  [3.541955]
  + states.add_refs(&self.txn, refs).unwrap();
• replacement in libpijul/src/pristine/sanakirja.rs at line 357
  [3.541965]→[3.64506:64580](∅→∅)
  − ::sanakirja::debug::add_free_refs(&self.txn, &mut refs).unwrap();
  [3.541965]

  [3.64580]
  + ::sanakirja::debug::add_free_refs(&self.txn, refs).unwrap();
• edit in libpijul/src/pristine/sanakirja.rs at line 2073
  [22.68505]

  [3.92330]
  + debug!(

  + "{:x} {:x} {:x} {:x} {:x} {:x} {:x} {:x} {:x} {:x} {:x} {:x} {:x}",

  + self.tree.db,

  + self.revtree.db,

  + self.inodes.db,

  + self.revinodes.db,

  + self.internal.db,

  + self.external.db,

  + self.revdep.db,

  + self.channels.db,

  + self.remotes.db,

  + self.touched_files.db,

  + self.dep.db,

  + self.rev_touched_files.db,

  + self.partials.db,

  + );
• edit in libpijul/src/pristine/sanakirja.rs at line 2153
  [23.13754]

  [3.32062]
  + debug!(

  + "channels: {:x} {:x} {:x} {:x} {:x}",

  + channel.graph.db,

  + channel.changes.db,

  + channel.revchanges.db,

  + channel.states.db,

  + channel.tags.db,

  + );
• edit in libpijul/src/pristine/sanakirja.rs at line 2206
  [3.94965]

  [3.576850]
  + impl ::sanakirja::debug::Check for L64{}
• edit in libpijul/src/pristine/sanakirja.rs at line 2209
  [3.94990]

  [3.576899]
  + impl ::sanakirja::debug::Check for ChangeId{}
• edit in libpijul/src/pristine/sanakirja.rs at line 2212
  [3.95023]

  [3.95023]
  + impl ::sanakirja::debug::Check for Vertex<ChangeId>{}

  +
• edit in libpijul/src/pristine/sanakirja.rs at line 2215
  [3.95057]

  [3.578062]
  + impl ::sanakirja::debug::Check for Position<ChangeId>{}
• edit in libpijul/src/pristine/sanakirja.rs at line 2218
  [3.95088]

  [3.95088]
  + impl ::sanakirja::debug::Check for SerializedEdge{}
• edit in libpijul/src/pristine/sanakirja.rs at line 2220
  [3.95089]

  [3.95089]
  +

  + impl ::sanakirja::debug::Check for PathId{}
• edit in libpijul/src/pristine/sanakirja.rs at line 2271
  [3.96378]

  [3.96378]
  + impl ::sanakirja::debug::Check for Inode{}
• edit in libpijul/src/pristine/sanakirja.rs at line 2273
  [3.96410]

  [3.96410]
  + impl ::sanakirja::debug::Check for SerializedMerkle{}
• edit in libpijul/src/pristine/sanakirja.rs at line 2275
  [3.96440]

  [3.582759]
  + impl ::sanakirja::debug::Check for SerializedHash{}
• edit in libpijul/src/pristine/sanakirja.rs at line 2277
  [3.582760]

  [3.96441]
  + impl<A: ::sanakirja::debug::Check, B: ::sanakirja::debug::Check> ::sanakirja::debug::Check for Pair<A, B>{

  + fn add_refs<T: LoadPage>(

  + &self,

  + txn: &T,

  + pages: &mut std::collections::BTreeMap<u64, usize>,

  + ) -> Result<(), T::Error>

  + where

  + T::Error: std::fmt::Debug,

  + {

  + self.a.add_refs(txn, pages)?;

  + self.b.add_refs(txn, pages)

  + }

  + }
• edit in libpijul/src/pristine/sanakirja.rs at line 2327
  [3.97813]

  [3.33063]
  + impl ::sanakirja::debug::Check for SerializedRemote{}
• edit in libpijul/src/pristine/sanakirja.rs at line 2389
  [3.34670]

  [3.34670]
  + impl ::sanakirja::debug::Check for SerializedChannel{}

  +
• edit in libpijul/src/pristine/sanakirja.rs at line 2392
  [3.34694]
  + impl ::sanakirja::debug::Check for RemoteId{}
• edit in libpijul/src/small_string.rs at line 342
  [3.488071]

  [3.488071]
  +

  + impl ::sanakirja::debug::Check for SmallStr{}