Fixing a bug introduced by the recent refactoring

[?]
Jan 5, 2021, 6:31 PM
2BKYJ2JM5PTXWO6HTVBKFQANWWSCJ4UHJYKAXWGTVZB35AZJ76CQC

Dependencies

  • [2] 6YMDOZIB Refactoring apply
  • [3] I52XSRUH Massive cleanup, and simplification
  • [4] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
  • [5] BXD3IQYN Fixing --features git
  • [6] HMMMKONL Fixing alive vertices
  • [7] GHO6DWPI Refactoring iterators
  • [8] VO5OQW4W Removing anyhow in libpijul
  • [9] BD5PC25A Deleting conflict resolution vertices when the sides are deleted
  • [*] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

  • replacement in libpijul/src/pristine/mod.rs at line 1715
    [3.3146][3.907:964]()
    panic!("alive call line {}: {:?}", line, alive);
    [3.3146]
    [3.3190]
    if !alive.is_empty() {
    panic!("alive call line {}: {:?}", line, alive);
    } else {
    panic!("reachable: {:?}", reachable);
    }
  • edit in libpijul/src/apply.rs at line 819
    [2.21011]
    [2.21011]
    debug!(
    "Deleting {:?} {:?} {:?} {:?}",
    a, b, p.introduced_by, p.flag
    );
  • edit in libpijul/src/apply.rs at line 832
    [11.972877]
    [2.21228]
    debug!("repair down");
  • replacement in libpijul/src/apply.rs at line 843
    [2.21475][2.21475:21515]()
    } else if !p.flag.is_folder() {
    [2.21475]
    [2.21515]
    } else if b_is_alive && !p.flag.is_folder() {
    debug!("repair up");