ilyagr/pijul - Change BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC

Fixing --features git

Created by pmeunier on November 26, 2020

BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/commands/git.rs at line 8 [5.137210]
[3.16]
[4.2264]
```
use libpijul::pristine::*;
```

Replacement in pijul/src/commands/git.rs at line 238 [5.137210]

B:BD[5.144337] → [5.144337:144396]

                .changeid_rev_log(&channel.borrow(), None)

[5.144337]

[5.144396]

                .changeid_reverse_log(&channel.borrow(), None)

Replacement in pijul/src/commands/git.rs at line 408 [5.137210]

B:BD[5.150512] → [5.150512:150581]

            check_alive(&repo.repo.changes, txn, channel, line!())?;

[5.150512]

[5.150581]

            check_alive_debug(&repo.repo.changes, txn, channel, line!())?;

Replacement in pijul/src/commands/git.rs at line 412 [5.137210]

B:BD[5.150649] → [5.150649:150714]

        check_alive(&repo.repo.changes, txn, channel, line!())?;

[5.150649]

[5.150714]

        check_alive_debug(&repo.repo.changes, txn, channel, line!())?;

Deletion in pijul/src/commands/git.rs at line 419 [5.137210]

B:BD[5.150885] → [5.150885:151008]

    if repo.check > 0 && repo.n % repo.check == 0 && !to_apply.is_empty() {
        txn.check_channel_log(&channel);
    }

Replacement in pijul/src/commands/git.rs at line 436 [5.137210]

B:BD[5.151569] → [5.151569:151638]

            check_alive(&repo.repo.changes, txn, channel, line!())?;

[5.151569]

[5.151638]

            check_alive_debug(&repo.repo.changes, txn, channel, line!())?;

Replacement in pijul/src/commands/git.rs at line 648 [5.137210]

B:BD[5.159718] → [5.159718:159783]

        check_alive(&repo.repo.changes, txn, channel, line!())?;

[5.159718]

[5.159783]

        check_alive_debug(&repo.repo.changes, txn, channel, line!())?;

Deletion in pijul/src/commands/git.rs at line 819 [5.137210]

B:BD[5.165170] → [5.165170:167862]


/// Check that each alive vertex in the graph is reachable, and vice-versa.
fn check_alive<T: TxnT, C: libpijul::changestore::ChangeStore>(
    changes: &C,
    txn: &T,
    channel: &ChannelRef<T>,
    line: u32,
) -> Result<(), anyhow::Error> {
    let (alive, reachable) = txn.check_alive(&channel);
    let mut h = BTreeSet::new();
    if !alive.is_empty() {
        for (k, file) in alive.iter() {
            debug!("alive = {:?}, file = {:?}", k, file);
            h.insert(file);
        }
    }
    if !reachable.is_empty() {
        for (k, file) in reachable.iter() {
            debug!("reachable = {:?}, file = {:?}", k, file);
            h.insert(file);
        }
    }
    for file in h.iter() {
        let file_ = file.unwrap().start_pos();
        let mut f = std::fs::File::create(&format!("debug_{:?}", file_))?;
        let graph = libpijul::alive::retrieve::retrieve(txn, &channel.borrow(), file_);
        graph.debug(changes, txn, &channel.borrow(), false, false, &mut f)?;
        let mut f = std::fs::File::create(&format!("debug_all_{:?}", file_))?;
        txn.debug_root(channel, file.unwrap(), &mut f)?;
    }
    if !h.is_empty() {
        panic!("alive call line {}", line);
    }
    Ok(())
}
/// Check that each inode in the inodes table maps to an alive vertex,
/// and that each inode in the tree table is reachable by only one
/// path.
fn check_tree_inodes<T: TxnT>(txn: &T, channel: &Channel<T>) {
    // Sanity check
    for (inode, vertex) in txn.iter_inodes() {
        let mut inode_ = inode;
        while !inode_.is_root() {
            if let Some(next) = txn.get_revtree(inode_, None) {
                inode_ = next.parent_inode;
            } else {
                panic!("inode = {:?}, inode_ = {:?}", inode, inode_);
            }
        }
        if !txn.is_alive(&channel, vertex.inode_vertex()) {
            for e in txn.iter_adjacent(
                &channel,
                vertex.inode_vertex(),
                EdgeFlags::empty(),
                EdgeFlags::all(),
            ) {
                error!("{:?} {:?} {:?}", inode, vertex, e)
            }
            panic!(
                "inode {:?}, vertex {:?}, is not alive, {:?}",
                inode,
                vertex,
                txn.tree_path(vertex)
            )
        }
    }
    let mut h = HashMap::new();
    let id0 = OwnedPathId {
        parent_inode: Inode::ROOT,
        basename: libpijul::small_string::SmallString::new(),
    };
    for (id, inode) in txn.iter_tree(id0, None) {
        if let Some(inode_) = h.insert(id.clone(), inode) {
            panic!("id {:?} maps to two inodes: {:?} {:?}", id, inode, inode_);
        }
    }
}

Deletion in libpijul/src/pristine/mod.rs at line 582 [5.586748]
B:BD[5.612336] → [2.45938:45951]
```
#[cfg(test)]
```
Deletion in libpijul/src/pristine/mod.rs at line 653 [5.586748]
B:BD[2.48272] → [2.48272:48285]
```
#[cfg(test)]
```
Replacement in libpijul/src/pristine/mod.rs at line 681 [5.586748]
B:BD[5.616291] → [2.49042:49091]
```
pub(crate) fn debug_root_rev<W: Write, T: TxnT>(
```
[5.616291]
[2.49091]
```
pub(crate) fn debug_root<W: Write, T: TxnT>(
```

Insertion in libpijul/src/pristine/mod.rs at line 1312 [5.586748]

[2.55588]


/// Check that each inode in the inodes table maps to an alive vertex,
/// and that each inode in the tree table is reachable by only one
/// path.
pub fn check_tree_inodes<T: TxnT>(txn: &T, channel: &Channel<T>) {
    // Sanity check
    for (inode, vertex) in txn.iter_inodes() {
        let mut inode_ = inode;
        while !inode_.is_root() {
            if let Some(next) = txn.get_revtree(inode_, None) {
                inode_ = next.parent_inode;
            } else {
                panic!("inode = {:?}, inode_ = {:?}", inode, inode_);
            }
        }
        if !is_alive(txn, &channel, vertex.inode_vertex()) {
            for e in iter_adjacent(
                txn,
                &channel,
                vertex.inode_vertex(),
                EdgeFlags::empty(),
                EdgeFlags::all(),
            ) {
                error!("{:?} {:?} {:?}", inode, vertex, e)
            }
            panic!(
                "inode {:?}, vertex {:?}, is not alive, {:?}",
                inode,
                vertex,
                tree_path(txn, vertex)
            )
        }
    }
    let mut h = HashMap::new();
    let id0 = OwnedPathId {
        parent_inode: Inode::ROOT,
        basename: crate::small_string::SmallString::new(),
    };
    for (id, inode) in txn.iter_tree(id0, None) {
        if let Some(inode_) = h.insert(id.clone(), inode) {
            panic!("id {:?} maps to two inodes: {:?} {:?}", id, inode, inode_);
        }
    }
}
/// Check that each alive vertex in the graph is reachable, and vice-versa.
pub fn check_alive_debug<T: TxnT, C: crate::changestore::ChangeStore>(
    changes: &C,
    txn: &T,
    channel: &ChannelRef<T>,
    line: u32,
) -> Result<(), anyhow::Error> {
    let (alive, reachable) = crate::pristine::check_alive(txn, &channel);
    let mut h = HashSet::new();
    if !alive.is_empty() {
        for (k, file) in alive.iter() {
            debug!("alive = {:?}, file = {:?}", k, file);
            h.insert(file);
        }
    }
    if !reachable.is_empty() {
        for (k, file) in reachable.iter() {
            debug!("reachable = {:?}, file = {:?}", k, file);
            h.insert(file);
        }
    }
    for file in h.iter() {
        let file_ = file.unwrap().start_pos();
        let mut f = std::fs::File::create(&format!("debug_{:?}", file_))?;
        let graph = crate::alive::retrieve::retrieve(txn, &channel.borrow(), file_);
        graph.debug(changes, txn, &channel.borrow(), false, false, &mut f)?;
        let mut f = std::fs::File::create(&format!("debug_all_{:?}", file_))?;
        let channel = channel.borrow();
        debug_root(txn, &channel, file.unwrap(), &mut f)?;
    }
    if !h.is_empty() {
        panic!("alive call line {}", line);
    }
    Ok(())
}

Replacement in libpijul/src/output/mod.rs at line 100 [5.686190]

B:BD[5.688970] → [2.56808:56894]

            debug_root_rev(txn, channel, child.dest.inode_vertex(), &mut f).unwrap();

[5.688970]

[5.689072]

            debug_root(txn, channel, child.dest.inode_vertex(), &mut f).unwrap();

Replacement in libpijul/src/lib.rs at line 97 [5.717381]

B:BD[2.60252] → [2.60252:60358]

    Base32, ChangeId, Channel, ChannelRef, EdgeFlags, Hash, Merkle, MutTxnT, RemoteRef, TxnT,
    Vertex,

[2.60252]

[2.60358]

    Base32, ChangeId, Channel, ChannelRef, EdgeFlags, Hash, Inode, Merkle, MutTxnT, OwnedPathId,
    RemoteRef, TxnT, Vertex,