Fixing alive vertices

Dependencies

• [2] 7A2TSC4P Conflict solving code (FOLDER edges)
• [3] 5BRU2RRW Cleanup (debugging a crash related to trees/inodes)
• [4] WZVCLZKY address clippy lints
• [5] VO5OQW4W Removing anyhow in libpijul
• [6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [7] 74HX2XZD Cleanup and debugging
• [8] I52XSRUH Massive cleanup, and simplification
• [9] 43AJ37IX Getting rid of edge validation, which does not work for zombie conflicts
• [10] BXD3IQYN Fixing --features git

Change contents

• replacement in pijul/src/commands/debug.rs at line 6
  [3.16]→[3.16:62](∅→∅)
  − use libpijul::{Base32, TxnT};

  − use log::debug;
  [3.16]

  [3.177836]
  + use libpijul::TxnT;
• edit in pijul/src/commands/debug.rs at line 14
  [3.178003]

  [3.178003]
  + root: Option<String>,
• edit in pijul/src/commands/debug.rs at line 25
  [3.5818]→[3.115:256](∅→∅)
  − let c: libpijul::ChangeId = libpijul::ChangeId::from_base32(b"L4ITS7QS3M4P6").unwrap();

  − debug!("{:?}", txn.get_external(c));
• replacement in pijul/src/commands/debug.rs at line 34
  [3.178559]→[3.178559:178599](∅→∅),[3.178599]→[3.5819:5890](∅→∅)
  − let channel = channel.borrow();

  − libpijul::pristine::debug(&txn, &channel, std::io::stdout())?;
  [3.178559]

  [3.178648]
  + {

  + let channel = channel.borrow();

  + libpijul::pristine::debug(&txn, &channel, std::io::stdout())?;

  + }

  + libpijul::pristine::check_alive_debug(&repo.changes, &txn, &channel, 0)?;
• replacement in libpijul/src/pristine/mod.rs at line 482
  [3.42740]→[2.116:168](∅→∅)
  − .any(|e| e.flag.contains(EdgeFlags::BLOCK))
  [3.42740]

  [3.42868]
  + .any(|e| {

  + !e.flag.contains(EdgeFlags::PSEUDO)

  + && (e.flag.contains(EdgeFlags::BLOCK) || a.is_empty())

  + })
• edit in libpijul/src/pristine/mod.rs at line 667
  [3.4517]

  [3.4517]
  + && (v.flag.contains(EdgeFlags::BLOCK) || k.is_empty())
• replacement in libpijul/src/pristine/mod.rs at line 1445
  [3.2701]→[3.2701:2776](∅→∅)
  − let mut f = std::fs::File::create(&format!("debug_{:?}", file_))?;
  [3.2701]

  [3.2776]
  +

  + let (path, _) = crate::fs::find_path(changes, txn, &channel.borrow(), true, file_).unwrap();

  + let path = path.replace("/", "_");

  + let name = format!(

  + "debug_{:?}_{}_{}",

  + path,

  + file_.change.to_base32(),

  + file_.pos.0

  + );

  + let mut f = std::fs::File::create(&name)?;
• replacement in libpijul/src/pristine/mod.rs at line 1458
  [3.2939]→[3.2939:3018](∅→∅)
  − let mut f = std::fs::File::create(&format!("debug_all_{:?}", file_))?;
  [3.2939]

  [3.3018]
  + let mut f = std::fs::File::create(&format!("{}_all", name))?;
• replacement in libpijul/src/pristine/mod.rs at line 1463
  [3.3146]→[3.3146:3190](∅→∅)
  − panic!("alive call line {}", line);
  [3.3146]

  [3.3190]
  + panic!("alive call line {}: {:?}", line, alive);
• edit in libpijul/src/apply.rs at line 178
  [3.948456]→[3.948456:948511](∅→∅)
  − // org id T9nfH63JFCwYHwPZjZB+12xQEo2fUyo58K1R1FFRZaE=
• replacement in libpijul/src/apply.rs at line 399
  [3.67684]→[2.207:250](∅→∅)
  − let flag = if !vertex.is_empty() {
  [3.67684]

  [2.250]
  + let flag = if n.flag.contains(EdgeFlags::FOLDER) || !vertex.is_empty() {
• replacement in libpijul/src/apply.rs at line 434
  [3.957553]→[3.957553:957608](∅→∅)
  − // org id qJsZsuGOM0pVWr+gR/Q1oondyvfulu/VvSZEXxvzUww=
  [3.957553]

  [3.957608]
  +
• replacement in libpijul/src/apply.rs at line 489
  [3.959207]→[3.959207:959262](∅→∅)
  − // org id wmLgN7MtIkCgY6DOEzzeaGOQtP0X7+eXRCRk23sR/F8=
  [3.959207]

  [3.959262]
  +
• replacement in libpijul/src/apply.rs at line 543
  [3.961117]→[3.961117:961172](∅→∅)
  − // org id Z9HKWXTmLYMKPH1tSnFV+QYAj3myOwZiyHaaocqlvvU=
  [3.961117]

  [3.961172]
  +
• edit in libpijul/src/apply.rs at line 680
  [3.966141]→[3.966141:966196](∅→∅)
  − // org id 7zbypTSSsas1XfpHlx5O3tLiuSmZZ9+Eq05hBASSbn4=
• replacement in libpijul/src/apply.rs at line 756
  [3.968582]→[3.968582:968637](∅→∅)
  − // org id szeri9Xjwvhn/QRxGYNQRM76Obj5Mxd6Z6KYP1vDdik=
  [3.968582]

  [3.968637]
  +
• replacement in libpijul/src/apply.rs at line 789
  [3.969581]→[3.969581:969636](∅→∅)
  − // org id mkvErN7T/SkmZqqWYdWC3oNTXKi28ZS8zsmBdylcngA=
  [3.969581]

  [3.969636]
  +
• replacement in libpijul/src/apply.rs at line 847
  [3.971196]→[3.971196:971251](∅→∅)
  − // org id 98Q84FaUOk/7navHiQObtyTKOkDVixV8OQF97nuKTPs=
  [3.971196]

  [3.971251]
  +
• replacement in libpijul/src/apply.rs at line 936
  [3.974251]→[3.974251:974306](∅→∅)
  − // org id aio1AtR3Nlw9db3yFD42mkoPf3Bx0O6CI+hHFGjyUO0=
  [3.974251]

  [3.974306]
  +
• replacement in libpijul/src/apply.rs at line 1045
  [3.978575]→[3.978575:978630](∅→∅)
  − // org id JQod1ELUh8e4H59MbZI504jS4RLdF1g3gcZQR16F44o=
  [3.978575]

  [3.978630]
  +