pijul/pijul - Change JACZYXK43IU5HWLHQBY3BOAE7CUO6NGEXQ3HSZL3CQP3SLGKMBOAC

Fixing a bug in unrecord

Created by pmeunier on January 7, 2021

JACZYXK43IU5HWLHQBY3BOAE7CUO6NGEXQ3HSZL3CQP3SLGKMBOAC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/remote/mod.rs at line 94 [4.52474]
[3.772]
[4.54644]
```
                root: Path::new(name).to_path_buf(),
```

Replacement in libpijul/src/vertex_buffer.rs at line 79 [4.217202]

B:BD[4.219820] → [5.5737:5817]

    fn output_line<E, C>(&mut self, _: Vertex<ChangeId>, c: C) -> Result<(), E>

[4.219820]

[5.5817]

    fn output_line<E, C>(&mut self, v: Vertex<ChangeId>, c: C) -> Result<(), E>

Insertion in libpijul/src/vertex_buffer.rs at line 86 [4.217202]
[4.220046]
[4.220046]
```
        debug!("vbuf {:?} {:?}", v, std::str::from_utf8(&self.buf));
```

Replacement in libpijul/src/vertex_buffer.rs at line 168 [4.217202]

B:BD[4.222360] → [5.6212:6292]

    fn output_line<E, C>(&mut self, _: Vertex<ChangeId>, c: C) -> Result<(), E>

[4.222360]

[5.6292]

    fn output_line<E, C>(&mut self, v: Vertex<ChangeId>, c: C) -> Result<(), E>

Insertion in libpijul/src/vertex_buffer.rs at line 175 [4.217202]
[4.222586]
[4.222586]
```
        debug!("vbuf {:?} {:?}", v, std::str::from_utf8(&self.buf));
```

Replacement in libpijul/src/unrecord/mod.rs at line 522 [4.231493]

B:BD[4.247825] → [4.247825:247885]

                |h| changes.knows(&intro_ext, &h).unwrap(),

[4.247825]

[6.4025]

                |h| changes.knows(&change_hash, &h).unwrap(),

Insertion in libpijul/src/missing_context.rs at line 172 [4.696460]
[2.89764]
[6.11056]
```
        debug!("deleted by unknown, repairing {:?}", source);
```

Replacement in libpijul/src/missing_context.rs at line 177 [4.696460]

B:BD[6.11219] → [6.11219:11301]

    reconnect_target_down(txn, channel, ws, inode, target, change_id, &mut known)

[6.11219]

[6.11301]

    if e.flag.contains(EdgeFlags::BLOCK) {
        repair_missing_down_context(txn, channel, ws, inode, target, &[target])?;
    } else if is_alive(txn, channel, source)? {
        repair_missing_down_context(txn, channel, ws, inode, target, &[source])?;
    }
    Ok(())

Deletion in libpijul/src/missing_context.rs at line 209 [4.696460]

∅:D[6.11910] → [4.704864:704870]

B:BD[4.704864] → [4.704864:704870]

B:BD[4.704870] → [6.11911:11924]

∅:D[6.11924] → [4.704870:704871]

B:BD[4.704870] → [4.704870:704871]

B:BD[4.704871] → [2.89964:90010]

∅:D[2.90010] → [6.11966:11983]

B:BD[6.11966] → [6.11966:11983]

B:BD[6.11983] → [2.90011:90039]

∅:D[2.90039] → [6.12013:12146]

B:BD[6.12013] → [6.12013:12146]

B:BD[6.12146] → [2.90040:90085]

∅:D[2.90085] → [6.12186:12222]

B:BD[6.12186] → [6.12186:12222]

∅:D[6.12222] → [4.704871:705017]

B:BD[4.704871] → [4.704871:705017]

B:BD[4.705017] → [2.90086:90157]

∅:D[7.57956] → [4.705105:705429]

∅:D[2.90157] → [4.705105:705429]

∅:D[6.12273] → [4.705105:705429]

B:BD[4.705105] → [4.705105:705429]

B:BD[4.705429] → [2.90158:90223]

∅:D[2.90223] → [4.705493:705601]

B:BD[4.705493] → [4.705493:705601]

    }
    Ok(())
}
fn reconnect_target_down<T: GraphMutTxnT, K>(
    txn: &mut T,
    channel: &mut T::Graph,
    ws: &mut Workspace,
    inode: Position<Option<Hash>>,
    target: Vertex<ChangeId>,
    change_id: ChangeId,
    known: &mut K,
) -> Result<(), MissingError<T::GraphError>>
where
    K: FnMut(Hash) -> bool,
{
    // Finally, we fix the down context of target, i.e. collecting unknown deleted children.
    let mut children_are_deleted_by_unknown = false;
    for v in iter_adj_all(txn, channel, target)? {
        let v = v?;
        if !v.flag.contains(EdgeFlags::DELETED)
            || v.flag.contains(EdgeFlags::PARENT)
            || v.introduced_by == change_id
            || v.dest.change.is_root()
            || v.introduced_by.is_root()
        {
            continue;
        }
        // This unwrap is ok, since `v` is in the channel.
        let intro = txn.get_external(v.introduced_by)?.unwrap();
        if !known(intro) {
            children_are_deleted_by_unknown = true;
            break;
        }

Deletion in libpijul/src/missing_context.rs at line 210 [4.696460]

B:BD[4.705607] → [4.705607:705736]

    if children_are_deleted_by_unknown {
        repair_missing_down_context(txn, channel, ws, inode, target, &[target])?;
    }

Replacement in libpijul/src/alive/retrieve.rs at line 59 [4.984582]
B:BD[4.986530] → [4.986530:986574]
```
            debug!("child {:?}", dest_vid);
```
[4.986530]
[4.986574]
```
            trace!("child {:?}", dest_vid);
```
Insertion in libpijul/src/alive/retrieve.rs at line 77 [4.984582]
[2.134778]
[2.134778]
```
        debug!("not alive: {:?}", vertex);
```
Insertion in libpijul/src/alive/retrieve.rs at line 96 [4.984582]
[8.2210]
[2.135224]
```
    debug!("flags for {:?}: {:?}", vertex, flags);
```

Fixing a bug in unrecord

Dependencies

In channels

Change contents

Insertion in pijul/src/remote/mod.rs at line 94 [4.52474]

Replacement in libpijul/src/vertex_buffer.rs at line 79 [4.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 86 [4.217202]

Replacement in libpijul/src/vertex_buffer.rs at line 168 [4.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 175 [4.217202]

Replacement in libpijul/src/unrecord/mod.rs at line 522 [4.231493]

Insertion in libpijul/src/missing_context.rs at line 172 [4.696460]

Replacement in libpijul/src/missing_context.rs at line 177 [4.696460]

Deletion in libpijul/src/missing_context.rs at line 209 [4.696460]

Deletion in libpijul/src/missing_context.rs at line 210 [4.696460]

Replacement in libpijul/src/alive/retrieve.rs at line 59 [4.984582]

Insertion in libpijul/src/alive/retrieve.rs at line 77 [4.984582]

Insertion in libpijul/src/alive/retrieve.rs at line 96 [4.984582]