irevoire/pijul - Change BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC

Deleting conflict resolution vertices when the sides are deleted

This change could not be recorded without itself

Created by pmeunier on December 6, 2020

BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/debug.rs at line 6 [5.177758]
B:BD[4.16] → [3.0:20]
```
use libpijul::TxnT;
```
[4.16]
[5.177836]
```
use libpijul::{TxnT, TxnTExt};
```

Replacement in pijul/src/commands/debug.rs at line 34 [5.177758]

B:BD[5.178559] → [3.48:58]

[5.178559]

[3.58]

        if let Some(root) = self.root {
            let (pos, _) = txn
                .follow_oldest_path(&repo.changes, &channel, &root)
                .unwrap();
            libpijul::pristine::debug_root(
                &txn,
                &channel.borrow(),
                pos.inode_vertex(),
                std::io::stdout(),
                true,
            )?;
        } else {

Deletion in libpijul/src/unrecord/mod.rs at line 162 [5.231493]

B:BD[2.372] → [2.372:530]

                    let mut f = std::fs::File::create("debug_unrecord").unwrap();
                    crate::pristine::debug(txn, &channel, &mut f).unwrap();

Replacement in libpijul/src/pristine/mod.rs at line 710 [5.586748]
B:BD[5.616291] → [6.388:433]
```
pub(crate) fn debug_root<W: Write, T: TxnT>(
```
[5.616291]
[7.49091]
```
#[cfg(debug_assertions)]
pub fn debug_root<W: Write, T: TxnT>(
```
Insertion in libpijul/src/pristine/mod.rs at line 716 [5.586748]
[7.49172]
[8.17879]
```
    down: bool,
```

Replacement in libpijul/src/pristine/mod.rs at line 727 [5.586748]

B:BD[7.49532] → [7.49532:49584]

            if e.flag.contains(EdgeFlags::PARENT) {

[7.49532]

[7.49584]

            if e.flag.contains(EdgeFlags::PARENT) ^ down {

Replacement in libpijul/src/pristine/mod.rs at line 729 [5.586748]

B:BD[7.49642] → [7.49642:49714]

                let v = find_block_end(txn, &channel, e.dest).unwrap();

[7.49642]

[7.49714]

                let v = if e.flag.contains(EdgeFlags::PARENT) {
                    find_block_end(txn, &channel, e.dest).unwrap()
                } else {
                    find_block(txn, &channel, e.dest).unwrap()
                };

Replacement in libpijul/src/pristine/mod.rs at line 1466 [5.586748]

B:BD[6.3058] → [6.3058:3117]

        debug_root(txn, &channel, file.unwrap(), &mut f)?;

[6.3058]

[6.3117]

        debug_root(txn, &channel, file.unwrap(), &mut f, false)?;

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

B:BD[5.688970] → [6.3210:3292]

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

[5.688970]

[5.689072]

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

Replacement in libpijul/src/diff/delete.rs at line 103 [5.805350]

B:BD[5.809020] → [5.809020:809117]

B:BD[5.809117] → [9.593:876]

∅:D[9.876] → [5.809445:809513]

B:BD[5.809445] → [5.809445:809513]

        match diff.marker.get(&diff.pos_a[i].pos) {
            Some(ConflictMarker::Begin) => {
                if let ConflictType::Zombie =
                    diff.conflict_ends[diff.pos_a[i].conflict].conflict_type
                {
                    solved_conflict_end =
                        solved_conflict_end.max(diff.conflict_ends[diff.pos_a[i].conflict].end_pos)
                }
            }
            None => delete_parents(

[5.809020]

[5.809513]

        debug!("pos = {:?} {:?}", diff.pos_a[i].pos, diff.pos_a[i].vertex);
        let marker = diff.marker.get(&diff.pos_a[i].pos);
        if marker.is_none() || (!diff.pos_a[i].vertex.is_root() && diff.pos_a[i].vertex.is_empty())
        {
            debug!("{:?}", diff.vertex(i, pos, end_pos));
            delete_parents(

Replacement in libpijul/src/diff/delete.rs at line 114 [5.805350]

B:BD[5.809674] → [5.809674:809709]

            ),
            _ => {}

[5.809674]

[5.809709]

            )
        } else if let Some(ConflictMarker::Begin) = marker {
            debug!(
                "conflict type = {:#?}",
                diff.conflict_ends[diff.pos_a[i].conflict].conflict_type
            );
            if let ConflictType::Zombie = diff.conflict_ends[diff.pos_a[i].conflict].conflict_type {
                solved_conflict_end =
                    solved_conflict_end.max(diff.conflict_ends[diff.pos_a[i].conflict].end_pos)
            }
        } else {
            debug!("conflict: {:?}", marker);

Replacement in libpijul/src/diff/delete.rs at line 168 [5.805350]

B:BD[5.810684] → [10.0:84]

        if graph_key.start != del_key.start && !v.flag.contains(EdgeFlags::BLOCK) {

[5.810684]

[7.65964]

        if graph_key.start != del_key.start
            && !graph_key.is_empty()
            && !v.flag.contains(EdgeFlags::BLOCK)
        {

Insertion in libpijul/src/diff/delete.rs at line 272 [5.805350]

[5.814727]

[5.814786]

    debug!(
        "resurrect_zombies {:?} {:?} {:?} {:?}",
        r, i, end_pos, solved_conflict_end
    );

Insertion in libpijul/src/diff/delete.rs at line 325 [5.805350]
[5.816424]
[7.66019]
```
    debug!("resurrect zombie {:?} {:?}", v, target);
```
Deletion in libpijul/src/alive/retrieve.rs at line 1 [5.984582]
B:BD[5.984582] → [5.984583:984638]
```
// org id hGK6MGS40qzDFMBQyv5XVltMB8aIcok+Pgym9VgR9Vk=
```
Deletion in libpijul/src/alive/retrieve.rs at line 7 [5.984582]
B:BD[5.984876] → [5.984876:984935]
```
    // org id sYJLuP12Bb9ojQy2BgMV3s1jy9cGxExEdwA79BNti8w=
```
Deletion in libpijul/src/alive/retrieve.rs at line 13 [5.984582]
B:BD[5.985092] → [5.985092:985151]
```
    // org id 5vWbyONVh9JXfLbAXyWtgOPI0Uw7ePLizs5Ktr69a7A=
```
Deletion in libpijul/src/alive/retrieve.rs at line 27 [5.984582]
B:BD[5.985564] → [5.985564:985623]
```
    // org id +NO0a8x0MX1UOumulz5JeM8HzIIpUzB+FDngTJ+n9I8=
```
Deletion in libpijul/src/alive/retrieve.rs at line 58 [5.984582]
B:BD[5.986678] → [5.986678:986741]
```
        // org id hsj9MpTqN7i3gJbLw17mqAbo+0+lz2RNkm24v+T+WvQ=
```
Replacement in libpijul/src/alive/retrieve.rs at line 64 [5.984582]
B:BD[5.986916] → [5.986916:986971]
```
// org id xfKIMD6U0jHcxTiNzXKvDewGhKlvjnNe3nmaoh6nnz4=
```
[5.986916]
[7.73099]

Replacement in libpijul/src/alive/retrieve.rs at line 71 [5.984582]

B:BD[7.73293] → [11.2084:2120]

∅:D[11.2120] → [7.73332:73363]

B:BD[7.73332] → [7.73332:73363]

∅:D[7.73363] → [5.987142:987158]

B:BD[5.987142] → [5.987142:987158]

B:BD[5.987158] → [7.73364:73482]

B:BD[7.73482] → [11.2121:2135]

    crate::pristine::iter_adjacent(
        txn,
        &channel,
        vertex,
        EdgeFlags::PARENT | EdgeFlags::BLOCK,
        EdgeFlags::PARENT | EdgeFlags::BLOCK | EdgeFlags::FOLDER,
    )
    .next()?;

[7.73293]

[7.73542]

    if !is_alive(txn, &channel, vertex) {
        return None;
    }

Replacement in libpijul/src/alive/retrieve.rs at line 98 [5.984582]
B:BD[5.987602] → [5.987602:987657]
```
// org id jpSLF26wQdmz0kBfuXYavQ2T6SBQYdE5u9SfkPOypeg=
```
[5.987602]
[5.987657]

Deleting conflict resolution vertices when the sides are deleted

Dependencies

In channels

Change contents

Replacement in pijul/src/commands/debug.rs at line 6 [5.177758]

Replacement in pijul/src/commands/debug.rs at line 34 [5.177758]

Deletion in libpijul/src/unrecord/mod.rs at line 162 [5.231493]

Replacement in libpijul/src/pristine/mod.rs at line 710 [5.586748]

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

Replacement in libpijul/src/pristine/mod.rs at line 727 [5.586748]

Replacement in libpijul/src/pristine/mod.rs at line 729 [5.586748]

Replacement in libpijul/src/pristine/mod.rs at line 1466 [5.586748]

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

Replacement in libpijul/src/diff/delete.rs at line 103 [5.805350]

Replacement in libpijul/src/diff/delete.rs at line 114 [5.805350]

Replacement in libpijul/src/diff/delete.rs at line 168 [5.805350]

Insertion in libpijul/src/diff/delete.rs at line 272 [5.805350]

Insertion in libpijul/src/diff/delete.rs at line 325 [5.805350]

Deletion in libpijul/src/alive/retrieve.rs at line 1 [5.984582]

Deletion in libpijul/src/alive/retrieve.rs at line 7 [5.984582]

Deletion in libpijul/src/alive/retrieve.rs at line 13 [5.984582]

Deletion in libpijul/src/alive/retrieve.rs at line 27 [5.984582]

Deletion in libpijul/src/alive/retrieve.rs at line 58 [5.984582]

Replacement in libpijul/src/alive/retrieve.rs at line 64 [5.984582]

Replacement in libpijul/src/alive/retrieve.rs at line 71 [5.984582]

Replacement in libpijul/src/alive/retrieve.rs at line 98 [5.984582]