{"header":{"message":"Adding a single-threaded version of record, for working copies that are neither \"Send\" nor \"Sync\"","description":null,"timestamp":"2022-10-12T11:41:27.729210081Z","authors":[{}]},"hash":"HEA2T44CJZIJCYCH3DYMVN74W2OWZYMJDJX655T6GCVCCSFGNNSQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["HEA2T44CJZIJCYCH3DYMVN74W2OWZYMJDJX655T6GCVCCSFGNNSQC","Adding a single-threaded version of record, for working copies that are neither \"Send\" nor \"Sync\""],["AA",null],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["2VXTRPO4OML5A2RPI7SAEV5SJNOFIVS4TMYYG6TUUS5EXFMAPRJAC","Custom diff separators"],["AJEH3FSPKLBYSRQQQ4UL4QA3SPT4MHIC4VEM3XDVATMFFU3R7JKAC","Properly propagate errors in `libpijul::record::record` instead of unwrap()ing"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","Adding a root inode (aka supporting submodules)"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Cleaunp and proofreading of libpijul::record"]],"deps":["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC"],"known":["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","AJEH3FSPKLBYSRQQQ4UL4QA3SPT4MHIC4VEM3XDVATMFFU3R7JKAC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","2VXTRPO4OML5A2RPI7SAEV5SJNOFIVS4TMYYG6TUUS5EXFMAPRJAC","RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC"]},"hunks":[{"Replacement":{"inode":{"change":9,"pos":488880},"path":"libpijul/src/record.rs","line":314,"ins":{"up_context":[{"change":3,"pos":160}],"down_context":[{"change":3,"pos":126}],"flag":"BLOCK","start":0,"end":31,"inode":{"change":9,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":160},"to":{"change":3,"start":72,"end":126},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":45425},"to":{"change":3,"start":72,"end":126},"introduced_by":3}],"inode":{"change":9,"pos":488880}},"ins_contents":[{"Add":" let cl = move || {"}],"del_contents":[{"Del":" workers.push(std::thread::spawn(move || {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":488880},"path":"libpijul/src/record.rs","line":344,"ins":{"up_context":[{"change":2,"pos":16526}],"down_context":[{"change":3,"pos":46627}],"flag":"BLOCK","start":32,"end":104,"inode":{"change":9,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1424},"to":{"change":3,"start":46611,"end":46627},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":16526},"to":{"change":3,"start":46611,"end":46627},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":46611},"to":{"change":3,"start":46611,"end":46627},"introduced_by":3}],"inode":{"change":9,"pos":488880}},"ins_contents":[{"Add":" };"},{"Add":" workers.push(std::thread::spawn(cl.clone()))"}],"del_contents":[{"Del":" }))\n"}]}},{"Edit":{"inode":{"change":9,"pos":488880},"path":"libpijul/src/record.rs","line":545,"atom":{"NewVertex":{"up_context":[{"change":10,"pos":1}],"down_context":[{"change":2,"pos":16624}],"flag":"BLOCK","start":105,"end":7302,"inode":{"change":9,"pos":488880}}},"contents":[{"Add":" pub fn record_single_thread("},{"Add":" &mut self,"},{"Add":" txn: ArcTxn,"},{"Add":" diff_algorithm: diff::Algorithm,"},{"Add":" stop_early: bool,"},{"Add":" diff_separator: ®ex::bytes::Regex,"},{"Add":" channel: ChannelRef,"},{"Add":" working_copy: &W,"},{"Add":" changes: &C,"},{"Add":" prefix: &str,"},{"Add":" ) -> Result<(), RecordError>"},{"Add":" where"},{"Add":" T: ChannelMutTxnT + TreeTxnT,"},{"Add":" ::Error: 'static,"},{"Add":" {"},{"Add":" info!(\"Starting to record\");"},{"Add":" let now = std::time::Instant::now();"},{"Add":" let mut stack = vec![(RecordItem::root(), components(prefix))];"},{"Add":" while let Some((mut item, mut components)) = stack.pop() {"},{"Add":" debug!(\"stack.pop() = Some({:?})\", item);"},{"Add":""},{"Add":" // Check for moves and file conflicts."},{"Add":" let vertex: Option>> ="},{"Add":" self.recorded_inodes.lock().get(&item.inode).cloned();"},{"Add":""},{"Add":" let mut root_vertices = Vec::new();"},{"Add":""},{"Add":" let vertex = if let Some(vertex) = vertex {"},{"Add":" vertex"},{"Add":" } else if item.inode == Inode::ROOT {"},{"Add":" debug!(\"TAKING LOCK {}\", line!());"},{"Add":" let txn = txn.read();"},{"Add":" debug!(\"TAKEN\");"},{"Add":" let channel = channel.r.read();"},{"Add":""},{"Add":" // Test for a \"root\" vertex below the null one."},{"Add":" let f0 = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" let f1 = f0 | EdgeFlags::PSEUDO;"},{"Add":" self.recorded_inodes"},{"Add":" .lock()"},{"Add":" .insert(Inode::ROOT, Position::ROOT.to_option());"},{"Add":" let mut has_nonempty_root = false;"},{"Add":" for e in iter_adjacent(&*txn, txn.graph(&*channel), Vertex::ROOT, f0, f1)? {"},{"Add":" let e = e?;"},{"Add":" let child = txn.find_block(txn.graph(&*channel), e.dest()).unwrap();"},{"Add":" if child.start == child.end {"},{"Add":" // This is the \"new\" format, with multiple"},{"Add":" // roots, and `grandchild` is one of the"},{"Add":" // roots."},{"Add":" let grandchild ="},{"Add":" iter_adjacent(&*txn, txn.graph(&*channel), *child, f0, f1)?"},{"Add":" .next()"},{"Add":" .unwrap()?"},{"Add":" .dest();"},{"Add":" root_vertices.push(grandchild);"},{"Add":" self.delete_obsolete_children("},{"Add":" &*txn,"},{"Add":" txn.graph(&channel),"},{"Add":" working_copy,"},{"Add":" changes,"},{"Add":" &item.full_path,"},{"Add":" grandchild,"},{"Add":" )?;"},{"Add":" } else {"},{"Add":" // Single-root repository, we need to follow"},{"Add":" // the root's children."},{"Add":" has_nonempty_root = true"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"has_nonempty_root: {:?}\", has_nonempty_root);"},{"Add":" debug!(\"root_vertices: {:?}\", root_vertices);"},{"Add":" if has_nonempty_root && !root_vertices.is_empty() {"},{"Add":" // This repository is mixed between \"zero\" roots,"},{"Add":" // and new-style-roots."},{"Add":" root_vertices.push(Position::ROOT)"},{"Add":" }"},{"Add":" Position::ROOT.to_option()"},{"Add":" } else if let Some(vertex) = get_inodes_::<_, C, W>(&txn, &channel, &item.inode)? {"},{"Add":" {"},{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.r.read();"},{"Add":" let graph = txn.graph(&*channel);"},{"Add":" self.delete_obsolete_children("},{"Add":" &*txn,"},{"Add":" &graph,"},{"Add":" working_copy,"},{"Add":" changes,"},{"Add":" &item.full_path,"},{"Add":" vertex,"},{"Add":" )?;"},{"Add":" }"},{"Add":""},{"Add":" let rec = self.recorded();"},{"Add":" let new_papa = {"},{"Add":" let mut recorded = self.recorded_inodes.lock();"},{"Add":" recorded.insert(item.inode, vertex.to_option());"},{"Add":" recorded.get(&item.papa).cloned()"},{"Add":" };"},{"Add":""},{"Add":" rec.lock().record_existing_file("},{"Add":" &txn,"},{"Add":" diff_algorithm,"},{"Add":" stop_early,"},{"Add":" &diff_separator,"},{"Add":" &channel,"},{"Add":" working_copy.clone(),"},{"Add":" changes,"},{"Add":" &item,"},{"Add":" new_papa,"},{"Add":" vertex,"},{"Add":" )?;"},{"Add":""},{"Add":" vertex.to_option()"},{"Add":" } else {"},{"Add":" let rec = self.recorded();"},{"Add":" debug!(\"TAKING LOCK {}\", line!());"},{"Add":" let mut rec = rec.lock();"},{"Add":" match rec.add_file(working_copy, item.clone()) {"},{"Add":" Ok(Some(vertex)) => {"},{"Add":" // Path addition (maybe just a single directory)."},{"Add":" self.recorded_inodes.lock().insert(item.inode, vertex);"},{"Add":" vertex"},{"Add":" }"},{"Add":" _ => continue,"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" if root_vertices.is_empty() {"},{"Add":" // Move on to the next step."},{"Add":" debug!(\"TAKING LOCK {}\", line!());"},{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.r.read();"},{"Add":" self.push_children::<_, _, C>("},{"Add":" &*txn,"},{"Add":" &*channel,"},{"Add":" working_copy,"},{"Add":" &mut item,"},{"Add":" &mut components,"},{"Add":" vertex,"},{"Add":" &mut stack,"},{"Add":" prefix,"},{"Add":" changes,"},{"Add":" )?;"},{"Add":" } else {"},{"Add":" for vertex in root_vertices {"},{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.r.read();"},{"Add":" if !vertex.change.is_root() {"},{"Add":" let mut r = self.new_root.lock();"},{"Add":" let age = txn"},{"Add":" .get_changeset(txn.changes(&*channel), &vertex.change)?"},{"Add":" .unwrap();"},{"Add":" if let Some((_, a)) = *r {"},{"Add":" if a < (*age).into() {"},{"Add":" *r = Some((vertex.to_option(), (*age).into()))"},{"Add":" }"},{"Add":" } else {"},{"Add":" *r = Some((vertex.to_option(), (*age).into()))"},{"Add":" }"},{"Add":" }"},{"Add":" item.v_papa = vertex.to_option();"},{"Add":" self.push_children::<_, _, C>("},{"Add":" &*txn,"},{"Add":" &*channel,"},{"Add":" working_copy,"},{"Add":" &mut item,"},{"Add":" &mut components,"},{"Add":" vertex.to_option(),"},{"Add":" &mut stack,"},{"Add":" prefix,"},{"Add":" changes,"},{"Add":" )?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" crate::TIMERS.lock().unwrap().record += now.elapsed();"},{"Add":" info!(\"record done\");"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""}]}}],"owner":"irevoire","repo":"pijul","token":"Gxzi96x5HDD9O+AWELX37ZC4cCTmhb5le6DN+S3GJuk=","login":null}

…

Dependencies

Change contents