pijul/pijul - Change Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC

Improving the UI around zombie conflicts

Created by pmeunier on May 11, 2021

Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/vertex_buffer.rs at line 36 [5.217202]
∅:D[4.5665] → [5.218668:218716]
B:BD[5.218668] → [5.218668:218716]
```
        self.output_conflict_marker(END_MARKER)
```
[4.5665]
[5.218716]
```
        self.end_conflict()
```

Replacement in libpijul/src/diff/mod.rs at line 114 [5.793247]

B:BD[5.796567] → [5.796567:796653]

        debug!("pos = {:?}", d.pos_a);
        debug!("{:?} {:?}", lines_a, lines_b);

[5.796567]

[5.796653]

        trace!("pos = {:?}", d.pos_a);
        trace!("{:?} {:?}", lines_a, lines_b);

Insertion in libpijul/src/diff/delete.rs at line 197 [5.805350]
[5.812149]
[5.812149]
```
    let mut level = 0;
```

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

B:BD[5.812233] → [5.812233:812328]

            Some(&ConflictMarker::Next) => result = true,
            Some(_) => return false,

[5.812233]

[5.812328]

            Some(&ConflictMarker::Next) if level == 0 => result = true,
            Some(&ConflictMarker::Begin) => level += 1,
            Some(&ConflictMarker::End) if level > 0 => level -= 1,

Insertion in libpijul/src/diff/delete.rs at line 288 [5.805350]
[2.2084]
[5.814786]
```
    debug!("{:#?}", d);
```

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

B:BD[5.815274] → [3.0:138]

            let pos = bytes_pos(lines_a, d[r].old) + bytes_len(lines_a, d[r].old, d[r].old_len);
            pos.min(solved_conflict_end)

[5.815274]

[5.815340]

            bytes_pos(lines_a, d[r].old).min(solved_conflict_end)

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

B:BD[5.815580] → [3.187:264]

                || (i + 1 < diff.pos_a.len() && diff.pos_a[i + 1].pos < pos)

[5.815580]

[5.815658]

                || (i + 1 < diff.pos_a.len() && diff.pos_a[i + 1].pos <= pos)

Insertion in libpijul/src/alive/output.rs at line 30 [5.988425]
[5.989204]
[5.989204]
```
    let mut is_zombie = false;
```

Insertion in libpijul/src/alive/output.rs at line 55 [5.988425]

[5.990237]

                if is_zombie {
                    is_zombie = false;
                    line_buf.end_zombie_conflict()?;
                }

Replacement in libpijul/src/alive/output.rs at line 64 [5.988425]

B:BD[5.990469] → [5.990469:990549]

                        output_scc(changes, txn, graph, &sccs[scc], line_buf)?;

[5.990469]

[5.990549]

                        output_scc(changes, txn, graph, &sccs[scc], &mut is_zombie, line_buf)?;

Insertion in libpijul/src/alive/output.rs at line 85 [5.988425]

[5.991266]

                if is_zombie {
                    is_zombie = false;
                    line_buf.end_zombie_conflict()?;
                }

Insertion in libpijul/src/alive/output.rs at line 92 [5.988425]

[5.991339]

            if is_zombie {
                is_zombie = false;
                line_buf.end_zombie_conflict()?;
            }

Insertion in libpijul/src/alive/output.rs at line 99 [5.988425]
[5.991416]
[5.991416]
```
    }
    if is_zombie {
        line_buf.end_zombie_conflict()?;
```
Insertion in libpijul/src/alive/output.rs at line 162 [5.988425]
[5.993063]
[5.993063]
```
    is_zombie: &mut bool,
```

Replacement in libpijul/src/alive/output.rs at line 171 [5.988425]

B:BD[5.993305] → [5.993305:993348]

            vbuf.begin_zombie_conflict()?;

[5.993305]

[5.993348]

            if !*is_zombie {
                *is_zombie = true;
                vbuf.begin_zombie_conflict()?;
            }
        } else if *is_zombie {
            *is_zombie = false;
            vbuf.end_zombie_conflict()?;

Deletion in libpijul/src/alive/output.rs at line 200 [5.988425]

B:BD[5.993872] → [5.993872:993968]

        if graph[v].flags.contains(Flags::ZOMBIE) {
            vbuf.end_conflict()?;
        }