laumann/pijul - Change 3QXUJMZDPH2EDJY6UXIRA5ZQK3GRS2R422S7CKN56I36O4POAQXQC

More detailed display of conflicts

Created by pmeunier on October 11, 2022

3QXUJMZDPH2EDJY6UXIRA5ZQK3GRS2R422S7CKN56I36O4POAQXQC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/mod.rs at line 368 [5.133619]

B:BD[4.2085] → [4.2085:2230]

            Conflict::Name { ref path } => writeln!(w, "  - Name conflict on \"{}\"", path)?,
            Conflict::ZombieFile { ref path } => {

[4.2085]

[4.2230]

            Conflict::Name { ref path, .. } => writeln!(w, "  - Name conflict on \"{}\"", path)?,
            Conflict::ZombieFile { ref path, .. } => {

Replacement in pijul/src/commands/mod.rs at line 375 [5.133619]

B:BD[4.2462] → [4.2462:2527]

            Conflict::Zombie { ref path, ref line } => writeln!(

[4.2462]

[4.2527]

            Conflict::Zombie {
                ref path, ref line, ..
            } => writeln!(

Replacement in pijul/src/commands/mod.rs at line 382 [5.133619]

B:BD[4.2660] → [4.2660:2725]

            Conflict::Cyclic { ref path, ref line } => writeln!(

[4.2660]

[4.2725]

            Conflict::Cyclic {
                ref path, ref line, ..
            } => writeln!(

Replacement in pijul/src/commands/mod.rs at line 389 [5.133619]

B:BD[4.2855] → [4.2855:2919]

            Conflict::Order { ref path, ref line } => writeln!(

[4.2855]

[4.2919]

            Conflict::Order {
                ref path, ref line, ..
            } => writeln!(

Insertion in libpijul/src/vertex_buffer.rs at line 57 [5.217202]
[5.218994]
[5.218994]
```
    pub inode_vertex: Position<ChangeId>,
```

Replacement in libpijul/src/vertex_buffer.rs at line 63 [5.217202]

B:BD[5.219137] → [5.219137:219232]

    pub fn new(w: W, path: &'b str, conflicts: &'a mut Vec<crate::output::Conflict>) -> Self {

[5.219137]

[5.219232]

    pub fn new(
        w: W,
        path: &'b str,
        inode_vertex: Position<ChangeId>,
        conflicts: &'a mut Vec<crate::output::Conflict>,
    ) -> Self {

Insertion in libpijul/src/vertex_buffer.rs at line 70 [5.217202]
[5.219258]
[5.219258]
```
            inode_vertex,
```
Insertion in libpijul/src/vertex_buffer.rs at line 141 [5.217202]
[5.221061]
[5.221061]
```
            inode_vertex: [self.inode_vertex],
```

Insertion in libpijul/src/vertex_buffer.rs at line 143 [5.217202]

[5.221091]

            changes: side.iter().cloned().cloned().collect(),
            id,

Insertion in libpijul/src/vertex_buffer.rs at line 155 [5.217202]
[5.221333]
[5.221333]
```
            inode_vertex: [self.inode_vertex],
```

Insertion in libpijul/src/vertex_buffer.rs at line 157 [5.217202]

[5.221363]

            changes: add_del.iter().cloned().cloned().collect(),
            id,

Insertion in libpijul/src/vertex_buffer.rs at line 165 [5.217202]
[5.221605]
[5.221605]
```
            inode_vertex: [self.inode_vertex],
```
Insertion in libpijul/src/vertex_buffer.rs at line 167 [5.217202]
[5.221635]
[5.221635]
```
            changes: Vec::new(),
            id,
```

Insertion in libpijul/src/vertex_buffer.rs at line 172 [5.217202]

[5.221703]

    fn conflict_next(&mut self, id_: usize, side: &[&Hash]) -> Result<(), std::io::Error> {
        for conflict in self.conflicts.iter_mut().rev() {
            match conflict {
                crate::output::Conflict::Order { id, changes, .. } if *id == id_ => {
                    changes.extend(side.into_iter().cloned())
                }
                crate::output::Conflict::Zombie { id, changes, .. } if *id == id_ => {
                    changes.extend(side.into_iter().cloned())
                }
                crate::output::Conflict::Cyclic { id, changes, .. } if *id == id_ => {
                    changes.extend(side.into_iter().cloned())
                }
                _ => break,
            }
        }
        self.output_conflict_marker(SEPARATOR, id_, side)
    }

Insertion in libpijul/src/output/output.rs at line 22 [5.671807]

[4.4222]

        inodes: Vec<Position<ChangeId>>,
        changes: Vec<Hash>,

Insertion in libpijul/src/output/output.rs at line 27 [5.671807]

[4.4268]

        inode: [Position<ChangeId>; 1],
        changes: Vec<Hash>,

Deletion in libpijul/src/output/output.rs at line 31 [5.671807]
B:BD[4.4295] → [4.4295:4328]
```
        pos: Position<ChangeId>,
```

Insertion in libpijul/src/output/output.rs at line 32 [5.671807]

[4.4350]

        pos: [Position<ChangeId>; 1],
        names: Vec<Vertex<ChangeId>>,
        changes: Vec<Hash>,

Insertion in libpijul/src/output/output.rs at line 38 [5.671807]
[4.4392]
[4.4392]
```
        inode_vertex: [Position<ChangeId>; 1],
```
Insertion in libpijul/src/output/output.rs at line 40 [5.671807]
[4.4413]
[4.4413]
```
        changes: Vec<Hash>,
        id: usize,
```
Insertion in libpijul/src/output/output.rs at line 45 [5.671807]
[4.4455]
[4.4455]
```
        inode_vertex: [Position<ChangeId>; 1],
```
Insertion in libpijul/src/output/output.rs at line 47 [5.671807]
[4.4476]
[4.4476]
```
        changes: Vec<Hash>,
        id: usize,
```
Insertion in libpijul/src/output/output.rs at line 52 [5.671807]
[4.4517]
[4.4517]
```
        inode_vertex: [Position<ChangeId>; 1],
```
Insertion in libpijul/src/output/output.rs at line 54 [5.671807]
[4.4538]
[4.4538]
```
        changes: Vec<Hash>,
        id: usize,
```

Insertion in libpijul/src/output/output.rs at line 57 [5.671807]

[4.4545]

[5.672753]

}
impl Conflict {
    pub fn changes(&self) -> &[Hash] {
        match self {
            Conflict::Name { ref changes, .. } => changes,
            Conflict::ZombieFile { ref changes, .. } => changes,
            Conflict::MultipleNames { ref changes, .. } => changes,
            Conflict::Zombie { ref changes, .. } => changes,
            Conflict::Cyclic { ref changes, .. } => changes,
            Conflict::Order { ref changes, .. } => changes,
        }
    }
    pub fn inodes(&self) -> &[Position<ChangeId>] {
        match self {
            Conflict::Name { ref inodes, .. } => inodes,
            Conflict::ZombieFile { ref inode, .. } => inode,
            Conflict::MultipleNames { ref pos, .. } => pos,
            Conflict::Zombie {
                ref inode_vertex, ..
            } => inode_vertex,
            Conflict::Cyclic {
                ref inode_vertex, ..
            } => inode_vertex,
            Conflict::Order {
                ref inode_vertex, ..
            } => inode_vertex,
        }
    }

Insertion in libpijul/src/output/output.rs at line 125 [5.671807]
[6.24169]
[6.24169]
Insertion in libpijul/src/output/output.rs at line 258 [5.671807]
[7.13191]
[8.263]
Insertion in libpijul/src/output/output.rs at line 260 [5.671807]
[8.299]
[7.13222]

Replacement in libpijul/src/output/output.rs at line 304 [5.671807]

B:BD[7.13906] → [7.13906:13975]

    let o = output_loop(repo, changes, txn, channel, work, stop, 0);

[7.13906]

[7.13975]

    let o = output_loop(repo, changes, txn.clone(), channel, work, stop, 0);

Insertion in libpijul/src/output/output.rs at line 324 [5.671807]

[7.14225]

[6.25353]


    let txn_ = txn.read();
    for (pos, (_, path, names)) in state.done_vertices {
        if !names.is_empty() {
            state.conflicts.insert(Conflict::MultipleNames {
                changes: names
                    .iter()
                    .map(|v| txn_.get_external(&v.change).unwrap().unwrap().into())
                    .collect(),
                pos: [pos],
                names,
                path,
            });
        }
    }

Replacement in libpijul/src/output/output.rs at line 364 [5.671807]

B:BD[7.14869] → [7.14869:14945]

    done_vertices: HashMap<Position<ChangeId>, (Vertex<ChangeId>, String)>,

[7.14869]

[8.472]

    done_vertices: HashMap<Position<ChangeId>, (Vertex<ChangeId>, String, Vec<Vertex<ChangeId>>)>,

Insertion in libpijul/src/output/output.rs at line 367 [5.671807]
[8.507]
[9.492]

Replacement in libpijul/src/output/output.rs at line 411 [5.671807]

B:BD[7.16489] → [7.16489:16523]

        is_first_name: &mut bool,

[7.16489]

[7.16523]

        is_first_name: &mut Option<Position<ChangeId>>,
        name_conflict: &mut Vec<Position<ChangeId>>,

Replacement in libpijul/src/output/output.rs at line 415 [5.671807]
B:BD[7.16619] → [7.16619:16655]
```
            Entry::Occupied(e) => {
```
[7.16619]
[7.16655]
```
            Entry::Occupied(mut e) => {
```

Replacement in libpijul/src/output/output.rs at line 423 [5.671807]

B:BD[7.16880] → [7.16880:16923]

                if e.get().0 != name_key {

[7.16880]

[7.16923]

                let e = e.get_mut();
                if e.0 != name_key {
                    if e.2.is_empty() {
                        e.2.push(e.0)
                    }

Replacement in libpijul/src/output/output.rs at line 429 [5.671807]

B:BD[7.16985] → [8.508:576]

∅:D[8.576] → [7.17051:17170]

B:BD[7.17051] → [7.17051:17170]

                    self.conflicts.insert(Conflict::MultipleNames {
                        pos: output_item.pos,
                        path: e.get().1.clone(),
                    });

[7.16985]

[7.17170]

                    e.2.push(name_key)

Replacement in libpijul/src/output/output.rs at line 438 [5.671807]

B:BD[7.17397] → [7.17397:17437]

        let name = if !*is_first_name {

[7.17397]

[7.17437]

        let name = if let Some(ref inode) = is_first_name {
            if name_conflict.is_empty() {
                name_conflict.push(*inode)
            }
            name_conflict.push(output_item.pos);

Deletion in libpijul/src/output/output.rs at line 447 [5.671807]

B:BD[7.17597] → [8.577:655]

                self.conflicts.insert(Conflict::Name { path: name.clone() });

Deletion in libpijul/src/output/output.rs at line 449 [5.671807]

B:BD[7.17715] → [7.17715:17780]

B:BD[7.17780] → [8.656:711]

∅:D[8.711] → [7.17833:17894]

B:BD[7.17833] → [7.17833:17894]

                debug!("not outputting {:?} {:?}", a, name_key);
                self.conflicts.insert(Conflict::Name {
                    path: a.to_string(),
                });

Replacement in libpijul/src/output/output.rs at line 452 [5.671807]
B:BD[7.17973] → [7.17973:18009]
```
            *is_first_name = false;
```
[7.17973]
[7.18009]
```
            *is_first_name = Some(output_item.pos);
```

Replacement in libpijul/src/output/output.rs at line 458 [5.671807]

B:BD[7.18209] → [7.18209:18274]

        name_entry.insert((name_key, output_item.path.clone()));

[7.18209]

[7.18274]

        name_entry.insert((name_key, output_item.path.clone(), Vec::new()));

Replacement in libpijul/src/output/output.rs at line 476 [5.671807]
∅:D[6.25796] → [7.18953:18991]
B:BD[7.18953] → [7.18953:18991]
```
        let mut is_first_name = true;
```
[6.25796]
[7.18991]
```
        let mut is_first_name = None;
        let mut name_conflict = Vec::new();
```

Replacement in libpijul/src/output/output.rs at line 480 [5.671807]

B:BD[7.19105] → [7.19105:19204]

            let name = match self.make_inode(&a, name_key, &mut output_item, &mut is_first_name) {

[7.19105]

[7.19204]

            let name = match self.make_inode(
                &a,
                name_key,
                &mut output_item,
                &mut is_first_name,
                &mut name_conflict,
            ) {

Replacement in libpijul/src/output/output.rs at line 552 [5.671807]

B:BD[7.21266] → [7.21266:21305]

            if output_item.is_zombie {

[7.21266]

[8.712]

            if let Some(id) = output_item.is_zombie.take() {

Replacement in libpijul/src/output/output.rs at line 554 [5.671807]

∅:D[8.773] → [7.21364:21408]

B:BD[7.21364] → [7.21364:21408]

                    path: name.to_string(),

[8.773]

[8.774]

                    path: path.clone(),
                    changes: id,
                    inode: [output_item.pos],

Insertion in libpijul/src/output/output.rs at line 560 [5.671807]

[5.679083]

[7.21428]

        if !name_conflict.is_empty() {
            let txn = txn.read();
            self.conflicts.insert(Conflict::Name {
                changes: name_conflict
                    .iter()
                    .map(|v| txn.get_external(&v.change).unwrap().unwrap().into())
                    .collect(),
                path: a.clone(),
                inodes: name_conflict,
            });
        }

Replacement in libpijul/src/output/output.rs at line 729 [5.671807]

B:BD[10.18] → [10.18:48]

        let txn = txn.read();

[10.18]

[10.48]

        debug!("write");
        let txn = txn.write();
        debug!("/write");

Replacement in libpijul/src/output/output.rs at line 738 [5.671807]

B:BD[6.26328] → [6.26328:26402]

    let mut f = vertex_buffer::ConflictsWriter::new(w, &path, conflicts);

[6.26328]

[3.4033]

    debug!("vertex_buffer");
    let mut f = vertex_buffer::ConflictsWriter::new(w, &path, output_item.pos, conflicts);
    debug!("outputting graph");

Replacement in libpijul/src/output/mod.rs at line 137 [5.686190]
B:BD[5.686542] → [5.686542:686563]
```
    is_zombie: bool,
```
[5.686494]
[5.686563]
```
    is_zombie: Option<Vec<Hash>>,
```
Replacement in libpijul/src/output/mod.rs at line 298 [5.686190]
B:BD[11.87230] → [11.87230:87273]
```
) -> Result<bool, TxnErr<T::GraphError>> {
```
[11.87230]
[5.689844]
```
) -> Result<Option<Vec<Hash>>, TxnErr<T::GraphError>> {
```

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

B:BD[11.87402] → [11.87402:87419]

        Ok(true)

[11.87402]

[11.87419]

        let mut id = Vec::new();
        let f = EdgeFlags::FOLDER | EdgeFlags::PARENT;
        for e in iter_adjacent(txn, channel, pos.inode_vertex(), f, EdgeFlags::all())? {
            let e = e?;
            if e.flag().contains(f) {
                id.push(txn.get_external(&e.introduced_by())?.unwrap().into())
            }
        }
        Ok(Some(id))

Replacement in libpijul/src/output/mod.rs at line 314 [5.686190]
B:BD[11.87432] → [11.87432:87450]
```
        Ok(false)
```
[11.87432]
[11.87450]
```
        Ok(None)
```
Replacement in libpijul/src/output/archive.rs at line 196 [5.690044]
∅:D[3.5317] → [5.693414:693456]
B:BD[5.693414] → [5.693414:693456]
```
            let mut is_first_name = true;
```
[3.5317]
[5.693456]
```
            let mut is_first_name = None;
```

Replacement in libpijul/src/output/archive.rs at line 205 [5.690044]

B:BD[5.693808] → [5.693808:693862]

                                pos: output_item.pos,

[5.693808]

[4.5165]

                                changes: Vec::new(),
                                pos: [output_item.pos],

Insertion in libpijul/src/output/archive.rs at line 208 [5.690044]

[4.5222]

[5.693862]

                                names: Vec::new(),

Replacement in libpijul/src/output/archive.rs at line 219 [5.690044]

B:BD[5.694368] → [5.694368:694415]

                let name = if !is_first_name {

[5.694368]

[5.694415]

                let name = if let Some(inode) = is_first_name {
                    let inodes = vec![inode, output_item.pos];
                    let txn = txn.read();

Insertion in libpijul/src/output/archive.rs at line 224 [5.690044]

[5.694512]

                        changes: inodes
                            .iter()
                            .map(|i| txn.get_external(&i.change).unwrap().unwrap().into())
                            .collect(),
                        inodes,

Replacement in libpijul/src/output/archive.rs at line 232 [5.690044]

B:BD[5.694588] → [5.694588:694631]

                    is_first_name = false;

[5.694588]

[5.694631]

                    is_first_name = Some(output_item.pos);

Insertion in libpijul/src/output/archive.rs at line 279 [5.690044]
[5.695688]
[5.695688]
```
                            output_item.pos,
```

Replacement in libpijul/src/output/archive.rs at line 295 [5.690044]

B:BD[5.696145] → [5.696145:696188]

                if output_item.is_zombie {

[5.696145]

[5.696188]

                if let Some(id) = output_item.is_zombie {

Insertion in libpijul/src/output/archive.rs at line 298 [5.690044]

[5.696294]

                        changes: id,
                        inode: [output_item.pos],

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

B:BD[12.5871] → [12.5871:6022]

                    let ext = txn.get_external(&graph[vid].vertex.change)?.unwrap();
                    line_buf.begin_conflict(id, &[&ext.into()])?;

[12.5871]

[12.6022]

                    let ext = txn.get_external(&graph[vid].vertex.change)?.unwrap().into();
                    std::mem::drop(channel);
                    std::mem::drop(txn);
                    line_buf.begin_conflict(id, &[&ext])?;

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

[12.6063]

                    std::mem::drop(channel);
                    std::mem::drop(txn);

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

∅:D[3.9886] → [12.6440:6529]

B:BD[12.6440] → [12.6440:6529]

B:BD[12.6529] → [2.32:105]

                        let ext = txn.get_external(&graph[vid].vertex.change)?.unwrap();
                        line_buf.conflict_next(elt.id, &[&ext.into()])?;

[3.9886]

[12.6599]

                        let ext = txn.get_external(&graph[vid].vertex.change)?.unwrap().into();
                        std::mem::drop(txn);
                        line_buf.conflict_next(elt.id, &[&ext])?;

More detailed display of conflicts

Dependencies

In channels

Change contents

Replacement in pijul/src/commands/mod.rs at line 368 [5.133619]

Replacement in pijul/src/commands/mod.rs at line 375 [5.133619]

Replacement in pijul/src/commands/mod.rs at line 382 [5.133619]

Replacement in pijul/src/commands/mod.rs at line 389 [5.133619]

Insertion in libpijul/src/vertex_buffer.rs at line 57 [5.217202]

Replacement in libpijul/src/vertex_buffer.rs at line 63 [5.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 70 [5.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 141 [5.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 143 [5.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 155 [5.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 157 [5.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 165 [5.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 167 [5.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 172 [5.217202]

Insertion in libpijul/src/output/output.rs at line 22 [5.671807]

Insertion in libpijul/src/output/output.rs at line 27 [5.671807]

Deletion in libpijul/src/output/output.rs at line 31 [5.671807]

Insertion in libpijul/src/output/output.rs at line 32 [5.671807]

Insertion in libpijul/src/output/output.rs at line 38 [5.671807]

Insertion in libpijul/src/output/output.rs at line 40 [5.671807]

Insertion in libpijul/src/output/output.rs at line 45 [5.671807]

Insertion in libpijul/src/output/output.rs at line 47 [5.671807]

Insertion in libpijul/src/output/output.rs at line 52 [5.671807]

Insertion in libpijul/src/output/output.rs at line 54 [5.671807]