Formatting

pmeunier

Dec 6, 2021, 9:07 PM

43SISRQ4CLKXN5YVFAGWUU3OJBT2TX6QXWWER33ONLEITSCFCUBAC

Dependencies

• [2] U2CGP7OP Record a separate change for Hunk::AddRoot, to avoid #571
• [3] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• replacement in libpijul/src/lib.rs at line 109
  [2.281]→[2.281:402](∅→∅)
  − ) -> Result<Option<(pristine::Hash, u64, pristine::Merkle)>, crate::apply::ApplyError<C::Error, Self::GraphError>> {
  [2.281]

  [2.402]
  + ) -> Result<

  + Option<(pristine::Hash, u64, pristine::Merkle)>,

  + crate::apply::ApplyError<C::Error, Self::GraphError>,

  + > {
• replacement in libpijul/src/apply.rs at line 839
  [2.863]→[2.863:1068](∅→∅)
  − for v in iter_adjacent(&*txn, gr, Vertex::ROOT, EdgeFlags::FOLDER, EdgeFlags::FOLDER|EdgeFlags::BLOCK)? {

  − let v = txn.find_block(gr, v?.dest()).map_err(LocalApplyError::from)?;
  [2.863]

  [2.1068]
  + for v in iter_adjacent(

  + &*txn,

  + gr,

  + Vertex::ROOT,

  + EdgeFlags::FOLDER,

  + EdgeFlags::FOLDER | EdgeFlags::BLOCK,

  + )? {

  + let v = txn

  + .find_block(gr, v?.dest())

  + .map_err(LocalApplyError::from)?;
• replacement in libpijul/src/apply.rs at line 851
  [2.1148]→[2.1148:1184](∅→∅)
  − return Ok(None)
  [2.1148]

  [2.1184]
  + return Ok(None);
• replacement in libpijul/src/apply.rs at line 854
  [2.1265]→[2.1265:1291](∅→∅)
  − break
  [2.1265]

  [2.1291]
  + break;
• replacement in libpijul/src/apply.rs at line 864
  [2.1570]→[2.1570:1660](∅→∅)
  − let contents = rng.sample_iter(rand::distributions::Standard).take(32).collect();
  [2.1570]

  [2.1660]
  + let contents = rng

  + .sample_iter(rand::distributions::Standard)

  + .take(32)

  + .collect();
• replacement in libpijul/src/apply.rs at line 877
  [2.2045]→[2.2045:2107](∅→∅)
  − flag: EdgeFlags::FOLDER|EdgeFlags::BLOCK,
  [2.2045]

  [2.2107]
  + flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,
• replacement in libpijul/src/apply.rs at line 888
  [2.2535]→[2.2535:2597](∅→∅)
  − flag: EdgeFlags::FOLDER|EdgeFlags::BLOCK,
  [2.2535]

  [2.2597]
  + flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,
• replacement in libpijul/src/apply.rs at line 897
  [2.2782]→[2.2782:2875](∅→∅)
  − let h = store.save_change(&mut change, |_, _| Ok(())).map_err(ApplyError::Changestore)?;
  [2.2782]

  [2.2875]
  + let h = store

  + .save_change(&mut change, |_, _| Ok(()))

  + .map_err(ApplyError::Changestore)?;