Fixing git import, and adding more useful feedback (with `RUST_LOG="pijul=info"`)

[?]
Nov 17, 2020, 12:07 PM
CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC

Dependencies

  • [2] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

  • replacement in pijul/src/commands/git.rs at line 262
    [2.145258][2.145258:145293]()
    info!("TODO: {:?}", todo);
    [2.145258]
    [2.145293]
    debug!("TODO: {:?}", todo);
  • replacement in pijul/src/commands/git.rs at line 575
    [2.157384][2.157384:157433]()
    info!("record prefixes {:?}", prefixes);
    [2.157384]
    [2.157433]
    debug!("record prefixes {:?}", prefixes);
  • replacement in pijul/src/commands/git.rs at line 603
    [2.158287][2.158287:158352]()
    info!("recording on channel {:?}", channel.borrow().name());
    [2.158287]
    [2.158352]
    debug!("recording on channel {:?}", channel.borrow().name());
  • edit in pijul/src/commands/git.rs at line 607
    [2.158463]
    [2.158463]
    if let Some(msg) = commit.message() {
    info!("Importing commit {:?}: {}", child, msg);
    } else {
    info!("Importing commit {:?} (no message)", child);
    }
  • replacement in pijul/src/commands/git.rs at line 668
    [2.160306][2.160306:160364]()
    Ok(txn.current_state(&channel.borrow()).unwrap())
    [2.160306]
    [2.160364]
    Ok(txn
    .current_state(&channel.borrow())
    .unwrap_or(Merkle::zero()))