Fixing conflicts with the changes from discussion #143

[?]

Dec 5, 2020, 10:59 AM

6T5ULULMRGU5GJ3JQTEH2QFQN5IMP53TYFFXUT5UE6FA6WWFFMFAC

Dependencies

[2] 5BRU2RRW Cleanup (debugging a crash related to trees/inodes)
[3] 33ANCTMF Fixing a panic when decoding a bad ChangeId
[4] BZSC7VMY address clippy lints
[5] WZVCLZKY address clippy lints
[6] KDF6FJRV bigger clippy refactors
[7] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[8] UNZXTNSJ Change text format: order dependencies in the order they were on the channel at record time
[9] I52XSRUH Massive cleanup, and simplification

Change contents

resurrect zombie in "libpijul/src/pristine/sanakirja.rs" at line 634

[7.36950]→[4.2136:2256](∅→∅),[7.36950]→[4.2136:2256](∅→∅)

fn iter_inodes(
&self,
) -> super::Cursor<Self, &Self, Self::InodesCursor, Inode, Position<ChangeId>> {
resurrect zombie in "libpijul/src/pristine/sanakirja.rs" at line 640

[7.553202]→[2.709:940](∅→∅),[7.553202]→[2.709:940](∅→∅)

#[cfg(debug_assertions)]
fn iter_revinodes<'txn>(
&'txn self,
) -> super::Cursor<Self, &'txn Self, Self::RevinodesCursor, Position<ChangeId>, Inode> {
self.cursor_revinodes(&self.revinodes, None)
}
resurrect zombie in "libpijul/src/pristine/change_id.rs" at line 30

[7.667267]→[3.0:154](∅→∅),[7.667267]→[3.0:154](∅→∅)

let len = if let Ok(len) = data_encoding::BASE32_NOPAD.decode_len(b.len()) {
len
} else {
return None;
};
resurrect zombie in "libpijul/src/pristine/change_id.rs" at line 35

[7.667343]→[6.451:565](∅→∅),[7.667343]→[6.451:565](∅→∅)

if data_encoding::BASE32_NOPAD
.decode_mut(b, &mut dec[..len])
.is_ok()
{
edit in libpijul/src/fs.rs at line 281

[7.747469]

[7.747469]

debug!("iter_tree: {:?} {:?}", k, inode);
resurrect zombie in "libpijul/src/fs.rs" at line 295

[7.747947]→[2.3163:3230](∅→∅),[7.747947]→[2.3163:3230](∅→∅)

assert!(txn.del_tree(file_id.as_file_id(), Some(inode))?);
edit in libpijul/src/fs.rs at line 295

[7.747931]

[2.3163]

if is_dir {
edit in libpijul/src/fs.rs at line 297

[7.747931]→[5.5081:5287](∅→∅)

if is_dir && !txn.del_tree(file_id.as_file_id(), Some(inode))? {
debug!(
"rec_delete (is_dir): {:?} {:?} not present",
file_id.as_file_id(),
inode
);
edit in libpijul/src/change.rs at line 1174

[7.870162]→[5.6163:6194](∅→∅),[5.6194]→[7.870243:870244](∅→∅),[7.870243]→[7.870243:870244](∅→∅)

let version = VERSION;
edit in libpijul/src/change.rs at line 1177

[7.870366]→[5.6195:6241](∅→∅)

let hashed_len = hashed.len() as u64;
edit in libpijul/src/change.rs at line 1190

[7.870813]→[5.6244:6294](∅→∅)

let unhashed_len = unhashed.len() as u64;
edit in libpijul/src/change.rs at line 1198

[5.6440]→[7.871242:871243](∅→∅),[7.871242]→[7.871242:871243](∅→∅)
edit in libpijul/src/change.rs at line 1200

[7.871342]→[5.6441:6559](∅→∅)

let contents_len = self.contents.len() as u64;
let total = contents_off + contents_comp.len() as u64;
replacement in libpijul/src/change.rs at line 1202

[5.6592]→[5.6592:6637](∅→∅)

version,
hashed_len,

[5.6592]

[5.6637]

version: VERSION,
hashed_len: hashed.len() as u64,
replacement in libpijul/src/change.rs at line 1205

[5.6663]→[5.6663:6689](∅→∅)

unhashed_len,

[5.6663]

[5.6689]

unhashed_len: unhashed.len() as u64,
replacement in libpijul/src/change.rs at line 1207

[5.6715]→[5.6715:6760](∅→∅)

contents_len,
total,

[5.6715]

[5.6760]

contents_len: self.contents.len() as u64,
total: contents_off + contents_comp.len() as u64,