pijul/pijul - Change ZJWCPRMHAYZYGCPYBTBIPBBFVCVDSFNGUL36HMC2DHCWZZKNA7PAC

Fixing known patches in deleted contexts

When a patch A introduces a vertex in a deleted context, the edges deleting the context may be introduced by a patch B that knows about A, in which case this is not a conflict. Also, this makes this case symmetric with the other (more common) case where a context deletion is applied after the vertex is introduced.

Created by pmeunier on April 30, 2022

ZJWCPRMHAYZYGCPYBTBIPBBFVCVDSFNGUL36HMC2DHCWZZKNA7PAC

Dependencies

In channels

main

Change contents

Deletion in libpijul/src/unrecord/mod.rs at line 180 [6.231493]
B:BD[4.24110] → [5.30164:30188]
```
                change,
```
Deletion in libpijul/src/unrecord/mod.rs at line 391 [6.231493]
B:BD[6.240533] → [5.30189:30210]
```
    change: &Change,
```

Insertion in libpijul/src/unrecord/mod.rs at line 434 [6.231493]

[7.1099]

[6.240757]

    let hash: Hash = (*txn.get_external(&change_id).unwrap().unwrap()).into();

Replacement in libpijul/src/unrecord/mod.rs at line 445 [6.231493]

∅:D[7.1146] → [5.30211:30244]

B:BD[6.241619] → [5.30211:30244]

            |h| change.knows(h),

[7.1146]

[6.241619]

            |h| {
                if edge.previous.contains(EdgeFlags::DELETED) {
                    // When reintroducing a deleted flag, check whether
                    // the re-introduction patch knows about the alive
                    // edges around the target.
                    changes
                        .knows(edge.introduced_by.as_ref().unwrap_or(&hash), h)
                        .unwrap()
                } else {
                    // When the edge we are re-introducing is not a
                    // deletion edge, this check isn't actually used: the
                    // only zombies in that case are from a deleted
                    // context, and these aren't detected with known
                    // patches.
                    true
                }
            },

Replacement in libpijul/src/apply.rs at line 176 [6.944089]

B:BD[6.945713] → [2.41267:41406]

    Ok(
        apply_change_to_channel(txn, channel, internal, &hash, &change, workspace)
            .map_err(ApplyError::LocalChange)?,

[6.945713]

[2.41406]

    Ok(apply_change_to_channel(
        txn,
        channel,
        &mut |h| changes.knows(h, hash).unwrap(),
        internal,
        &hash,
        &change,
        workspace,

Insertion in libpijul/src/apply.rs at line 185 [6.944089]
[2.41412]
[6.945917]
```
    .map_err(ApplyError::LocalChange)?)
```

Replacement in libpijul/src/apply.rs at line 239 [6.944089]

B:BD[6.947384] → [2.41457:41604]

                apply_change_to_channel(txn, channel, internal, &hash, &change, workspace)
                    .map_err(ApplyError::LocalChange)?;

[6.947384]

[6.947698]

                apply_change_to_channel(
                    txn,
                    channel,
                    &mut |h| changes.knows(h, &hash).unwrap(),
                    internal,
                    &hash,
                    &change,
                    workspace,
                )
                .map_err(ApplyError::LocalChange)?;

Replacement in libpijul/src/apply.rs at line 299 [6.944089]

B:BD[6.948456] → [2.41759:41817]

fn apply_change_to_channel<T: ChannelMutTxnT + TreeTxnT>(

[6.948456]

[6.948727]

fn apply_change_to_channel<T: ChannelMutTxnT + TreeTxnT, F: FnMut(&Hash) -> bool>(

Insertion in libpijul/src/apply.rs at line 302 [6.944089]
[8.64811]
[6.948774]
```
    changes: &mut F,
```

Replacement in libpijul/src/apply.rs at line 323 [6.944089]

B:BD[6.949433] → [4.125802:125846]

B:BD[4.125846] → [8.64950:65039]

∅:D[8.65039] → [4.125932:125950]

B:BD[4.125932] → [4.125932:125950]

                Atom::NewVertex(ref n) => {
                    put_newvertex(txn, T::graph_mut(channel), change, ws, change_id, n)?
                }

[6.949433]

[6.949531]

                Atom::NewVertex(ref n) => put_newvertex(
                    txn,
                    T::graph_mut(channel),
                    changes,
                    change,
                    ws,
                    change_id,
                    n,
                )?,

Replacement in libpijul/src/apply.rs at line 424 [6.944089]

∅:D[9.96399] → [10.227:321]

∅:D[4.127224] → [10.227:321]

∅:D[11.144461] → [10.227:321]

B:BD[12.67381] → [10.227:321]

    let n = apply_change_to_channel(txn, &mut channel, internal, &hash, &change, workspace)?;

[11.144461]

[6.953210]

    let n = apply_change_to_channel(
        txn,
        &mut channel,
        &mut |_| true,
        internal,
        &hash,
        &change,
        workspace,
    )?;

Replacement in libpijul/src/apply/vertex.rs at line 6 [5.90459]

B:BD[5.90614] → [2.43140:43190]

pub fn put_newvertex<T: GraphMutTxnT + TreeTxnT>(

[5.90614]

[5.90653]

pub fn put_newvertex<T: GraphMutTxnT + TreeTxnT, F: FnMut(&Hash) -> bool>(

Insertion in libpijul/src/apply/vertex.rs at line 9 [5.90459]
[5.90696]
[5.90696]
```
    changes: &mut F,
```

Replacement in libpijul/src/apply/vertex.rs at line 33 [5.90459]

B:BD[5.91421] → [5.91421:91512]

        if put_up_context(txn, graph, ch, ws, up)? && n.flag.contains(EdgeFlags::FOLDER) {

[5.91421]

[5.91512]

        if put_up_context(txn, graph, changes, ws, up)? && n.flag.contains(EdgeFlags::FOLDER) {

Replacement in libpijul/src/apply/vertex.rs at line 74 [5.90459]

B:BD[5.92874] → [2.43230:43277]

fn put_up_context<T: GraphMutTxnT + TreeTxnT>(

[5.92874]

[5.92910]

fn put_up_context<T: GraphMutTxnT + TreeTxnT, F: FnMut(&Hash) -> bool>(

Replacement in libpijul/src/apply/vertex.rs at line 77 [5.90459]
B:BD[5.92953] → [5.92953:92970]
```
    ch: &Change,
```
[5.92953]
[5.92970]
```
    knows: &mut F,
```
Replacement in libpijul/src/apply/vertex.rs at line 114 [5.90459]
B:BD[5.94393] → [5.94393:94436]
```
            if !ch.knows(&introduced_by) {
```
[5.94393]
[5.94436]
```
            if !knows(&introduced_by) {
```

Insertion in libpijul/src/apply/edge.rs at line 86 [5.96160]

[5.98589]

[3.855]

                debug!("putting zombie {:?} {:?} {:?}", source, target, intro);

Insertion in libpijul/src/apply/edge.rs at line 146 [5.96160]
[5.100159]
[5.100159]
```
            debug!("known {:?} ?", intro);
```

Fixing known patches in deleted contexts

Dependencies

In channels

Change contents

Deletion in libpijul/src/unrecord/mod.rs at line 180 [6.231493]

Deletion in libpijul/src/unrecord/mod.rs at line 391 [6.231493]

Insertion in libpijul/src/unrecord/mod.rs at line 434 [6.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 445 [6.231493]

Replacement in libpijul/src/apply.rs at line 176 [6.944089]

Insertion in libpijul/src/apply.rs at line 185 [6.944089]

Replacement in libpijul/src/apply.rs at line 239 [6.944089]

Replacement in libpijul/src/apply.rs at line 299 [6.944089]

Insertion in libpijul/src/apply.rs at line 302 [6.944089]

Replacement in libpijul/src/apply.rs at line 323 [6.944089]

Replacement in libpijul/src/apply.rs at line 424 [6.944089]

Replacement in libpijul/src/apply/vertex.rs at line 6 [5.90459]

Insertion in libpijul/src/apply/vertex.rs at line 9 [5.90459]

Replacement in libpijul/src/apply/vertex.rs at line 33 [5.90459]

Replacement in libpijul/src/apply/vertex.rs at line 74 [5.90459]

Replacement in libpijul/src/apply/vertex.rs at line 77 [5.90459]

Replacement in libpijul/src/apply/vertex.rs at line 114 [5.90459]

Insertion in libpijul/src/apply/edge.rs at line 86 [5.96160]

Insertion in libpijul/src/apply/edge.rs at line 146 [5.96160]